前后:基建对比;老数据导入加上目录

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

@@ -635,4 +635,10 @@ func (s *OilGoodsAptitudeService) GetEntityByCode(where string, entityPtr interf
 	sql := "SELECT COUNT((sub.GoodsLevel < goods.GoodsLevel) or null) AS OneTwoCount,COUNT((sub.GoodsLevel > goods.GoodsLevel) or null) AS TwoOneCount FROM OilSupplierCertSub sub LEFT JOIN tmp_OilGoodsAptitude goods ON sub.SubClassId=goods.ClassId where (" + where + ")"
 	s.DBE.SQL(sql).Get(entityPtr)
 	return
+}
+
+func (s *OilGoodsAptitudeService) GetEntityJoin(tableName string, tableName2 string,entityPtr interface{}) (has bool) {
+	sql := "SELECT a.GoodsLevel, class.Id, 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/backend/api/business/oilsupplier/technologyservice/oiltechnologyserviceService.go

@@ -363,4 +363,10 @@ func (s *OilTechnologyServiceService) DeleteOilSupplierCertSub(where string) err
 	sql := "DELETE FROM OilSupplierCertSub where " + where + " and Id NOT IN (SELECT dt.mid FROM (SELECT MIN(Id) AS mid FROM OilSupplierCertSub where " + where + " GROUP BY SupplierCertId) dt)"
 	_, err := s.DBE.Query(sql)
 	return err
+}
+
+func (s *OilTechnologyServiceService) GetEntityJoin(tableName string, tableName2 string,entityPtr interface{}) (has bool) {
+	sql := "SELECT class.Id, 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/backend/api/controllers/oilsupplier/basisbuild.go

@@ -1643,8 +1643,8 @@ func (this *OilBasisBuildController) GetDelCertSubList() {
 			code := strings.Split(model[0]["Codes"], ",")
 			i := 1
 			for _, value := range code {
-				if i == 41 || i == 42 || i == 1 {
-					if (code[0] == "1" && strings.Index(item.HeaderCodes, "F01") < 0) && (code[40] == "1" && strings.Index(item.HeaderCodes, "F41") < 0) && (code[41] == "1" && strings.Index(item.HeaderCodes, "F42") < 0) {
+				if i == 14 || i == 15 || i == 1 {
+					if (code[0] == "1" && strings.Index(item.HeaderCodes, "F01") < 0) && (code[13] == "1" && strings.Index(item.HeaderCodes, "F14") < 0) && (code[14] == "1" && strings.Index(item.HeaderCodes, "F15") < 0) {
 						list[a].Checked = 1
 						sql1 := "select Name from Base_TableHeader where Code = 'F01' and CategoryCode = '02'"
 						model1, _ := svc.DBE.QueryString(sql1)

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

@@ -2128,8 +2128,8 @@ func (this *OilTechnologyServiceController) DeleteUpdate() {
 	var errinfo ErrorInfo
 	var err error
 	go func() {
-		svc := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
-		var list1 []goodsaptitude.GoodsBusiness1
+		svc := technologyservice.GetOilTechnologyServiceService(utils.DBE)
+		var list1 []goodsaptitude.GoodsBusiness2
 		svc.GetEntityJoin(OilTechnologyServiceName, OilTechnologyServiceClassName, &list1)
 		for _,item := range list1{
 			var subDelete suppliercertsub.OilSupplierCertSub1

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

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