优化

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

@@ -2018,8 +2018,8 @@ func (this *OilGoodsAptitudeController) GetDelCertSubList() {
 	total := svc.GetPagingTmpSubEntities(page.CurrentPage, page.Size, orderby, asc, &list, where)
 	a := 0
 	for _, item := range list {
-		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)) AS Codes FROM tmp_OilGoodsAptitude "
-		sql += " where ClassId = "+ strconv.Itoa(item.SubClassId)
+		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)) AS Codes FROM tmp_OilGoodsAptitude a LEFT JOIN tmp_OilGoodsAptitudeClass class ON a.ClassId = class.Id"
+		sql += " where class.Code = '"+ item.Code + "'"
 		model, _ := svc.DBE.QueryString(sql)
 		if model == nil {
 			continue
@@ -2077,10 +2077,9 @@ func (this *OilGoodsAptitudeController) DelTmpSupplierCertSub() {
 
 	svc := goodsaptitude.GetOilGoodsAptitudeSession(session)
 
-	var supplierCertSubList []suppliercertsub.OilSupplierCertSub
-	wheredel := "1=1 and a.SupplierTypeCode = '01' and a.Type in (1,3)"
+	wheredel := "1=1 and a.SupplierTypeCode = '01'"
 	if supplierId != "" {
-		wheredel += " and a.SupplierId=" + supplierId
+		wheredel += " and a.Id=" + supplierId
 	}
 	if id != "" {
 		wheredel += " and a.Id=" + id
@@ -2088,62 +2087,68 @@ func (this *OilGoodsAptitudeController) DelTmpSupplierCertSub() {
 	svc1 := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
 	//svc.GetEntitysByWhere(TmpOilSupplierCertSubName, wheredel, &supplierCertSubList)
 	//svc.GetEntitysByWhere(OilSupplierCertSubName, wheredel, &supplierCertSubList)
-	svc1.GetPagingSubEntities(0, 0, "Id", false, &supplierCertSubList, wheredel)
+	//svc1.GetPagingSubEntities(0, 0, "Id", false, &supplierCertSubList, wheredel)
+
+	var list2 []supplier.OilSupplierContrast
+
+	svc1.GetMyPagingEntitiesWithOrderBytbl("OilSupplierContrastNew", 0, 0, "Id", false, &list2, wheredel)
 
 	a := 0
 	var errinfo ErrorInfo
-	for _, item := range supplierCertSubList {
-		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)) AS Codes FROM tmp_OilGoodsAptitude "
-		sql += " where ClassId = "+ strconv.Itoa(item.SubClassId)
-		model, _ := svc1.DBE.QueryString(sql)
-		code := strings.Split(model[0]["Codes"], ",")
-		i := 1
-		for _, value := range code {
-			if i == 36 || i == 37 || i == 1 {
-				if (code[0] == "1" && strings.Index(item.HeaderCodes, "F01") < 0) && (code[35] == "1" && strings.Index(item.HeaderCodes, "F36") < 0) && (code[36] == "1" && strings.Index(item.HeaderCodes, "F37") < 0) {
-					where := "Id = " + strconv.Itoa(item.Id)
-					err = svc.DeleteEntityBytbl(OilSupplierCertSubName, where)
-					if err != nil {
-						session.Rollback()
-						errinfo.Code = -1
-						errinfo.Message = "删除失败！"
-						this.Data["json"] = &errinfo
-						this.ServeJSON()
+	for _, item2 := range list2 {
+		var supplierCertSubList []suppliercertsub.OilSupplierCertSub
+		where := " SupplierId = " + strconv.Itoa(item2.Id)
+		svc1.GetEntitysByWhere(OilSupplierCertSubName, where, &supplierCertSubList)
+		for _, item := range supplierCertSubList {
+			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)) AS Codes FROM OilGoodsAptitude a LEFT JOIN OilGoodsAptitudeClass class ON a.ClassId = class.Id"
+			sql += " where class.Code = '"+ item.Code + "'"
+			model, _ := svc1.DBE.QueryString(sql)
+			code := strings.Split(model[0]["Codes"], ",")
+			i := 1
+			for _, value := range code {
+				if i == 36 || i == 37 || i == 1 {
+					if (code[0] == "1" && strings.Index(item.HeaderCodes, "F01") < 0) && (code[35] == "1" && strings.Index(item.HeaderCodes, "F36") < 0) && (code[36] == "1" && strings.Index(item.HeaderCodes, "F37") < 0) {
+						where := "Id = " + strconv.Itoa(item.Id)
+						err = svc.DeleteEntityBytbl(OilSupplierCertSubName, where)
+						if err != nil {
+							session.Rollback()
+							errinfo.Code = -1
+							errinfo.Message = "删除失败！"
+							this.Data["json"] = &errinfo
+							this.ServeJSON()
+						}
 					}
-				}
-			} else if i > 10 {
-				if value == "1" && strings.Index(item.HeaderCodes, "F"+strconv.Itoa(i)) < 0 {
-					where := "Id = " + strconv.Itoa(item.Id)
-					err = svc.DeleteEntityBytbl(OilSupplierCertSubName, where)
-					if err != nil {
-						session.Rollback()
-						errinfo.Code = -1
-						errinfo.Message = "删除失败！"
-						this.Data["json"] = &errinfo
-						this.ServeJSON()
+				} else if i > 10 {
+					if value == "1" && strings.Index(item.HeaderCodes, "F"+strconv.Itoa(i)) < 0 {
+						where := "Id = " + strconv.Itoa(item.Id)
+						err = svc.DeleteEntityBytbl(OilSupplierCertSubName, where)
+						if err != nil {
+							session.Rollback()
+							errinfo.Code = -1
+							errinfo.Message = "删除失败！"
+							this.Data["json"] = &errinfo
+							this.ServeJSON()
+						}
 					}
-				}
-			} else {
-				if value == "1" && strings.Index(item.HeaderCodes, "F0"+strconv.Itoa(i)) < 0 {
-					where := "Id = " + strconv.Itoa(item.Id)
-					err = svc.DeleteEntityBytbl(OilSupplierCertSubName, where)
-					if err != nil {
-						session.Rollback()
-						errinfo.Code = -1
-						errinfo.Message = "删除失败！"
-						this.Data["json"] = &errinfo
-						this.ServeJSON()
+				} else {
+					if value == "1" && strings.Index(item.HeaderCodes, "F0"+strconv.Itoa(i)) < 0 {
+						where := "Id = " + strconv.Itoa(item.Id)
+						err = svc.DeleteEntityBytbl(OilSupplierCertSubName, where)
+						if err != nil {
+							session.Rollback()
+							errinfo.Code = -1
+							errinfo.Message = "删除失败！"
+							this.Data["json"] = &errinfo
+							this.ServeJSON()
+						}
 					}
 				}
+				i += 1
 			}
-			i += 1
+			a += 1
 		}
-		a += 1
-	}
-
-	for _, item := range supplierCertSubList {
-		where := "Id = " + strconv.Itoa(item.SupplierId)
-		err = svc.DeleteEntityBytbl("OilSupplierContrastNew", where)
+		where1 := "Id = " + strconv.Itoa(item2.Id)
+		err = svc.DeleteEntityBytbl("OilSupplierContrastNew", where1)
 	}
 
 	if err == nil {