后:确认更新

src/dashoo.cn/backend/api/business/oilsupplier/goodsaptitude/oilgoodsaptitude.go

@@ -296,6 +296,10 @@ type GoodsBusiness1 struct {
 	GoodsLevel		  string
 }
 
+type Ids struct {
+	Id              int
+}
+
 type OrganizeSet struct {
 	ClassId     int
 	OrganizeIds []string

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

@@ -1687,11 +1687,40 @@ func (this *OilBasisBuildController) GetDelCertSubList() {
 	this.ServeJSON()
 }
 
-// @Title 确认更新后的删除/暂停企业准入范围 2020-12-18
+// @Title 确认更新后的删除/修改企业准入范围 2020-12-18
 // @Description 修改实体
 // @Success	200	{object} controllers.Request
-// @router /delete-suspend [post]
-func (this *OilBasisBuildController) DeleteSuspend() {
+// @router /deleteUpdate [post]
+func (this *OilBasisBuildController) DeleteUpdate() {
+	var errinfo ErrorInfo
+	var err error
+	go func() {
+		svc := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
+		var list1 []goodsaptitude.GoodsBusiness1
+		svc.GetEntitysByWhere(OilBasisBuildName, "1=1", &list1)
+		for _,item := range list1{
+			var subDelete suppliercertsub.OilSupplierCertSub1
+			cols := []string{"Code"}
+			subDelete.Code = item.Code
+			err = svc.UpdateEntityBywheretbl(OilSupplierCertSubName, &subDelete, cols, "SupplierTypeCode = '02' and Name = '" + item.Name + "'")
+		}
+		var list []goodsaptitude.Ids
+		svc.DeleteTableBySelect(OilSupplierCertSubName, OilTechnologyServiceClassName, "a.SupplierTypeCode='02' AND b.Id IS NULL", &list, "Name")
+		for _,id := range list{
+			err = svc.DeleteTable(OilSupplierCertSubName, "Id = " + strconv.Itoa(id.Id))
+		}
+	}()
+	errinfo.Message = "更新中,请勿重复更新！"
+	errinfo.Code = 0
+	this.Data["json"] = &errinfo
+	this.ServeJSON()
+}
+
+// @Title 确认更新后的暂停企业准入范围 2020-12-18
+// @Description 修改实体
+// @Success	200	{object} controllers.Request
+// @router /suspend [post]
+func (this *OilBasisBuildController) Suspend() {
 	var errinfo ErrorInfo
 	var err error
 	var list []supplier.OilSupplierContrast
@@ -1719,7 +1748,7 @@ func (this *OilBasisBuildController) DeleteSuspend() {
 					err = svc.DeleteEntityById(itemSub.Id, &subDelete)
 				}
 			}
-			err = svc.DeleteTable("OilSupplierBasContrast", "Id = " + strconv.Itoa(item.Id))
+			//err = svc.DeleteTable("OilSupplierBasContrast", "Id = " + strconv.Itoa(item.Id))
 		}
 		this.CreateContrast()
 	}()

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

@@ -3047,7 +3047,11 @@ func (this *OilGoodsAptitudeController) DeleteUpdate() {
 				err = svc.DeleteTable (OilSupplierCertSubName, "SupplierTypeCode = '01' and GoodsLevel = '2' and Code = '" + item.Code + "'")
 			}
 		}
-		err = svc.DeleteTableBySelect(OilSupplierCertSubName, OilGoodsAptitudeClassName, "a.SupplierTypeCode='01' AND b.Id IS NULL")
+		var list []goodsaptitude.Ids
+		svc.DeleteTableBySelect(OilSupplierCertSubName, OilGoodsAptitudeClassName, "a.SupplierTypeCode='01' AND b.Id IS NULL", &list, "Code")
+		for _,id := range list{
+			err = svc.DeleteTable(OilSupplierCertSubName, "Id = " + strconv.Itoa(id.Id))
+		}
 	}()
 	errinfo.Message = "更新中,请勿重复更新！"
 	errinfo.Code = 0

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

@@ -2131,10 +2131,6 @@ func (this *OilTechnologyServiceController) GetDelCertSubList() {
 func (this *OilTechnologyServiceController) DeleteUpdate() {
 	var errinfo ErrorInfo
 	var err error
-	var list []supplier.OilSupplierContrast
-	svc := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
-	//svc.GetEntitysByWhere("OilSupplierContrast", "TwoOneCount = 0", &list)
-	svc.GetEntitysByWhere("OilSupplierTecContrast", "1=1", &list)
 	go func() {
 		svc := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
 		var list1 []goodsaptitude.GoodsBusiness1
@@ -2145,7 +2141,11 @@ func (this *OilTechnologyServiceController) DeleteUpdate() {
 			subDelete.Code = item.Code
 			err = svc.UpdateEntityBywheretbl(OilSupplierCertSubName, &subDelete, cols, "SupplierTypeCode = '03' and Name = '" + item.Name + "'")
 		}
-		err = svc.DeleteTableBySelect(OilSupplierCertSubName, OilTechnologyServiceClassName, "a.SupplierTypeCode='03' AND b.Id IS NULL")
+		var list []goodsaptitude.Ids
+		svc.DeleteTableBySelect(OilSupplierCertSubName, OilTechnologyServiceClassName, "a.SupplierTypeCode='03' AND b.Id IS NULL", &list, "Name")
+		for _,id := range list{
+			err = svc.DeleteTable(OilSupplierCertSubName, "Id = " + strconv.Itoa(id.Id))
+		}
 	}()
 	errinfo.Message = "更新中,请勿重复更新！"
 	errinfo.Code = 0

src/dashoo.cn/backend/api/mydb/myServiceBase.go

@@ -814,13 +814,13 @@ func (s *MyServiceBase) FindFileByCompany(tablename string, where string,entitie
 }
 
 // delete + left join
-func (s *MyServiceBase) DeleteTableBySelect(tableName, tableName2, where string) error {
-	sql := "DELETE a from " + tableName + " a left join " + tableName2 + " b ON a.Code=b.Code "
+func (s *MyServiceBase) DeleteTableBySelect(tableName, tableName2, where string, entityPtr interface{}, column string) {
+	sql := "select a.Id from " + tableName + " a left join " + tableName2 + " b ON a." + column + "=b." + column + " "
 	if where != "" {
 		sql = sql + " Where " + where
 	}
-	_,err := s.DBE.Query(sql)
-	return err
+	s.DBE.SQL(sql).Find(entityPtr)
+	return
 }
 
 func (s *MyServiceBase) GetEntityJoin(tableName string, tableName2 string,entityPtr interface{}) (has bool) {