|
|
@@ -27,7 +27,7 @@ func (s *OilSupplierService) GetMyPagingEntitiesWithOrderBytbl(supplierTableName
|
|
|
sqlCount += ` where ` + where
|
|
|
|
|
|
var sql string
|
|
|
- sql = `select a.*, b.Id as CertId, b.AccessCardNo, b.SupplierTypeCode, b.SupplierTypeName, b.InFlag, b.ApplyTime, `
|
|
|
+ sql = `select a.*, b.Id as CertId, b.AccessCardNo, b.SupplierTypeCode, b.SupplierTypeName, b.InFlag, b.ApplyTime,b.EffectEndTime, `
|
|
|
sql += ` b.WorkerTotal, `
|
|
|
sql += ` b.ContractNum, `
|
|
|
sql += ` b.UniversityNum, `
|
|
|
@@ -75,7 +75,7 @@ func (s *OilSupplierService) GetMyPagingEntitiesWithOrderBytbl2(supplierTableNam
|
|
|
sqlCount += ` where ` + where
|
|
|
|
|
|
var sql string
|
|
|
- sql = `select DISTINCT b.Id as CertId, a.*, b.AccessCardNo, b.SupplierTypeCode, b.SupplierTypeName, b.InFlag, b.ApplyTime, `
|
|
|
+ sql = `select DISTINCT b.Id as CertId, a.*, b.AccessCardNo, b.SupplierTypeCode, b.SupplierTypeName, b.InFlag, b.ApplyTime,b.EffectEndTime, `
|
|
|
sql += ` b.WorkerTotal, `
|
|
|
sql += ` b.ContractNum, `
|
|
|
sql += ` b.UniversityNum, `
|