后:老数据目录导入

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

@@ -637,8 +637,8 @@ func (s *TmpzcgtSession) UpdateSupplierFileSId() 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`, `RecordScope`, `ValidityTo`) select `名称`, "+
-		"CASE `类别` WHEN '多经企业' THEN 2 WHEN '战略合作' THEN 4 WHEN '特别业务' THEN 5 WHEN '外部市场' THEN 6 ELSE 0 END as `类别`, `合作范围`, `有效期` "+
+	sql := "insert into `OilCatalog` (`CompanyName`, `CatalogType`, `RecordScope`,`Business`, `ValidityFrom`, `ValidityTo`, `Dept`, `DutyDept`) select `名称`, "+
+		"CASE `类别` WHEN '多经企业' THEN 2 WHEN '战略合作' THEN 4 WHEN '特别业务' THEN 5 WHEN '外部市场' THEN 6 ELSE 0 END as `类别`, `合作范围`, `合作范围`, IF(`有效期`,'2021-01-01 00:00:00',NULL), `有效期`, `申请单位`, `责任部门` "+
 		"from `T_可不招标供方名录` b order by b.ID"
 	_, err := s.DBE.Query(sql)
 
@@ -648,20 +648,8 @@ func (s *TmpzcgtSession) InsertOilCatalog() error {
 	return err
 }
 
-func (s *TmpzcgtSession) InsertOilCatalogSub() error {
-	s.DBE.Query("SET unique_checks=0;")
-	// s.DBE.Query("SET autocommit=0;")
-	sql := "insert into `OilCatalogSub` (`Type`, `Dept`, `DutyDept`) select a.`类别`, `申请单位`, `责任部门` from `T_可不招标供方名录` a left join `OilCatalog` b on b.`CompanyName` = a.`名称` and b.`RecordScope` = a.`合作范围` order by a.ID"
-	_, err := s.DBE.Query(sql)
-
-	// s.DBE.Query("commit;")
-	s.DBE.Query("SET unique_checks=1;")
-	// s.DBE.Query("SET autocommit=1;")
-	return err
-}
-
 func (s *TmpzcgtSession) UpdateOilCatalog() error {
-	sql := "update `OilCatalog` set `SubId` = `Id`"
+	sql := "UPDATE `OilCatalog` set `ValidityTo`='2025-12-31 00:00:00', `ValidityFrom`='2021-01-01 00:00:00' where `CatalogType`=2"
 	_, err := s.DBE.Query(sql)
 	return err
 }

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

@@ -768,12 +768,6 @@ func (this *TmpzcgfController) InsertUpdateOilCatalog() {
 		fmt.Println(err)
 	}
 
-	err = svc.InsertOilCatalogSub()
-	if err != nil {
-		// session.Rollback()
-		fmt.Println(err)
-	}
-
 	err = svc.UpdateOilCatalog()
 	if err != nil {
 		// session.Rollback()