单个公司迁移

src/dashoo.cn/backend/api/business/oilsupplier/suppliercertsub/oilsuppliercertsubService.go

@@ -86,18 +86,18 @@ func (s *OilSupplierCertSubService) GetWaitAuditBusinesslist(pageIndex, itemsPer
 	return total, List
 }
 
-func (s *OilSupplierCertSubService) GetListByCertId (certId string, supplierCertSubs *[]OilSupplierCertSub) {
+func (s *OilSupplierCertSubService) GetListByCertId(certId string, supplierCertSubs *[]OilSupplierCertSub) {
 	queryWhere := "SupplierCertId='" + certId + "'"
 	s.GetEntitysByWhere("OilSupplierCertSub", queryWhere, supplierCertSubs)
 }
 
-
-func (s *OilSupplierCertSubService) GetListByAppendId (appendId string, supplierCertSubs *[]OilSupplierCertSub) {
+func (s *OilSupplierCertSubService) GetListByAppendId(appendId string, supplierCertSubs *[]OilSupplierCertSub) {
 	queryWhere := "SupplierCertAppendId='" + appendId + "'"
 	s.GetEntitysByWhere("OilSupplierCertSub", queryWhere, supplierCertSubs)
 }
 
-func (s *OilSupplierCertSubService) GetIds (certId string, typeCode string, entitiesPtr interface{}, isManufacturer int, i string) {
+func (s *OilSupplierCertSubService) GetIds(certId string, typeCode string, entitiesPtr interface{}, isManufacturer int, i string) {
+	s.DBE.Query("SET GLOBAL group_concat_max_len=10240;")
 	sql := "SELECT GROUP_CONCAT(t.SubClassId) as Id FROM (SELECT SubClassId from OilSupplierCertSub WHERE SupplierCertId = " + certId + " AND SupplierTypeCode = '" + typeCode + "'"
 	if isManufacturer == 1 {
 		// 0 和 1
@@ -109,7 +109,7 @@ func (s *OilSupplierCertSubService) GetIds (certId string, typeCode string, enti
 	s.DBE.SQL(sql).Get(entitiesPtr)
 }
 
-func (s *OilSupplierCertSubService) GetCountIsManufacturer (certId string) (total int64) {
+func (s *OilSupplierCertSubService) GetCountIsManufacturer(certId string) (total int64) {
 	var resultsSlice []map[string][]byte
 	sql := "SELECT COUNT(Id) FROM OilSupplierCertSub WHERE IsManufacturer = 1 and SupplierCertId = " + certId
 	resultsSlice, _ = s.DBE.Query(sql)
@@ -125,7 +125,7 @@ func (s *OilSupplierCertSubService) GetCountIsManufacturer (certId string) (tota
 	return total
 }
 
-func (s *OilSupplierCertSubService) GetCountGrade (certId string) (total int64) {
+func (s *OilSupplierCertSubService) GetCountGrade(certId string) (total int64) {
 	var resultsSlice []map[string][]byte
 	sql := "SELECT COUNT(Id) FROM OilSupplierCertSub WHERE Grade = '1' and SupplierCertId = " + certId
 	resultsSlice, _ = s.DBE.Query(sql)
@@ -139,4 +139,4 @@ func (s *OilSupplierCertSubService) GetCountGrade (certId string) (total int64)
 	}
 
 	return total
-}
+}

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

@@ -276,8 +276,8 @@ func (s *TmpzcgtSession) InsterBadRecord() error {
 
 func (s *TmpzcgtSession) UpdateBadRecord() error {
 	/** sql := "UPDATE BadRecord b SET " +
-		"b.CompanyCode = (SELECT DISTINCT(a.SupplierId) FROM `OilSupplierCert` a WHERE  a.GfId = b.Bak1 AND a.SupplierId IS NOT NULL)," +
-		"b.CompanyName = (SELECT DISTINCT(a.OutsideFlog) FROM `OilSupplierCert` a WHERE  a.GfId = b.Bak1 AND a.OutsideFlog IS NOT NULL) " */
+	"b.CompanyCode = (SELECT DISTINCT(a.SupplierId) FROM `OilSupplierCert` a WHERE  a.GfId = b.Bak1 AND a.SupplierId IS NOT NULL)," +
+	"b.CompanyName = (SELECT DISTINCT(a.OutsideFlog) FROM `OilSupplierCert` a WHERE  a.GfId = b.Bak1 AND a.OutsideFlog IS NOT NULL) " */
 
 	sql := "UPDATE BadRecord b left join `OilSupplierCert` a ON a.GfId = b.Bak1 SET " +
 		"b.CompanyCode = a.SupplierId," +
@@ -289,8 +289,8 @@ func (s *TmpzcgtSession) UpdateBadRecord() error {
 
 func (s *TmpzcgtSession) UpdateOilAnnualAudit() error {
 	/** sql := "UPDATE OilAnnualAudit b SET b.SupplierId = (SELECT a.SupplierId FROM OilSupplierCert a WHERE a.GfId =b.OldId AND a.SupplierTypeCode = b.SupplierTypeName )," +
-		"b.CerId = (SELECT a.Id FROM OilSupplierCert a WHERE a.GfId =b.OldId AND a.SupplierTypeCode = b.SupplierTypeName )," +
-		"b.AccessCardNo = (SELECT a.AccessCardNo FROM OilSupplierCert a WHERE a.GfId =b.OldId AND a.SupplierTypeCode = b.SupplierTypeName )" */
+	"b.CerId = (SELECT a.Id FROM OilSupplierCert a WHERE a.GfId =b.OldId AND a.SupplierTypeCode = b.SupplierTypeName )," +
+	"b.AccessCardNo = (SELECT a.AccessCardNo FROM OilSupplierCert a WHERE a.GfId =b.OldId AND a.SupplierTypeCode = b.SupplierTypeName )" */
 	sql := "UPDATE OilAnnualAudit b left join OilSupplierCert a ON (a.GfId =b.OldId AND a.SupplierTypeCode = b.SupplierTypeName) SET b.SupplierId = a.SupplierId," +
 		"b.CerId = a.Id," +
 		"b.AccessCardNo = a.AccessCardNo"
@@ -322,8 +322,8 @@ func (s *TmpzcgtSession) InsertCertSub() error {
 		s.DBE.Query("ALTER TABLE `OilSupplierCertSub` drop INDEX index_supplierappendid ;")
 		s.DBE.Query("ALTER TABLE `OilSupplierCertSub` DISABLE KEYS;")
 		s.DBE.Query("SET unique_checks=0;")
-		fmt.Println("循环总数-"+strconv.Itoa(int(n)))
-		for i:=0; i < int(n); i++ {
+		fmt.Println("循环总数-" + strconv.Itoa(int(n)))
+		for i := 0; i < int(n); i++ {
 			start := strconv.Itoa(i * 50000)
 			end := strconv.Itoa(50000)
 			sql := "INSERT INTO `OilSupplierCertSub` (" +
@@ -349,30 +349,30 @@ func (s *TmpzcgtSession) InsertCertSub() error {
 					FROM T_资格预审表_JRMX t
 					where t.auto_id >= (SELECT auto_id FROM T_资格预审表_JRMX ORDER BY auto_id LIMIT ` + start + ", 1)" +
 				" limit " + end
-				/*
+			/*
 				ORDER BY t.auto_id  +
 				" limit " + start + "," +  end*/
 			_, err = s.DBE.Query(sql)
 			/*time.Sleep(time.Duration(500)*time.Millisecond)
 			s.DBE.Query("COMMIT;")*/
-			fmt.Println("循环次数-"+strconv.Itoa(i))
+			fmt.Println("循环次数-" + strconv.Itoa(i))
 			//time.Sleep(time.Duration(500)*time.Millisecond)
 		}
 		// s.DBE.Query("SET autocommit=1;")
 		s.DBE.Query("SET unique_checks=1;")
 		s.DBE.Query("ALTER TABLE `OilSupplierCertSub` ENABLE KEYS;")
 		/*
-		//s.DBE.Query("ALTER TABLE `OilSupplierCertSub` ADD INDEX index_typecode ( `SupplierTypeCode` );")
-		s.DBE.Query("ALTER TABLE `OilSupplierCertSub` ADD INDEX index_code ( `Code` );")*/
+			//s.DBE.Query("ALTER TABLE `OilSupplierCertSub` ADD INDEX index_typecode ( `SupplierTypeCode` );")
+			s.DBE.Query("ALTER TABLE `OilSupplierCertSub` ADD INDEX index_code ( `Code` );")*/
 	}
 	return err
 }
 
 func (s *TmpzcgtSession) UpdateCertSub() error {
 	/*sql := "UPDATE OilSupplierCertSub b SET b.SupplierId = IFNULL((SELECT a.SupplierId FROM OilSupplierCert a WHERE a.GfId =b.OldId AND a.SupplierTypeCode = b.SupplierTypeCode AND a.SupplierId IS NOT NULL limit 1 ), 0)," +
-		"b.SupplierCertId = IFNULL((SELECT a.Id FROM OilSupplierCert a WHERE a.GfId =b.OldId AND a.SupplierTypeCode = b.SupplierTypeCode limit 1), 0) " +
-		" where b.Type = '1' and b.CreateBy='导入1'"*/
-	var certList [] suppliercert.OilSupplierCert
+	"b.SupplierCertId = IFNULL((SELECT a.Id FROM OilSupplierCert a WHERE a.GfId =b.OldId AND a.SupplierTypeCode = b.SupplierTypeCode limit 1), 0) " +
+	" where b.Type = '1' and b.CreateBy='导入1'"*/
+	var certList []suppliercert.OilSupplierCert
 	//svc.GetEntitysByWhere(OilSupplierCertAppendSubName, where, &list)
 	s.GetEntitysByWhere("OilSupplierCert", "", &certList)
 
@@ -382,11 +382,11 @@ func (s *TmpzcgtSession) UpdateCertSub() error {
 	s.DBE.Query("SET autocommit=0;")
 	for _, cert := range certList {
 		sql := " UPDATE OilSupplierCertSub b SET b.SupplierId = '" + strconv.Itoa(cert.SupplierId) + "'," +
-			" b.SupplierCertId='"+ strconv.Itoa(cert.Id) + "',"+
+			" b.SupplierCertId='" + strconv.Itoa(cert.Id) + "'," +
 			" b.SupplierTypeCode='" + cert.SupplierTypeCode + "'" +
 			" where b.OldId = '" + strconv.Itoa(cert.GfId) + "'"
 
-		   // "and b.Type = '1' and b.CreateBy='导入1'"
+		// "and b.Type = '1' and b.CreateBy='导入1'"
 
 		_, err = s.DBE.Query(sql)
 		s.DBE.Query("COMMIT;")
@@ -423,13 +423,13 @@ func (s *TmpzcgtSession) UpdateCertSubCaseWhen() error {
 		n := math.Ceil(float64(total) / 10)
 		s.DBE.Query("ALTER TABLE `OilSupplierCertSub` ADD INDEX index_oldid ( `OldId` );")
 		// s.DBE.Query("SET autocommit=0;")
-		for i:=0; i < int(n); i++ {
+		for i := 0; i < int(n); i++ {
 			when1 := ""
 			when2 := ""
 			when3 := ""
 			oldId := 0
-			var certList [] suppliercert.OilSupplierCert
-			s.GetPagingEntitiesWithOrderBytbl("", int64(i - 1), 10, "Gfid", true, &certList, "1=1")
+			var certList []suppliercert.OilSupplierCert
+			s.GetPagingEntitiesWithOrderBytbl("", int64(i-1), 10, "Gfid", true, &certList, "1=1")
 			for _, cert := range certList {
 				when1 += " WHEN " + strconv.Itoa(cert.GfId) + " THEN " + strconv.Itoa(cert.SupplierId)
 				when2 += " WHEN " + strconv.Itoa(cert.GfId) + " THEN " + strconv.Itoa(cert.Id)
@@ -467,7 +467,7 @@ func (s *TmpzcgtSession) UpdateCertSub02classId(where string) error {
 
 func (s *TmpzcgtSession) UpdateCertSub03classId(where string) error {
 	/** sql3 := "UPDATE OilSupplierCertSub b SET b.SubClassId = (SELECT a.Id FROM OilBasisBuild a WHERE a.Code = b.Code ) " +
-		"WHERE b.SupplierTypeCode = '03'" + where */
+	"WHERE b.SupplierTypeCode = '03'" + where */
 	sql3 := "UPDATE OilSupplierCertSub b left join OilTechnologyServiceClass a ON a.Code = b.Code SET b.SubClassId = a.Id " +
 		"WHERE b.SupplierTypeCode = '03'" + where
 	_, err := s.DBE.Query(sql3)
@@ -580,8 +580,8 @@ func (s *TmpzcgtSession) UpdateOilInfoChange() error {
 
 func (s *TmpzcgtSession) UpOilSupplierCertAppend() error {
 	/** sql := "UPDATE OilSupplierCertAppend b SET " +
-		"b.SupplierId = IFNULL((SELECT a.`SupplierId` FROM OilSupplierCert a WHERE a.`GfId` = b.OldId AND a.SupplierTypeCode = b.AppendType limit 1), 0), " +
-		"b.SupplierCertId = IFNULL((SELECT a.`Id` FROM OilSupplierCert a WHERE a.`GfId` = b.OldId AND a.SupplierTypeCode = b.AppendType limit 1), 0) " */
+	"b.SupplierId = IFNULL((SELECT a.`SupplierId` FROM OilSupplierCert a WHERE a.`GfId` = b.OldId AND a.SupplierTypeCode = b.AppendType limit 1), 0), " +
+	"b.SupplierCertId = IFNULL((SELECT a.`Id` FROM OilSupplierCert a WHERE a.`GfId` = b.OldId AND a.SupplierTypeCode = b.AppendType limit 1), 0) " */
 	s.DBE.Query("SET unique_checks=0;")
 	s.DBE.Query("SET autocommit=0;")
 
@@ -600,16 +600,16 @@ func (s *TmpzcgtSession) UpOilSupplierCertAppend() error {
 // 更新增项准入编码 UpdateCertSubIsType2
 func (s *TmpzcgtSession) UpdateOilSupplierCertAppendSub() error {
 	/*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 b.Type = '3' and (b.SupplierId is null or b.SupplierId = 0)"*/
+	"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 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)"*/
+	"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)"*/
 	svc := suppliercertappend.GetOilSupplierCertAppendService(s.DBE)
 	var certAppendList []suppliercertappend.OilSupplierCertAppend
 	svc.GetEntitysByWhere("OilSupplierCertAppend", "", &certAppendList)
@@ -621,15 +621,15 @@ func (s *TmpzcgtSession) UpdateOilSupplierCertAppendSub() error {
 		appendCodeString := "("
 		for _, appendCode := range appendCodeList {
 			if len(appendCode) < 8 {
-				appendCodeString += " (a.Code LIKE '"  + appendCode + "%') or"
+				appendCodeString += " (a.Code LIKE '" + appendCode + "%') or"
 			} else {
-				appendCodeString += " (a.Code = '"  + appendCode + "') or"
+				appendCodeString += " (a.Code = '" + appendCode + "') or"
 			}
 		}
 		code := strings.TrimRight(appendCodeString, "or")
 		sql := "UPDATE OilSupplierCertSub a SET a.SupplierCertAppendId=" + strconv.Itoa(certAppend.Id) +
 			", a.`Type`=3 WHERE a.SupplierCertId=" + strconv.Itoa(certAppend.SupplierCertId) +
-			" AND"  + code + ") and a.SupplierCertAppendId=0"
+			" AND" + code + ") and a.SupplierCertAppendId=0"
 		_, err = s.DBE.Query(sql)
 		s.DBE.Query("commit;")
 	}
@@ -679,8 +679,8 @@ func (s *TmpzcgtSession) UpdateSupplierFile() error {
 func (s *TmpzcgtSession) InsertOilCatalog() error {
 	s.DBE.Query("SET unique_checks=0;")
 	// s.DBE.Query("SET autocommit=0;")
-	sql := "insert into `OilCatalog` (`CompanyName`, `CatalogType`, `Business`, `ValidityTo`, `Dept`, `DutyDept`) select `名称`, "+
-		"CASE `类别` WHEN '多经企业' THEN 2 WHEN '战略合作' THEN 4 WHEN '特别业务' THEN 5 WHEN '外部市场' THEN 6 ELSE 0 END as `类别`, `合作范围`, `有效期`, `申请单位`, `责任部门` "+
+	sql := "insert into `OilCatalog` (`CompanyName`, `CatalogType`, `Business`, `ValidityTo`, `Dept`, `DutyDept`) select `名称`, " +
+		"CASE `类别` WHEN '多经企业' THEN 2 WHEN '战略合作' THEN 4 WHEN '特别业务' THEN 5 WHEN '外部市场' THEN 6 ELSE 0 END as `类别`, `合作范围`, `有效期`, `申请单位`, `责任部门` " +
 		"from `T_可不招标供方名录` b order by b.ID"
 	_, err := s.DBE.Query(sql)
 
@@ -693,12 +693,11 @@ func (s *TmpzcgtSession) InsertOilCatalog() error {
 	return err
 }
 
-
 func (s *TmpzcgtSession) InsertOilCatalog2() error {
 	s.DBE.Query("SET unique_checks=0;")
 	// s.DBE.Query("SET autocommit=0;")
-	sql := "insert into `OilCatalog` (`CompanyName`, `CatalogType`,`LegalPerson`,`Address`, `USCCode`,`Business`, `RecordScope`, `IDCode`,`Remark`, `RecDept`, `Status`, `CreateOn`, `CreateBy`) select `企业名称`, "+
-		"CASE `类别` WHEN '多经企业' THEN 2 WHEN '战略合作' THEN 4  WHEN '特别业务' THEN 5  WHEN '外部市场' THEN 6 WHEN '收入性合同' THEN 7 WHEN '内部多经可不招标' THEN 2 WHEN '战略供方' THEN 4 ELSE  0 END as `类别`,  `法人姓名`,`企业注册地址`,`全国统一信用代码`,`申请备案范围`, `申请备案范围`, `法人身份证`, `申请理由`, `推荐单位名称`, 2 as `状态`, `SQRQ`, `SQR` "+
+	sql := "insert into `OilCatalog` (`CompanyName`, `CatalogType`,`LegalPerson`,`Address`, `USCCode`,`Business`, `RecordScope`, `IDCode`,`Remark`, `RecDept`, `Status`, `CreateOn`, `CreateBy`) select `企业名称`, " +
+		"CASE `类别` WHEN '多经企业' THEN 2 WHEN '战略合作' THEN 4  WHEN '特别业务' THEN 5  WHEN '外部市场' THEN 6 WHEN '收入性合同' THEN 7 WHEN '内部多经可不招标' THEN 2 WHEN '战略供方' THEN 4 ELSE  0 END as `类别`,  `法人姓名`,`企业注册地址`,`全国统一信用代码`,`申请备案范围`, `申请备案范围`, `法人身份证`, `申请理由`, `推荐单位名称`, 2 as `状态`, `SQRQ`, `SQR` " +
 		"from `T_其他申请` b  where `状态`='办理完毕' AND `类别` <> '外部市场' AND `类别` <> '保留合格供方资格' order by b.ID"
 	_, err := s.DBE.Query(sql)
 
@@ -758,6 +757,7 @@ func (s *TmpzcgtSession) UpdateOldCardNo() error {
 func (s *TmpzcgtSession) InsertOneSupplier(supplierName string) error {
 	sql := `INSERT INTO OilSupplier (
 	SupplierName,
+	SpecTypeCode,
 	Grade,
 	OperType,
 	Country,
@@ -803,6 +803,7 @@ func (s *TmpzcgtSession) InsertOneSupplier(supplierName string) error {
 	OldSupplierName
 ) SELECT
 	max(企业名称) AS SupplierName,
+	1 AS SpecTypeCode,
 	max(级别) AS Grade,
 	max(经营方式) AS OperType,
 	max(国家) AS Country,
@@ -849,7 +850,7 @@ func (s *TmpzcgtSession) InsertOneSupplier(supplierName string) error {
 FROM 
 	T_资格预审表 WHERE `
 	sql += "企业名称 = '" + supplierName + "'"
-	sql +=  " GROUP BY 企业名称;" //WHERE 准入标识 != '取消'
+	sql += " GROUP BY 企业名称;" //WHERE 准入标识 != '取消'
 	_, err := s.DBE.Query(sql)
 
 	s.DBE.Query(" UPDATE OilSupplier a SET a.OperType='贸易商' WHERE a.OperType IN ('3', '4') AND SupplierName = '" + supplierName + "'")
@@ -861,11 +862,14 @@ FROM
 	return err
 }
 
-func (s *TmpzcgtSession) InsertOneSupplierCert(supplierName string) error {
+func (s *TmpzcgtSession) InsertOneSupplierCert(supplierName, typeCodeName string) error {
 	s.DBE.Query("SET unique_checks=0;")
 	sql := "INSERT INTO OilSupplierCert (SupplierId,OutsideFlog, `Status` , Step, WorkerTotal, AccessCardNo,SupplierTypeName,InFlag,EffectStartTime,EffectEndTime,AddinTime,EffectTime,ApplyTime,Remark,CreateBy,GfID,RecUnitName,MgrUnit,RecDate,OldCardNo) " +
 		"SELECT -1 As SupplierId,企业名称 AS OutsideFlog,'8' As `Status`, 3 as Step, 1 as WorkerTotal, 准入证号 As AccessCardNo,准入类别 AS SupplierTypeName,准入标识 AS InFlag, STR_TO_DATE(IF(有效期起='', NULL, 有效期起),'%Y年%m月%d日') AS EffectStartTime, STR_TO_DATE(IF(有效期止='', NULL, 有效期止),'%Y年%m月%d日') AS EffectEndTime,审核日期 as AddinTime, 有效期起 as EffectTime, (SELECT 有效期至 FROM tmp_T_在册供方查询 tmpzc WHERE tmpzc.ID = a.ID) AS ApplyTime,备注 AS Remark,'导入' As CreateBy,ID,推荐单位名称 as RecUnitName,管理单位 as MgrUnit,推荐日期,曾用准入证号 as RecDate " +
 		"FROM T_资格预审表 a where 企业名称 = '" + supplierName + "'"
+	if typeCodeName != "" {
+		sql += " and 准入类别 = '" + typeCodeName + "'"
+	}
 	_, err := s.DBE.Query(sql)
 	s.DBE.Query("SET unique_checks=1;")
 	return err
@@ -926,7 +930,7 @@ func (s *TmpzcgtSession) UpdateOneSupplierMgrUnit(supplierName string) error {
 	return err
 }
 
-func (s *TmpzcgtSession) InsertOneFileName(supplierName string) error {
+func (s *TmpzcgtSession) InsertOneFileName(supplierName, typeCodeName string) error {
 	sql := "INSERT INTO `OilSupplierFile` (SupplierId, SupplierCertSubId, FileUrl, Remark, NeedFileType, OtherRemark, SupplierTypeCode,CreateBy, FileExt, EffectDate, CreateOn, FileName) " +
 		"SELECT 0 AS SupplierId, 0 AS SupplierCertSubId, concat('/upfile/gfzl_2014/', f.ID_GF, '-' , f.类别编号, IFNULL(f.文件类型, ''), '|', f.类别, IFNULL(f.文件类型, '')) AS FileUrl, z.企业名称 AS Remark ,f.类别 AS NeedFileType, f.说明 AS OtherRemark, " +
 		"( CASE z.准入类别 WHEN '物资类' THEN '01' WHEN '基建类' THEN '02' WHEN '服务类' THEN '03' WHEN '技术服务类' THEN '03' else '000' END ) SupplierTypeCode, " +
@@ -934,6 +938,9 @@ func (s *TmpzcgtSession) InsertOneFileName(supplierName string) error {
 		"FROM `T_供方资料_V2014` f " +
 		"LEFT JOIN `T_资格预审表` z ON (f.ID_GF = z.ID) " +
 		"WHERE z.企业名称 = '" + supplierName + "'"
+	if typeCodeName != "" {
+		sql += " and z.准入类别 = '" + typeCodeName + "'"
+	}
 	_, err := s.DBE.Query(sql)
 
 	return err
@@ -983,7 +990,7 @@ func (s *TmpzcgtSession) InsertOneCertSub(id string) error {
 func (s *TmpzcgtSession) UpdateOneCertSub(cert suppliercert.OilSupplierCert) error {
 	var err error
 	sql := " UPDATE OilSupplierCertSub b SET b.SupplierId = '" + strconv.Itoa(cert.SupplierId) + "'," +
-		" b.SupplierCertId='"+ strconv.Itoa(cert.Id) + "',"+
+		" b.SupplierCertId='" + strconv.Itoa(cert.Id) + "'," +
 		" b.SupplierTypeCode='" + cert.SupplierTypeCode + "'" +
 		" where b.OldId = '" + strconv.Itoa(cert.GfId) + "'"
 	_, err = s.DBE.Query(sql)
@@ -1017,4 +1024,3 @@ func (s *TmpzcgtSession) InsertOneOilPaymentInfo(id string) error {
 	_, err := s.DBE.Query(sql)
 	return err
 }
-

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

@@ -433,7 +433,7 @@ func (this *TmpzcgfController) UpdateCertSubclassID() {
 	svc.DBE.Query("SET unique_checks=0;")
 	svc.DBE.Query("SET autocommit=0;")
 	for _, item := range goodsAptitudeClassList {
-		sql := "UPDATE OilSupplierCertSub SET SubClassId = " + strconv.Itoa(item.Id)  +
+		sql := "UPDATE OilSupplierCertSub SET SubClassId = " + strconv.Itoa(item.Id) +
 			" WHERE SupplierTypeCode = '01' and Code = '" + item.Code + "'"
 		svc.DBE.Query(sql)
 		svc.DBE.Query("COMMIT;")
@@ -443,7 +443,7 @@ func (this *TmpzcgfController) UpdateCertSubclassID() {
 	where1 := "1=1"
 	svc.GetEntities(&basisBuildList, where1)
 	for _, item := range basisBuildList {
-		sql := "UPDATE OilSupplierCertSub SET SubClassId = " + strconv.Itoa(item.Id)  +
+		sql := "UPDATE OilSupplierCertSub SET SubClassId = " + strconv.Itoa(item.Id) +
 			" WHERE SupplierTypeCode = '02' and Name = '" + item.Name + "'"
 		svc.DBE.Query(sql)
 		svc.DBE.Query("COMMIT;")
@@ -453,7 +453,7 @@ func (this *TmpzcgfController) UpdateCertSubclassID() {
 	where2 := "1=1"
 	svc.GetEntities(&technologyServiceClassList, where2)
 	for _, item := range technologyServiceClassList {
-		sql := "UPDATE OilSupplierCertSub SET SubClassId = " + strconv.Itoa(item.Id)  +
+		sql := "UPDATE OilSupplierCertSub SET SubClassId = " + strconv.Itoa(item.Id) +
 			" WHERE SupplierTypeCode = '03' and Name = '" + item.Name + "'"
 		svc.DBE.Query(sql)
 		svc.DBE.Query("COMMIT;")
@@ -707,7 +707,7 @@ func (this *TmpzcgfController) CapacityExpansion() {
 			entity.CertSubStatus = supplierCertSub.CertSubStatus
 			entity.Remark = "编码扩充"
 			// 按最多200行insert一次
-			if (classIdx + 1) % 200 == 0 || (classIdx + 1) == len(goodsAptitudeClassList) {
+			if (classIdx+1)%200 == 0 || (classIdx+1) == len(goodsAptitudeClassList) {
 				// 加入本行数据
 				entityList = append(entityList, entity)
 				//执行insert操作
@@ -978,6 +978,7 @@ func (this *TmpzcgfController) ClearAll() {
 	fmt.Println("==========truncate table结束=========")
 
 }
+
 // @Title 一键执行所有导入
 // @Description get user by token
 // @Success 200 {object}
@@ -1020,7 +1021,6 @@ func (this *TmpzcgfController) InsertAll() {
 	this.ServeJSON()
 }
 
-
 // @Title 一键执行准入范围导入
 // @Description get user by token
 // @Success 200 {object}
@@ -1057,15 +1057,24 @@ func (this *TmpzcgfController) InsertSubAll() {
 // @router /insertOneSup [post]
 func (this *TmpzcgfController) InsertOneSup() {
 	var model supplier.OilSupplier
+	var model1 supplier.OilSupplier
+	var model2 supplier.OilSupplierView
 	var jsonBlob = this.Ctx.Input.RequestBody
 	json.Unmarshal(jsonBlob, &model)
+	json.Unmarshal(jsonBlob, &model2)
 	go func() {
+		fmt.Println("==========导入单个公司开始=========")
+		typeCodeName := model2.SupplierTypeName
 		svc := tmpzcgf.GetTmpzcgtService(utils.DBE)
-		err := svc.InsertOneSupplier(model.SupplierName)
-		if err != nil {
-			fmt.Println(err)
+		svc.GetEntityByWhere(OilSupplierName, "SupplierName = '"+model.SupplierName+"'", &model1)
+		var err error
+		if model1.Id == 0 {
+			err = svc.InsertOneSupplier(model.SupplierName)
+			if err != nil {
+				fmt.Println(err)
+			}
 		}
-		err = svc.InsertOneSupplierCert(model.SupplierName)
+		err = svc.InsertOneSupplierCert(model.SupplierName, typeCodeName)
 		if err != nil {
 			fmt.Println(err)
 		}
@@ -1077,11 +1086,13 @@ func (this *TmpzcgfController) InsertOneSup() {
 		if err != nil {
 			fmt.Println(err)
 		}
-		err = svc.UpdateOneSupplierMgrUnit(model.SupplierName)
-		if err != nil {
-			fmt.Println(err)
+		if model1.Id == 0 {
+			err = svc.UpdateOneSupplierMgrUnit(model.SupplierName)
+			if err != nil {
+				fmt.Println(err)
+			}
 		}
-		err = svc.InsertOneFileName(model.SupplierName)
+		err = svc.InsertOneFileName(model.SupplierName, typeCodeName)
 		if err != nil {
 			fmt.Println(err)
 		}
@@ -1094,9 +1105,13 @@ func (this *TmpzcgfController) InsertOneSup() {
 			fmt.Println(err)
 		}
 		var certList []suppliercert.OilSupplierCert
-		svc.GetEntityByWhere(OilSupplierName,"SupplierName = '" + model.SupplierName + "'", &model)
-		svc.GetEntitysByWhere(OilSupplierCertName,"SupplierId = " + strconv.Itoa(model.Id), &certList)
-		for _,cert := range certList {
+		svc.GetEntityByWhere(OilSupplierName, "SupplierName = '"+model.SupplierName+"'", &model)
+		whereCert := "SupplierId = " + strconv.Itoa(model.Id)
+		if typeCodeName != "" {
+			whereCert += " and SupplierTypeName = '" + whereCert + "'"
+		}
+		svc.GetEntitysByWhere(OilSupplierCertName, whereCert, &certList)
+		for _, cert := range certList {
 			err = svc.InsertOneOilPaymentInfo(strconv.Itoa(cert.GfId))
 			if err != nil {
 				fmt.Println(err)
@@ -1110,7 +1125,7 @@ func (this *TmpzcgfController) InsertOneSup() {
 				"SupplierCertId",
 				"IsInvoice",
 			}
-			err = svc.UpdateEntityBywheretbl("OilPaymentInfo", pay, payCols, "ID_GF = " + strconv.Itoa(cert.GfId))
+			err = svc.UpdateEntityBywheretbl("OilPaymentInfo", pay, payCols, "ID_GF = "+strconv.Itoa(cert.GfId))
 			if err != nil {
 				fmt.Println(err)
 			}
@@ -1125,9 +1140,9 @@ func (this *TmpzcgfController) InsertOneSup() {
 			}
 		}
 		var certSubList []suppliercertsub.OilSupplierCertSub
-		svc.GetEntitysByWhere(OilSupplierCertSubName,"SupplierId = " + strconv.Itoa(model.Id), &certSubList)
+		svc.GetEntitysByWhere(OilSupplierCertSubName, "SupplierId = "+strconv.Itoa(model.Id), &certSubList)
 		//准入范围修改
-		for _,certSub := range certSubList {
+		for _, certSub := range certSubList {
 			certSub.Remark = ""
 			certSub.ModifiedBy = ""
 			if certSub.SupplierTypeCode == "01" {
@@ -1140,7 +1155,7 @@ func (this *TmpzcgfController) InsertOneSup() {
 				}
 				var goodsAptitudeClass goodsaptitude.GoodsBusiness1
 				goodsSvc := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
-				goodsSvc.GetEntityJoin2(OilGoodsAptitudeName, OilGoodsAptitudeClassName, &goodsAptitudeClass, "Code = '" + certSub.Code + "'")
+				goodsSvc.GetEntityJoin2(OilGoodsAptitudeName, OilGoodsAptitudeClassName, &goodsAptitudeClass, "Code = '"+certSub.Code+"'")
 
 				certSub.GoodsLevel = goodsAptitudeClass.GoodsLevel
 				certSub.Name = goodsAptitudeClass.Name
@@ -1148,14 +1163,14 @@ func (this *TmpzcgfController) InsertOneSup() {
 				if goodsAptitudeClass.Id > 0 {
 					if goodsAptitudeClass.GoodsLevel == "2" {
 						// 1降2修改
-						err = svc.UpdateEntityBywheretbl(OilSupplierCertSubName, &certSub, cols, "Id = " + strconv.Itoa(certSub.Id))
+						err = svc.UpdateEntityBywheretbl(OilSupplierCertSubName, &certSub, cols, "Id = "+strconv.Itoa(certSub.Id))
 					} else {
-						err = svc.UpdateEntityBywheretbl(OilSupplierCertSubName, &certSub, cols, "(GoodsLevel = '1' or GoodsLevel is null) and Id = " + strconv.Itoa(certSub.Id))
+						err = svc.UpdateEntityBywheretbl(OilSupplierCertSubName, &certSub, cols, "(GoodsLevel = '1' or GoodsLevel is null) and Id = "+strconv.Itoa(certSub.Id))
 						//2升1删除
-						err = goodsSvc.DeleteTable(OilSupplierCertSubName, "GoodsLevel = '2' and Id = " + strconv.Itoa(certSub.Id))
+						err = goodsSvc.DeleteTable(OilSupplierCertSubName, "GoodsLevel = '2' and Id = "+strconv.Itoa(certSub.Id))
 					}
 				} else {
-					err = goodsSvc.DeleteTable(OilSupplierCertSubName, "Id = " + strconv.Itoa(certSub.Id))
+					err = goodsSvc.DeleteTable(OilSupplierCertSubName, "Id = "+strconv.Itoa(certSub.Id))
 				}
 			} else if certSub.SupplierTypeCode == "02" {
 				cols := []string{
@@ -1164,26 +1179,26 @@ func (this *TmpzcgfController) InsertOneSup() {
 					"SubClassId",
 				}
 				var basisBuild goodsaptitude.GoodsBusiness2
-				svc.GetEntityByWhere(OilBasisBuildName,"Name = '" + certSub.Name + "'", &basisBuild)
+				svc.GetEntityByWhere(OilBasisBuildName, "Name = '"+certSub.Name+"'", &basisBuild)
 				if basisBuild.Id > 0 {
 					certSub.SubClassId = basisBuild.Id
-					err = svc.UpdateEntityBywheretbl(OilSupplierCertSubName, certSub, cols, "Id = " + strconv.Itoa(certSub.Id))
+					err = svc.UpdateEntityBywheretbl(OilSupplierCertSubName, certSub, cols, "Id = "+strconv.Itoa(certSub.Id))
 				} else {
-					err = svc.DeleteEntityBytbl(OilSupplierCertSubName, "Id = " + strconv.Itoa(certSub.Id))
+					err = svc.DeleteEntityBytbl(OilSupplierCertSubName, "Id = "+strconv.Itoa(certSub.Id))
 				}
 			} else {
 				cols := []string{"Remark", "ModifiedBy", "SubClassId"}
 				var class technologyserviceclass.OilTechnologyServiceClass
 				var technologyServiceClass goodsaptitude.GoodsBusiness2
-				svc.GetEntityByWhere(OilTechnologyServiceClassName,"Name = '" + certSub.Name + "'", &technologyServiceClass)
+				svc.GetEntityByWhere(OilTechnologyServiceClassName, "Name = '"+certSub.Name+"'", &technologyServiceClass)
 				if technologyServiceClass.Id > 0 {
 					certSub.SubClassId = technologyServiceClass.Id
-					err = svc.UpdateEntityBywheretbl(OilSupplierCertSubName, certSub, cols, "Id = " + strconv.Itoa(certSub.Id))
+					err = svc.UpdateEntityBywheretbl(OilSupplierCertSubName, certSub, cols, "Id = "+strconv.Itoa(certSub.Id))
 				} else {
 					var del supplier.ManualDelete
 					svc.GetEntityByWhere("TecDifferent", "Code = '"+certSub.Code+"' and Name = '"+certSub.Name+"'", &del)
 					if del.Operation == "删除" || del.Operation == "" || del.Operation == "维持不动" {
-						err = svc.DeleteEntityBytbl(OilSupplierCertSubName, "Id = " + strconv.Itoa(certSub.Id))
+						err = svc.DeleteEntityBytbl(OilSupplierCertSubName, "Id = "+strconv.Itoa(certSub.Id))
 					} else if strings.Index(del.Operation, ",") > 0 {
 						//151508,151509
 						id := certSub.Id
@@ -1195,15 +1210,15 @@ func (this *TmpzcgfController) InsertOneSup() {
 							certSub.SubClassId = class.Id
 							svc.InsertEntityBytbl(OilSupplierCertSubName, &certSub)
 						}
-						err = svc.DeleteEntityBytbl(OilSupplierCertSubName, "Id = " + strconv.Itoa(id))
+						err = svc.DeleteEntityBytbl(OilSupplierCertSubName, "Id = "+strconv.Itoa(id))
 					} else {
 						//151507
 						svc.GetEntityByWhere(OilTechnologyServiceClassName, "Code = '"+del.Operation+"'", &class)
-						cols := []string{"Remark","ModifiedBy","Name", "Code", "SubClassId"}
+						cols := []string{"Remark", "ModifiedBy", "Name", "Code", "SubClassId"}
 						certSub.Name = class.Name
 						certSub.Code = class.Code
 						certSub.SubClassId = class.Id
-						svc.UpdateEntityBywheretbl(OilSupplierCertSubName, &certSub, cols, "Id = " + strconv.Itoa(certSub.Id))
+						svc.UpdateEntityBywheretbl(OilSupplierCertSubName, &certSub, cols, "Id = "+strconv.Itoa(certSub.Id))
 					}
 				}
 			}
@@ -1211,6 +1226,7 @@ func (this *TmpzcgfController) InsertOneSup() {
 				fmt.Println(err)
 			}
 		}
+		fmt.Println("==========导入单个公司结束=========")
 	}()
 
 	var errinfo ErrorInfo
@@ -1218,4 +1234,4 @@ func (this *TmpzcgfController) InsertOneSup() {
 	errinfo.Code = 0
 	this.Data["json"] = &errinfo
 	this.ServeJSON()
-}
+}