dubch пре 5 година
родитељ
комит
979ce3b7bb

+ 7 - 0
src/dashoo.cn/backend/api/business/tmpzcgf/tmpzcgfSession.go

@@ -411,3 +411,10 @@ func (s *TmpzcgtSession) UpdateSupplierFileSId() error {
 	_, err := s.DBE.Query(sql)
 	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
+}

+ 73 - 86
src/dashoo.cn/backend/api/controllers/tmpzcgf/tmpzcgf.go

@@ -2,10 +2,8 @@ package tmpzcgf
 
 import (
 	"fmt"
-	"strconv"
 	"time"
 
-	"dashoo.cn/backend/api/business/oilsupplier/goodsaptitudeclass"
 	"dashoo.cn/backend/api/business/oilsupplier/infochange"
 	"dashoo.cn/backend/api/business/oilsupplier/supplier"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
@@ -661,58 +659,47 @@ 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 := supplier.GetOilSupplierService(utils.DBE)
+	//var suppliercertList []suppliercert.OilSupplierCert
+	//where := "SupplierTypeCode='01' and InFlag != '3' "
+	//svc.GetEntities(&suppliercertList, where)
 
 	// 供应商
-	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)
-
-			// 扩充的编码
-			/** var entitys = make([]suppliercertsub.OilSupplierCertSub, len(goodsAptitudeClassList))
-			for idx, goodsAptitudeClass := range goodsAptitudeClassList {
-				entitys[idx].SupplierId = supplierCertSub.SupplierId
-				entitys[idx].SupplierCertId = supplierCertSub.SupplierCertId
-				entitys[idx].SupplierTypeCode = supplierCertSub.SupplierTypeCode
-				entitys[idx].AppendStatus = supplierCertSub.AppendStatus
-				entitys[idx].Type = supplierCertSub.Type
-				entitys[idx].Name = goodsAptitudeClass.Name
-				entitys[idx].Code = goodsAptitudeClass.Code
-				entitys[idx].CertSubStatus = supplierCertSub.CertSubStatus
-				entitys[idx].Remark = "编码扩充"
-			}
-			svc.InsertEntityBytbl(OilSupplierCertSubName, &entitys) */
-			// fmt.Println("编码扩充:")
-			// fmt.Println(entitys)
-
-			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)
-
-		}
-
+	//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)
 	}
 
 	elapsed := time.Since(t)
@@ -759,106 +746,106 @@ func (this *TmpzcgfController) ClearAll() {
 	fmt.Println("==========truncate table开始=========")
 	svc := tmpzcgf.GetTmpzcgtService(utils.DBE)
 	sql := "truncate table OilAnnualAudit"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table OilCorporateInfo"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table OilEnterpriseMajorEquipment"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table OilInfoChange"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table OilInfoChangeItem"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table OilPatentStatistical"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table OilPaymentInfo"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table OilQualChangeDetail"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table OilQualChangeMain"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table OilSupplier"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table OilSupplierCert"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table OilSupplierCert2File"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table OilSupplierCertAppend"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table OilSupplierCertAppendSub"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table OilSupplierCertSub"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table OilSupplierFile"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table OilSupplierOldInfo"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table OilSupplierOpinion"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table OilThreeYearsPerformance"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table OilWinningProject"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table s5OVEDocumentHistory"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table s5OVEDocumentInfo"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table Del_OilAnnualAudit"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table Del_OilInfoChange"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table Del_OilPaymentInfo"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table Del_OilSupplier"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table Del_OilSupplierCert"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table Del_OilSupplierCertAppend"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table Del_OilSupplierCertSub"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table Del_OilSupplierFile"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table Manufacturer"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table BadRecord"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table BadRecordHistory"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 
 	sql = "truncate table Base_AuditHistory"
-	svc.DBE.SQL(sql).Exec()
+	svc.DBE.Query(sql)
 	fmt.Println("==========truncate table结束=========")
 
 }