后:确认更新

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

@@ -3032,22 +3032,22 @@ func (this *OilGoodsAptitudeController) DeleteUpdate() {
 	go func() {
 		svc := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
 		var list1 []goodsaptitude.GoodsBusiness1
-		svc.GetEntityJoin(&list1)
+		svc.GetEntityJoin(OilGoodsAptitudeName, OilGoodsAptitudeClassName, &list1)
 		for _,item := range list1{
 			var subDelete suppliercertsub.OilSupplierCertSub1
 			cols := []string{"GoodsLevel", "Name"}
 			subDelete.GoodsLevel = item.GoodsLevel
 			subDelete.Name = item.Name
-			if item.GoodsLevel == "1" {
+			if item.GoodsLevel == "2" {
 				// 1降2修改
 				err = svc.UpdateEntityBywheretbl(OilSupplierCertSubName, &subDelete, cols, "SupplierTypeCode = '01' and Code = '" + item.Code + "'")
 			} else {
-				err = svc.UpdateEntityBywheretbl(OilSupplierCertSubName, &subDelete, cols, "SupplierTypeCode = '01' and GoodsLevel = '2' and Code = '" + item.Code + "'")
+				err = svc.UpdateEntityBywheretbl(OilSupplierCertSubName, &subDelete, cols, "SupplierTypeCode = '01' and GoodsLevel = '1' and Code = '" + item.Code + "'")
 				//2升1删除
-				err = svc.DeleteTable (OilSupplierCertSubName, "SupplierTypeCode = '01' and GoodsLevel = '1' and Code = '" + item.Code + "'")
+				err = svc.DeleteTable (OilSupplierCertSubName, "SupplierTypeCode = '01' and GoodsLevel = '2' and Code = '" + item.Code + "'")
 			}
 		}
-		err = svc.DeleteTableBySelect(OilSupplierCertSubName, OilGoodsAptitudeClassName, "a.SupplierTypeCode='02' AND b.Id IS NULL")
+		err = svc.DeleteTableBySelect(OilSupplierCertSubName, OilGoodsAptitudeClassName, "a.SupplierTypeCode='01' AND b.Id IS NULL")
 	}()
 	errinfo.Message = "更新中,请勿重复更新！"
 	errinfo.Code = 0
@@ -3064,9 +3064,8 @@ func (this *OilGoodsAptitudeController) Suspend() {
 	var err error
 	var list []supplier.OilSupplierContrast
 	svc := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
-	svc.GetEntitysByWhere("OilSupplierContrast", "1=1", &list)
 	go func() {
-		svc.GetEntitysByWhere("OilSupplierContrast", "1=1", &list)
+		svc.GetEntitysByWhere("OilSupplierContrast", "Checked = '0'", &list)
 		for _,item := range list{
 			var sub []suppliercertsub.OilSupplierCertSub
 			svc.GetEntitysByWhere("OilSupplierCertSub", "SupplierTypeCode = '01' and SupplierId = " + strconv.Itoa(item.Id), &sub)

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

@@ -2124,7 +2124,7 @@ func (this *OilTechnologyServiceController) GetDelCertSubList() {
 	this.ServeJSON()
 }
 
-// @Title 确认更新后的删除/暂停企业准入范围 2020-12-18
+// @Title 确认更新后的删除/修改 2020-12-18
 // @Description 修改实体
 // @Success	200	{object} controllers.Request
 // @router /deleteUpdate [post]
@@ -2138,22 +2138,14 @@ func (this *OilTechnologyServiceController) DeleteUpdate() {
 	go func() {
 		svc := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
 		var list1 []goodsaptitude.GoodsBusiness1
-		svc.GetEntityJoin(&list1)
+		svc.GetEntityJoin(OilTechnologyServiceName, OilTechnologyServiceClassName, &list1)
 		for _,item := range list1{
 			var subDelete suppliercertsub.OilSupplierCertSub1
-			cols := []string{"GoodsLevel", "Name"}
-			subDelete.GoodsLevel = item.GoodsLevel
-			subDelete.Name = item.Name
-			if item.GoodsLevel == "1" {
-				// 1降2修改
-				err = svc.UpdateEntityBywheretbl(OilSupplierCertSubName, &subDelete, cols, "SupplierTypeCode = '03' and Code = '" + item.Code + "'")
-			} else {
-				err = svc.UpdateEntityBywheretbl(OilSupplierCertSubName, &subDelete, cols, "SupplierTypeCode = '03' and GoodsLevel = '2' and Code = '" + item.Code + "'")
-				//2升1删除
-				err = svc.DeleteTable (OilSupplierCertSubName, "SupplierTypeCode = '01' and GoodsLevel = '1' and Code = '" + item.Code + "'")
-			}
+			cols := []string{"Code"}
+			subDelete.Code = item.Code
+			err = svc.UpdateEntityBywheretbl(OilSupplierCertSubName, &subDelete, cols, "SupplierTypeCode = '03' and Name = '" + item.Name + "'")
 		}
-		err = svc.DeleteTableBySelect(OilSupplierCertSubName, OilGoodsAptitudeClassName, "a.SupplierTypeCode='02' AND b.Id IS NULL")
+		err = svc.DeleteTableBySelect(OilSupplierCertSubName, OilTechnologyServiceClassName, "a.SupplierTypeCode='03' AND b.Id IS NULL")
 	}()
 	errinfo.Message = "更新中,请勿重复更新！"
 	errinfo.Code = 0
@@ -2161,7 +2153,7 @@ func (this *OilTechnologyServiceController) DeleteUpdate() {
 	this.ServeJSON()
 }
 
-// @Title 确认更新后的删除/暂停企业准入范围 2020-12-18
+// @Title 暂停企业准入范围 2020-12-18
 // @Description 修改实体
 // @Success	200	{object} controllers.Request
 // @router /suspend [post]
@@ -2170,15 +2162,14 @@ func (this *OilTechnologyServiceController) DeleteSuspend() {
 	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.GetEntitysByWhere("OilSupplierTecContrast", "Checked = '0'", &list)
 		for _,item := range list{
 			var sub []suppliercertsub.OilSupplierCertSub
 			svc.GetEntitysByWhere("OilSupplierCertSub", "SupplierTypeCode = '03' and SupplierId = " + strconv.Itoa(item.Id), &sub)
 			for _, itemSub := range sub {
-				//sql := "SELECT CONCAT_WS(',',IF(ifnull(F01, '') = '', '', F01),IF(ifnull(F02, '') = '', '', F02),IF(ifnull(F03, '') = '', '', F03),IF(ifnull(F04, '') = '', '', F04),IF(ifnull(F05, '') = '', '', F05),IF(ifnull(F06, '') = '', '', F06),IF(ifnull(F07, '') = '', '', F07),IF(ifnull(F08, '') = '', '', F08),IF(ifnull(F09, '') = '', '', F09),IF(ifnull(F10, '') = '', '', F10),IF(ifnull(F11, '') = '', '', F11),IF(ifnull(F12, '') = '', '', F12),IF(ifnull(F13, '') = '', '', F13),IF(ifnull(F14, '') = '', '', F14),IF(ifnull(F15, '') = '', '', F15),IF(ifnull(F16, '') = '', '', F16),IF(ifnull(F17, '') = '', '', F17),IF(ifnull(F18, '') = '', '', F18),IF(ifnull(F19, '') = '', '', F19),IF(ifnull(F20, '') = '', '', F20),IF(ifnull(F21, '') = '', '', F21),IF(ifnull(F22, '') = '', '', F22),IF(ifnull(F23, '') = '', '', F23),IF(ifnull(F24, '') = '', '', F24),IF(ifnull(F25, '') = '', '', F25),IF(ifnull(F26, '') = '', '', F26),IF(ifnull(F27, '') = '', '', F27),IF(ifnull(F28, '') = '', '', F28),IF(ifnull(F29, '') = '', '', F29),IF(ifnull(F30, '') = '', '', F30),IF(ifnull(F31, '') = '', '', F31),IF(ifnull(F32, '') = '', '', F32),IF(ifnull(F33, '') = '', '', F33),IF(ifnull(F34, '') = '', '', F34),IF(ifnull(F35, '') = '', '', F35),IF(ifnull(F36, '') = '', '', F36),IF(ifnull(F37, '') = '', '', F37),IF(ifnull(F38, '') = '', '', F38),IF(ifnull(F39, '') = '', '', F39),IF(ifnull(F40, '') = '', '', F40),IF(ifnull(F41, '') = '', '', F41),IF(ifnull(F42, '') = '', '', F42),IF(ifnull(F43, '') = '', '', F43),IF(ifnull(F44, '') = '', '', F44),IF(ifnull(F45, '') = '', '', F45),IF(ifnull(F46, '') = '', '', F46),IF(ifnull(F47, '') = '', '', F47),IF(ifnull(F48, '') = '', '', F48),IF(ifnull(F49, '') = '', '', F49),IF(ifnull(F50, '') = '', '', F50),IF(ifnull(F51, '') = '', '', F51),IF(ifnull(F52, '') = '', '', F52)) AS Codes,Code FROM Tmp_OilTechnologyService a LEFT JOIN Tmp_OilTechnologyServiceClass class ON a.ClassId = class.Id"
-				sql := "SELECT Code FROM Tmp_OilTechnologyService a LEFT JOIN Tmp_OilTechnologyServiceClass class ON a.ClassId = class.Id"
+				sql := "SELECT CONCAT_WS(',',IF(ifnull(F01, '') = '', '', F01),IF(ifnull(F02, '') = '', '', F02),IF(ifnull(F03, '') = '', '', F03),IF(ifnull(F04, '') = '', '', F04),IF(ifnull(F05, '') = '', '', F05),IF(ifnull(F06, '') = '', '', F06),IF(ifnull(F07, '') = '', '', F07),IF(ifnull(F08, '') = '', '', F08),IF(ifnull(F09, '') = '', '', F09),IF(ifnull(F10, '') = '', '', F10),IF(ifnull(F11, '') = '', '', F11),IF(ifnull(F12, '') = '', '', F12),IF(ifnull(F13, '') = '', '', F13),IF(ifnull(F14, '') = '', '', F14),IF(ifnull(F15, '') = '', '', F15),IF(ifnull(F16, '') = '', '', F16),IF(ifnull(F17, '') = '', '', F17),IF(ifnull(F18, '') = '', '', F18),IF(ifnull(F19, '') = '', '', F19),IF(ifnull(F20, '') = '', '', F20),IF(ifnull(F21, '') = '', '', F21),IF(ifnull(F22, '') = '', '', F22),IF(ifnull(F23, '') = '', '', F23),IF(ifnull(F24, '') = '', '', F24),IF(ifnull(F25, '') = '', '', F25),IF(ifnull(F26, '') = '', '', F26),IF(ifnull(F27, '') = '', '', F27),IF(ifnull(F28, '') = '', '', F28),IF(ifnull(F29, '') = '', '', F29),IF(ifnull(F30, '') = '', '', F30),IF(ifnull(F31, '') = '', '', F31),IF(ifnull(F32, '') = '', '', F32),IF(ifnull(F33, '') = '', '', F33),IF(ifnull(F34, '') = '', '', F34),IF(ifnull(F35, '') = '', '', F35),IF(ifnull(F36, '') = '', '', F36),IF(ifnull(F37, '') = '', '', F37),IF(ifnull(F38, '') = '', '', F38),IF(ifnull(F39, '') = '', '', F39),IF(ifnull(F40, '') = '', '', F40),IF(ifnull(F41, '') = '', '', F41),IF(ifnull(F42, '') = '', '', F42),IF(ifnull(F43, '') = '', '', F43),IF(ifnull(F44, '') = '', '', F44),IF(ifnull(F45, '') = '', '', F45),IF(ifnull(F46, '') = '', '', F46),IF(ifnull(F47, '') = '', '', F47),IF(ifnull(F48, '') = '', '', F48),IF(ifnull(F49, '') = '', '', F49),IF(ifnull(F50, '') = '', '', F50),IF(ifnull(F51, '') = '', '', F51),IF(ifnull(F52, '') = '', '', F52)) AS Codes,Code FROM Tmp_OilTechnologyService a LEFT JOIN Tmp_OilTechnologyServiceClass class ON a.ClassId = class.Id"
 				sql += " where class.Name = '"+ itemSub.Name + "'"
 				model, _ := svc.DBE.QueryString(sql)
 				var subDelete suppliercertsub.OilSupplierCertSub

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

@@ -823,8 +823,8 @@ func (s *MyServiceBase) DeleteTableBySelect(tableName, tableName2, where string)
 	return err
 }
 
-func (s *MyServiceBase) GetEntityJoin(entityPtr interface{}) (has bool) {
-	sql := "SELECT a.GoodsLevel, class.Code, class.Name FROM OilGoodsAptitude a LEFT JOIN OilGoodsAptitudeClass class ON a.ClassId = class.Id "
+func (s *MyServiceBase) GetEntityJoin(tableName string, tableName2 string,entityPtr interface{}) (has bool) {
+	sql := "SELECT a.GoodsLevel, class.Code, class.Name FROM " + tableName + " a LEFT JOIN " + tableName2 + " class ON a.ClassId = class.Id "
 	s.DBE.SQL(sql).Find(entityPtr)
 	return
 }

src/dashoo.cn/frontend_web/src/api/oilsupplier/goodsaptitude.js

@@ -194,7 +194,13 @@ export default {
   },
   deleteSuspend (myAxios) {
     return myAxios({
-      url: '/goodsaptitude/delete-suspend',
+      url: '/goodsaptitude/deleteUpdate',
+      method: 'POST'
+    })
+  },
+  suspend (myAxios) {
+    return myAxios({
+      url: '/goodsaptitude/suspend',
       method: 'POST'
     })
   },

src/dashoo.cn/frontend_web/src/api/oilsupplier/technologyservice.js

@@ -134,7 +134,13 @@ export default {
   },
   deleteSuspend (myAxios) {
     return myAxios({
-      url: '/technologyservice/delete-suspend',
+      url: '/technologyservice/deleteUpdate',
+      method: 'POST'
+    })
+  },
+  suspend (myAxios) {
+    return myAxios({
+      url: '/goodsaptitude/suspend',
       method: 'POST'
     })
   },

src/dashoo.cn/frontend_web/src/pages/oilsupplier/goodsaptitude/index.vue

@@ -879,6 +879,12 @@
         })
         // })
       },
+      suspend () {
+        api.suspend(this.$axios).then(res => {
+          if (res.data.code === 0) {
+          }
+        })
+      },
       truncateimport () {
         this.$confirm('此操作将清空导入的数据, 是否继续?', '提示', {
           confirmButtonText: '确定',
@@ -917,6 +923,7 @@
               })
               this.initDatas()
               this.deleteSuspend()
+              // this.suspend()
             } else {
               this.$message({
                 type: 'warning',