后:查询哪些准入范围缺资质-准备删除

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

@@ -551,6 +551,13 @@ func (s *OilSupplierService) GetDeleteSub3(TableName, where string, entitiesPtr
 	} else {
 		sql += ` left join ` + TableName + ` b on b.ClassId = a.SubClassId`
 	}
-	sql += " set IsQuestion1 = 3, LackFile1 = concat(IFNULL(LackFile1,''),',','" + name + "') where " + where
+	sql += " set IsQuestion1 = 3 where " + where
+	s.DBE.SQL(sql).Find(entitiesPtr)
+}
+
+func (s *OilSupplierService) GetDeleteSub4(where string, entitiesPtr interface{}, name string) {
+
+	sql := `update OilSupplierCert`
+	sql += " set LackFileName = concat(LackFileName, ',', IF(FIND_IN_SET(LackFileName,'" + name + "'), '', '" + name + "')) where " + where
 	s.DBE.SQL(sql).Find(entitiesPtr)
 }

src/dashoo.cn/backend/api/business/oilsupplier/suppliercert/oilsuppliercert.go

@@ -63,6 +63,7 @@ type OilSupplierCert struct {
 	CommitComId       string    `xorm:"default '0' comment('提交二级单位Id') VARCHAR(50)"`
 	BusinessKey       string    `xorm:"VARCHAR(255)"`
 	IsLack            int       `xorm:"INT(2)"`
+	LackFileName      string    `xorm:"VARCHAR(500)"`
 	StorageOn         time.Time `xorm:"DATETIME"`
 	CreateOn          time.Time `xorm:"DATETIME"`
 	CreateUserId      int       `xorm:"INT(10)"`

src/dashoo.cn/backend/api/controllers/oilsupplier/supplier.go

@@ -4086,10 +4086,13 @@ func (this *OilSupplierController) markLackCertSub(file supplierfile.CheckFile)
 					if cert.SupplierTypeCode == "01" {
 						where2 += " and IsManufacturer != 2"
 						supplierService.GetDeleteSub3(OilGoodsAptitudeName, where2, &certSub, header.Name)
+						supplierService.GetDeleteSub4("Id = "+file.CertId, &certSub, header.Name)
 					} else if cert.SupplierTypeCode == "02" {
 						supplierService.GetDeleteSub3(OilBasisBuildName, where2, &certSub, header.Name)
+						supplierService.GetDeleteSub4("Id = "+file.CertId, &certSub, header.Name)
 					} else {
 						supplierService.GetDeleteSub3(OilTechnologyServiceName, where2, &certSub, header.Name)
+						supplierService.GetDeleteSub4("Id = "+file.CertId, &certSub, header.Name)
 					}
 				} else {
 					fmt.Print("22222")
@@ -4119,6 +4122,7 @@ func (this *OilSupplierController) markLackCertSub(file supplierfile.CheckFile)
 						where2 += " and IsManufacturer = 2"
 					}
 					supplierService.GetDeleteSub3(OilGoodsAptitudeName, where2, &certSub, header.Name)
+					supplierService.GetDeleteSub4("Id = "+file.CertId, &certSub, header.Name)
 				} else {
 					fmt.Print("22222")
 				}
@@ -4204,7 +4208,6 @@ func (this *OilSupplierController) GetLackCertList() {
 		return
 	}
 	supService := supplier.GetOilSupplierService(utils.DBE)
-	var supEntity supplier.OilSupplier
 	certService := suppliercert.GetOilSupplierCertService(utils.DBE)
 	var allCertList []suppliercert.OilSupplierCert
 	whereCert := " Status = '8' or Status = '11' "
@@ -4215,6 +4218,7 @@ func (this *OilSupplierController) GetLackCertList() {
 		_, _ = certService.DBE.Exec(sql)
 		log.Println("共查询到准入条数：", len(allCertList))
 		for _, certEntity := range allCertList {
+			var supEntity supplier.OilSupplier
 			supService.GetEntityById(certEntity.SupplierId, &supEntity)
 			var file supplierfile.CheckFile
 			file.CertId = strconv.Itoa(certEntity.Id)
@@ -4243,18 +4247,21 @@ func (this *OilSupplierController) GetLackCertSubList() {
 		return
 	}
 	supService := supplier.GetOilSupplierService(utils.DBE)
-	var supEntity supplier.OilSupplier
+
 	certService := suppliercert.GetOilSupplierCertService(utils.DBE)
 	var allCertList []suppliercert.OilSupplierCert
 	whereCert := " Status = '8' or Status = '11' "
 	certService.GetEntitysByWhere(OilSupplierCertName, whereCert, &allCertList)
 	if len(allCertList) > 0 {
 		// 重置标识
-		sql := "update " + OilSupplierCertSubName + " set LackFile1 = '',IsQuestion1 = 0 "
+		sql := "update " + OilSupplierCertSubName + " set IsQuestion1 = 0 "
+		_, _ = certService.DBE.Exec(sql)
+		sql = "update " + OilSupplierCertName + " set LackFileName = '' "
 		_, _ = certService.DBE.Exec(sql)
 		log.Println("共查询到准入条数：", len(allCertList))
 		for _, certEntity := range allCertList {
-			supService.GetEntityById(certEntity.SupplierId, &supEntity)
+			var supEntity supplier.OilSupplier
+			supService.GetEntityByWhere(OilSupplierName, "Id = "+strconv.Itoa(certEntity.SupplierId), &supEntity)
 			var file supplierfile.CheckFile
 			file.CertId = strconv.Itoa(certEntity.Id)
 			file.SupplierId = certEntity.SupplierId