历史数据导入调整-编码扩充

src/dashoo.cn/backend/api/business/tmpzcgf/tmpzcgfSession.go

@@ -420,8 +420,7 @@ func (s *TmpzcgtSession) InsertOilSupplierCertSub() error {
 				"from tmp_zengxiang " +
 				"limit " + start + "," +  end
 			_, err = s.DBE.Query(sql)
-			s.UpdateCertSubIsType2()
-			s.UpdateOilSupplierCertSub()
+			// s.UpdateCertSubIsType2()
 		}
 	}
 
@@ -447,16 +446,18 @@ func (s *TmpzcgtSession) UpOilSupplierCertAppend() error {
 }
 
 func (s *TmpzcgtSession) UpdateCertSubIsType2() error {
-	/** sql := "UPDATE OilSupplierCertSub b SET " +
+	/*sql := "UPDATE OilSupplierCertSub b SET " +
 		"b.SupplierId = IFNULL((SELECT a.`SupplierId` FROM OilSupplierCertAppend a WHERE a.`OldId` = b.OldId AND a.AppendType = b.SupplierTypeCode AND a.ApplyDate = b.CreateOn limit 1), 0), " +
 		"b.SupplierCertId = IFNULL((SELECT a.`SupplierCertId` FROM OilSupplierCertAppend a WHERE a.`OldId` = b.OldId AND a.AppendType = b.SupplierTypeCode AND a.ApplyDate = b.CreateOn limit 1), 0), " +
 		"b.SupplierCertAppendId = IFNULL((SELECT a.`Id` FROM OilSupplierCertAppend a WHERE a.`OldId` = b.OldId AND a.AppendType = b.SupplierTypeCode AND a.ApplyDate = b.CreateOn limit 1), 0) " +
-		where */
+		"where b.Type = '3' and (b.SupplierId is null or b.SupplierId = 0)"*/
+
 	sql := "UPDATE OilSupplierCertSub b left join OilSupplierCertAppend a ON (a.`OldId` = b.OldId AND a.AppendType = b.SupplierTypeCode AND a.ApplyDate = b.CreateOn) SET " +
 		"b.SupplierId = IFNULL(a.`SupplierId`, 0), " +
 		"b.SupplierCertId = IFNULL(a.`SupplierCertId`, 0), " +
 		"b.SupplierCertAppendId = IFNULL(a.`Id`, 0) " +
 		"where b.Type = '3' and (b.SupplierId is null or b.SupplierId = 0)"
+	
 	_, err := s.DBE.Query(sql)
 	return err
 }
@@ -480,9 +481,3 @@ func (s *TmpzcgtSession) UpdateSupplierFileSId() error {
 	return err
 }
 
-// 编码扩充开始
-func (s *TmpzcgtSession) UpdateOilSupplierCertSub() error {
-	sql := "update OilSupplierCertSub certsub LEFT JOIN OilGoodsAptitudeClass aptclass ON aptclass.CODE like CONCAT(certsub.Code, '%') and LENGTH(aptclass.CODE) = 8 SET certsub.Name = aptclass.Name, certsub.Code = aptclass.Code where SupplierTypeCode='01' and LENGTH(certsub.CODE) != 8"
-	_, err := s.DBE.Query(sql)
-	return err
-}

src/dashoo.cn/backend/api/controllers/tmpzcgf/tmpzcgf.go

@@ -1,7 +1,9 @@
 package tmpzcgf
 
 import (
+	"dashoo.cn/backend/api/business/oilsupplier/goodsaptitudeclass"
 	"fmt"
+	"strconv"
 	"time"
 
 	"dashoo.cn/backend/api/business/oilsupplier/infochange"
@@ -666,50 +668,39 @@ func (this *TmpzcgfController) CapacityExpansion() {
 	fmt.Println("==========编码扩充开始=========")
 	t := time.Now()
 
-	//svc := supplier.GetOilSupplierService(utils.DBE)
-	//var suppliercertList []suppliercert.OilSupplierCert
-	//where := "SupplierTypeCode='01' and InFlag != '3' "
-	//svc.GetEntities(&suppliercertList, where)
-
+	svc := suppliercertsub.GetOilSupplierCertSubService(utils.DBE)
 	// 供应商
-	//for _, suppliercert := range suppliercertList {
-	//	var supplierCertSubList []suppliercertsub.OilSupplierCertSub
-	//	wheresup := "SupplierId = " + strconv.Itoa(suppliercert.SupplierId) + " and SupplierTypeCode='01' and LENGTH(CODE) != 8 "
-	//	svc.GetEntities(&supplierCertSubList, wheresup)
-	//	// 准入项
-	//	for _, supplierCertSub := range supplierCertSubList {
-	//		var goodsAptitudeClassList []goodsaptitudeclass.OilGoodsAptitudeClass
-	//		whereclass := "Code like '" + supplierCertSub.Code + "%' and LENGTH(CODE) = 8"
-	//		svc.GetEntities(&goodsAptitudeClassList, whereclass)
-	//
-	//		for _, goodsAptitudeClass := range goodsAptitudeClassList {
-	//			var entity suppliercertsub.OilSupplierCertSub
-	//			entity.SupplierId = supplierCertSub.SupplierId
-	//			entity.SupplierCertId = supplierCertSub.SupplierCertId
-	//			entity.SupplierTypeCode = supplierCertSub.SupplierTypeCode
-	//			entity.AppendStatus = supplierCertSub.AppendStatus
-	//			entity.Type = supplierCertSub.Type
-	//			entity.Name = goodsAptitudeClass.Name
-	//			entity.Code = goodsAptitudeClass.Code
-	//			entity.CertSubStatus = supplierCertSub.CertSubStatus
-	//			entity.Remark = "编码扩充"
-	//			svc.InsertEntityBytbl(OilSupplierCertSubName, &entity)
-	//		}
-	//
-	//		wheredel := "Id = " + strconv.Itoa(supplierCertSub.Id)
-	//		svc.DeleteEntityBytbl(OilSupplierCertSubName, wheredel)
-	//
-	//	}
-	//
-	//}
-	svc := tmpzcgf.GetTmpzcgtService(utils.DBE)
-	err := svc.UpdateOilSupplierCertSub()
-	if err != nil {
-		// session.Rollback()
-		fmt.Println(err)
+	var supplierCertSubList []suppliercertsub.OilSupplierCertSub
+	wheresup := " SupplierTypeCode='01' and LENGTH(CODE) != 8 "
+	svc.GetEntities(&supplierCertSubList, wheresup)
+	// 准入项
+	for _, supplierCertSub := range supplierCertSubList {
+		var goodsAptitudeClassList []goodsaptitudeclass.OilGoodsAptitudeClass
+		whereclass := "Code like '" + supplierCertSub.Code + "%' and LENGTH(CODE) = 8"
+		svc.GetEntities(&goodsAptitudeClassList, whereclass)
+
+		// 扩充的编码
+		for _, goodsAptitudeClass := range goodsAptitudeClassList {
+			var entity suppliercertsub.OilSupplierCertSub
+			entity.SupplierId = supplierCertSub.SupplierId
+			entity.SupplierCertId = supplierCertSub.SupplierCertId
+			entity.SupplierTypeCode = supplierCertSub.SupplierTypeCode
+			entity.AppendStatus = supplierCertSub.AppendStatus
+			entity.Type = supplierCertSub.Type
+			entity.Name = goodsAptitudeClass.Name
+			entity.Code = goodsAptitudeClass.Code
+			entity.CertSubStatus = supplierCertSub.CertSubStatus
+			entity.Remark = "编码扩充"
+			svc.InsertEntityBytbl(OilSupplierCertSubName, &entity)
+		}
+
+		wheredel := "Id = " + strconv.Itoa(supplierCertSub.Id)
+		svc.DeleteEntityBytbl(OilSupplierCertSubName, wheredel)
+
 	}
 
 	elapsed := time.Since(t)
+	fmt.Println(elapsed)
 	fmt.Println("==========编码扩充完成=========", t, elapsed)
 
 }
@@ -873,9 +864,9 @@ func (this *TmpzcgfController) InsertAll() {
 	this.InsertOilSupplierCertAppend()
 	this.UpdateOilSupplierCertAppend()
 	this.InsertOilSupplierCertSub() //插入增项的准入范围
-	//this.UpdateCertSubIsType1() // 更新增项的准入范围 在插入调用了
+	this.UpdateCertSubIsType1() // 更新增项的准入范围
 
-	//this.CapacityExpansion() // 编码扩充  在插入调用了
+	this.CapacityExpansion() // 编码扩充
 	// 历史数据导入-由于运行到此处中断，上面的代码临时注释
 	// this.UpdateCertSubIsType3() // 更新增项的准入范围 弃用 2020年11月26日
 	this.InsterAnnualAudit()