2
3
Просмотр исходного кода

后端:有效期字段bugFix,返回有效期字段

baichengfei 5 лет назад
Родитель
Сommit
fb9c81cc24

+ 1 - 1
src/dashoo.cn/backend/api/business/oilsupplier/selectbusiness/selectservice.go

@@ -39,7 +39,7 @@ func (s *SelectService) GetMyPagingEntitiesWithOrderBytbl(supplierTableName, sup
 
 
 	var sql string
 	var sql string
 	sql = `select SQL_CALC_FOUND_ROWS a.Id,a.SupplierName,b.AccessCardNo,max(c.OldSupplierName) OldSupplierName,b.SupplierTypeCode,`
 	sql = `select SQL_CALC_FOUND_ROWS a.Id,a.SupplierName,b.AccessCardNo,max(c.OldSupplierName) OldSupplierName,b.SupplierTypeCode,`
-	sql += `a.LegalPerson,a.RegCapital,a.Mobile,b.AuditDate,b.ApplyTime,b.InFlag,a.ContactName,a.CommercialNo, `
+	sql += `a.LegalPerson,a.RegCapital,a.Mobile,b.AuditDate,b.ApplyTime,b.EffectEndTime,b.InFlag,a.ContactName,a.CommercialNo, `
 	sql += `a.DepositBank,a.HseTraining,a.CompanyType,a.SetupTime,a.Address,a.Province,a.City,a.Street, `
 	sql += `a.DepositBank,a.HseTraining,a.CompanyType,a.SetupTime,a.Address,a.Province,a.City,a.Street, `
 	sql += `a.LinkAddress,a.LinkProvince,a.LinkCity,a.LinkStreet,a.BusinessScope, `
 	sql += `a.LinkAddress,a.LinkProvince,a.LinkCity,a.LinkStreet,a.BusinessScope, `
 	sql += `b.InStyle, b.Id CertId, f.FullName, g.CheckUnitName, b.Remark, `
 	sql += `b.InStyle, b.Id CertId, f.FullName, g.CheckUnitName, b.Remark, `

+ 2 - 1
src/dashoo.cn/backend/api/business/oilsupplier/supplier/oilsupplier.go

@@ -221,7 +221,8 @@ type OilSupplierSelect struct {
 	RegCapital       float64   //注册资本
 	RegCapital       float64   //注册资本
 	Mobile           string    //移动电话
 	Mobile           string    //移动电话
 	AuditDate        time.Time //最后一次年审
 	AuditDate        time.Time //最后一次年审
-	ApplyTime        time.Time //有效期至
+	ApplyTime        time.Time //申请时间
+	EffectEndTime	 time.Time //有效期至
 	InFlag           string    //状态
 	InFlag           string    //状态
 	ContactName      string    //联系人姓名
 	ContactName      string    //联系人姓名
 	CommercialNo     string    //统一社会信用代码
 	CommercialNo     string    //统一社会信用代码

+ 2 - 2
src/dashoo.cn/backend/api/business/oilsupplier/supplier/oilsupplierService.go

@@ -27,7 +27,7 @@ func (s *OilSupplierService) GetMyPagingEntitiesWithOrderBytbl(supplierTableName
 	sqlCount += ` where ` + where
 	sqlCount += ` where ` + where
 
 
 	var sql string
 	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.WorkerTotal, `
 	sql += ` b.ContractNum, `
 	sql += ` b.ContractNum, `
 	sql += ` b.UniversityNum, `
 	sql += ` b.UniversityNum, `
@@ -75,7 +75,7 @@ func (s *OilSupplierService) GetMyPagingEntitiesWithOrderBytbl2(supplierTableNam
 	sqlCount += ` where ` + where
 	sqlCount += ` where ` + where
 
 
 	var sql string
 	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.WorkerTotal, `
 	sql += ` b.ContractNum, `
 	sql += ` b.ContractNum, `
 	sql += ` b.UniversityNum, `
 	sql += ` b.UniversityNum, `