新的历史数据导入

src/dashoo.cn/backend/api/business/oilsupplier/supplier/oilsupplierService.go

@@ -48,7 +48,7 @@ func (s *OilSupplierService) GetMyPagingEntitiesWithOrderBytbl(supplierTableName
 	} else {
 		sql += ` order by ` + orderby + ` DESC `
 	}
-	if (pageIndex != 0 && itemsPerPage !=0) {
+	if pageIndex != 0 && itemsPerPage !=0 {
 		sql += ` limit ` + utils.ToStr((pageIndex-1)*itemsPerPage) + "," + utils.ToStr(itemsPerPage)
 	}
 	s.DBE.SQL(sql).Find(entitiesPtr)

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

@@ -1,10 +1,12 @@
 package tmpzcgf
 
 import (
+	"dashoo.cn/backend/api/business/oilsupplier/suppliercertappend"
 	. "dashoo.cn/backend/api/mydb"
 	"github.com/go-xorm/xorm"
 	"math"
 	"strconv"
+	"strings"
 )
 
 /** type TmpzcgtSession struct {
@@ -111,15 +113,15 @@ func (s *TmpzcgtSession) InsertSupplier() error {
 	备注 AS Remark,
 	'导入' As CreateBy
 FROM 
-	tmp_zcgf WHERE ID IN (SELECT MAX(ID) FROM tmp_zcgf WHERE 准入标识 != '取消' GROUP BY 企业名称);`
+	T_资格预审表 WHERE ID IN (SELECT MAX(ID) FROM T_资格预审表 GROUP BY 企业名称);` //WHERE 准入标识 != '取消'
 	_, err := s.DBE.Query(sql)
 	return err
 }
 
 func (s *TmpzcgtSession) InsertSupplierCert() error {
 	sql := "INSERT INTO OilSupplierCert (SupplierId,OutsideFlog, `Status` , Step, WorkerTotal, AccessCardNo,SupplierTypeName,InFlag,EffectStartTime,EffectEndTime,ApplyTime,Remark,CreateBy,GfID) " +
-		"SELECT -1 As SupplierId,企业名称 AS OutsideFlog,'8' As `Status`, 3 as Step, 1 as WorkerTotal, 准入证号 As AccessCardNo,准入类别 AS SupplierTypeName,准入标识 AS InFlag,有效期起 AS EffectStartTime,有效期止 AS EffectEndTime,年审日期 AS ApplyTime,备注 AS Remark,'导入' As CreateBy,ID " +
-		"FROM tmp_zcgf WHERE 准入标识 != '取消' ;"
+		"SELECT -1 As SupplierId,企业名称 AS OutsideFlog,'8' As `Status`, 3 as Step, 1 as WorkerTotal, 准入证号 As AccessCardNo,准入类别 AS SupplierTypeName,准入标识 AS InFlag,有效期起 AS EffectStartTime,有效期止 AS EffectEndTime,(SELECT MAX(年审日期) from T_年审 b WHERE b.企业名称 = a.企业名称 AND b.状态标识='办理完毕') AS ApplyTime,备注 AS Remark,'导入' As CreateBy,ID " +
+		"FROM T_资格预审表 a ;" //WHERE 准入标识 != '取消'
 	_, err := s.DBE.Query(sql)
 	return err
 }
@@ -171,7 +173,7 @@ func (s *TmpzcgtSession) InsterAnnual() error {
 	sql := "INSERT INTO OilAnnualAudit (Status,SupplierTypeName, SupplierName, CreateOn, CreateBy, RecUnitId, ApplyTime, AccessCardNo, OldId) " +
 		"SELECT '11' as Status ,(CASE 准入类别 WHEN '物资类' THEN '01' WHEN '基建类' THEN '02' WHEN '服务类' THEN '03' WHEN '技术服务类' THEN '03' END ) SupplierTypeName, " +
 		"企业名称 AS SupplierName, 申请日期 AS CreateOn, 录入员 AS CreateBy, 推荐单位编码 AS RecUnitId, 年审日期 AS ApplyTime, 准入证号 AS AccessCardNo, id AS oldId " +
-		"FROM tmp_nianshen"
+		"FROM T_年审"
 
 	_, err := s.DBE.Query(sql)
 	return err
@@ -189,17 +191,17 @@ func (s *TmpzcgtSession) InsertOilPaymentInfo() error {
 		"PayMode," +
 		"CreateBy" +
 		")" +
-		"SELECT ID_GF, 企业名称 AS SupplierName ,交费日期 AS PayDate, 新准入 AS Amount, '2' AS IsPay,'1' AS PayType , 备注 AS Remark, 交款方式 AS PayMode,收款人 AS CreateBy FROM tmp_jiaofenjl WHERE 新准入 IS NOT NULL" +
+		"SELECT ID_GF, 企业名称 AS SupplierName ,交费日期 AS PayDate, 新准入 AS Amount, '2' AS IsPay,'1' AS PayType , 备注 AS Remark, 交款方式 AS PayMode,收款人 AS CreateBy FROM T_交费记录 WHERE 新准入 IS NOT NULL" +
 		" UNION" +
-		" SELECT ID_GF, 企业名称 AS SupplierName ,交费日期 AS PayDate, 换证 AS Amount , '2' AS IsPay, '4' AS PayType , 备注 AS Remark, 交款方式 AS PayMode,收款人 AS CreateBy FROM tmp_jiaofenjl WHERE 换证 IS NOT NULL" +
+		" SELECT ID_GF, 企业名称 AS SupplierName ,交费日期 AS PayDate, 换证 AS Amount , '2' AS IsPay, '4' AS PayType , 备注 AS Remark, 交款方式 AS PayMode,收款人 AS CreateBy FROM T_交费记录 WHERE 换证 IS NOT NULL" +
 		" UNION" +
-		" SELECT ID_GF, 企业名称 AS SupplierName ,交费日期 AS PayDate, 增项 AS Amount , '2' AS IsPay, '3' AS PayType , 备注 AS Remark, 交款方式 AS PayMode,收款人 AS CreateBy FROM tmp_jiaofenjl WHERE 增项 IS NOT NULL" +
+		" SELECT ID_GF, 企业名称 AS SupplierName ,交费日期 AS PayDate, 增项 AS Amount , '2' AS IsPay, '3' AS PayType , 备注 AS Remark, 交款方式 AS PayMode,收款人 AS CreateBy FROM T_交费记录 WHERE 增项 IS NOT NULL" +
 		" UNION" +
-		" SELECT ID_GF, 企业名称 AS SupplierName,交费日期 AS PayDate, 年审 AS Amount , '2' AS IsPay, '2' AS PayType , 备注 AS Remark, 交款方式 AS PayMode,收款人 AS CreateBy FROM tmp_jiaofenjl WHERE 年审 IS NOT NULL" +
+		" SELECT ID_GF, 企业名称 AS SupplierName,交费日期 AS PayDate, 年审 AS Amount , '2' AS IsPay, '2' AS PayType , 备注 AS Remark, 交款方式 AS PayMode,收款人 AS CreateBy FROM T_交费记录 WHERE 年审 IS NOT NULL" +
 		" UNION" +
-		" SELECT ID_GF, 企业名称 AS SupplierName,交费日期 AS PayDate, 罚款 AS Amount , '2' AS IsPay, '5' AS PayType , 备注 AS Remark, 交款方式 AS PayMode,收款人 AS CreateBy FROM tmp_jiaofenjl WHERE 罚款 IS NOT NULL" +
+		" SELECT ID_GF, 企业名称 AS SupplierName,交费日期 AS PayDate, 罚款 AS Amount , '2' AS IsPay, '5' AS PayType , 备注 AS Remark, 交款方式 AS PayMode,收款人 AS CreateBy FROM T_交费记录 WHERE 罚款 IS NOT NULL" +
 		" UNION" +
-		" SELECT ID_GF, 企业名称 AS SupplierName,交费日期 AS PayDate, 其它 AS Amount , '2' AS IsPay, '6' AS PayType , 备注 AS Remark, 交款方式 AS PayMode,收款人 AS CreateBy FROM tmp_jiaofenjl WHERE 其它 IS NOT NULL"
+		" SELECT ID_GF, 企业名称 AS SupplierName,交费日期 AS PayDate, 其它 AS Amount , '2' AS IsPay, '6' AS PayType , 备注 AS Remark, 交款方式 AS PayMode,收款人 AS CreateBy FROM T_交费记录 WHERE 其它 IS NOT NULL"
 
 	_, err := s.DBE.Query(sql)
 	return err
@@ -230,7 +232,7 @@ func (s *TmpzcgtSession) InsterBadRecord() error {
 		"'' AS CompanyCode, " +
 		"'' AS CategoryName, " +
 		"'' AS CategoryCode " +
-		"FROM tmp_buliangjl WHERE 内容 IS NOT NULL"
+		"FROM T_不良行为记录 WHERE 内容 IS NOT NULL"
 	_, err := s.DBE.Query(sql)
 	return err
 }
@@ -261,50 +263,46 @@ func (s *TmpzcgtSession) UpdateOilAnnualAudit() error {
 
 func (s *TmpzcgtSession) InsertCertSub() error {
 
-	//countSql := "SELECT count(*) FROM tmp_zcgf t " +
-	//	"CROSS JOIN mysql.help_topic b " +
-	//	"ON b.help_topic_id <  (LENGTH(t.`准入范围`) - LENGTH(REPLACE(t.`准入范围`, ';', '')) + 1) " +
-	//	"WHERE " +
-	//	"1=1 and 准入标识 != '取消' " +
-	//	"AND LENGTH( SUBSTRING_INDEX(SUBSTRING_INDEX(t.`准入范围`,';', b.help_topic_id + 1), ';', -1) ) > 0 "
-	//countStr, err := s.DBE.Query(countSql)
-	////var total int64
-	//if len(countStr) > 0 {
-	//	results := countStr[0]
-	//	for _, value := range results {
-	//		total, err = strconv.ParseInt(string(value), 10, 64)
-	//		break
-	//	}
-		//n := math.Ceil(float64(total) / 2000)
-		//for i:=0; i <= int(n); i++ {
-		//	start := strconv.Itoa(i * 2000)
-		//	end := strconv.Itoa(2000)
+	countSql := "SELECT count(*) FROM T_资格预审表_JRMX t "
+
+	countStr, err := s.DBE.Query(countSql)
+	var total int64
+	if len(countStr) > 0 {
+		results := countStr[0]
+		for _, value := range results {
+			total, err = strconv.ParseInt(string(value), 10, 64)
+			break
+		}
+		n := math.Ceil(float64(total) / 2000)
+		for i:=0; i <= int(n); i++ {
+			start := strconv.Itoa(i * 2000)
+			end := strconv.Itoa(2000)
 			sql := "INSERT `OilSupplierCertSub` (" +
 				"OldId," +
 				"AppendStatus," +
 				"`Type`," +
 				"CreateBy," +
 				"Remark," +
-				"SupplierTypeCode," +
+				"IsManufacturer," +
+				"GoodsLevel," +
 				"`Code`," +
 				"`Name`" +
-
-				") SELECT " +
-				"t.`ID` AS OldId , '1' AS AppendStatus, '1' AS `Type`, '导入1' AS CreateBy, t.企业名称 As Remark, " +
-				"(CASE t.`准入类别` WHEN '物资类' THEN '01' WHEN '基建类' THEN '02' WHEN '服务类' THEN '03' WHEN '技术服务类' THEN '03' END) AS SupplierTypeCode," +
-				"REPLACE(SUBSTRING_INDEX (SUBSTRING_INDEX(SUBSTRING_INDEX(t.`准入范围`,';', b.help_topic_id + 1), ';', -1),' ' ,1),'BM','') AS `code`, " +
-				"SUBSTRING_INDEX(SUBSTRING_INDEX(SUBSTRING_INDEX(t.`准入范围`,';', b.help_topic_id + 1), ';', -1),' ' ,-1)AS `name` " +
-				"FROM tmp_zcgf t " +
-				"CROSS JOIN mysql.help_topic b " +
-				"ON b.help_topic_id <  (LENGTH(t.`准入范围`) - LENGTH(REPLACE(t.`准入范围`, ';', '')) + 1) " +
-				"WHERE " +
-				"1=1 and 准入标识 != '取消' " +
-				"AND LENGTH( SUBSTRING_INDEX(SUBSTRING_INDEX(t.`准入范围`,';', b.help_topic_id + 1), ';', -1) ) > 0 "
-				//"ORDER BY t.ID, SupplierTypeCode, `code` " +
-				//"limit " + start + "," +  end
-			_, err := s.DBE.Query(sql)
-		//}
-	//}
+				")  " +
+				` SELECT t.id AS OldId ,
+					'1' AS AppendStatus,
+					'1' AS Type,
+					'导入1' AS CreateBy,
+					t.备注 As Remark,
+					t.制造产品 AS IsManufacturer,
+					t.物资级别 AS GoodsLevel,
+					t.物资编码 AS code,
+					t.产品名称 AS name
+				FROM T_资格预审表_JRMX t
+				ORDER BY t.auto_id` +
+				"limit " + start + "," +  end
+			_, err = s.DBE.Query(sql)
+		}
+	}
 	return err
 }
 
@@ -314,7 +312,7 @@ func (s *TmpzcgtSession) UpdateCertSub() error {
 		" where b.Type = '1' and b.CreateBy='导入1'"*/
 
 	sql := "UPDATE OilSupplierCertSub b left join OilSupplierCert a on (a.GfId =b.OldId AND a.SupplierTypeCode = b.SupplierTypeCode)  SET b.SupplierId = IFNULL(a.SupplierId, 0)," +
-		"b.SupplierCertId = IFNULL(a.Id, 0) " +
+		"b.SupplierCertId = IFNULL(a.Id, 0), b.SupplierTypeCode = a.SupplierTypeCode " +
 		" where b.Type = '1' and b.CreateBy='导入1' AND a.SupplierId IS NOT NULL"
 
 	_, err := s.DBE.Query(sql)
@@ -352,7 +350,8 @@ func (s *TmpzcgtSession) InsertOilSupplierCertAppend() error {
 	//	"企业名称 as SupplierName, 录入员 as CreateBy, 推荐单位编码 as RecUnitId, 申请日期 as ApplyDate "+
 	//	"from tmp_zengxiang "+
 	//	"group by id,申请日期,企业名称,录入员,推荐单位编码,申请日期,准入类别"
-	countSql := "SELECT count(*) from (select a.申请日期 from tmp_zengxiang a WHERE 企业名称 != '' GROUP BY a.`申请日期`, a.`企业名称`, a.`准入类别`) b"
+	// countSql := "SELECT count(*) from (select a.申请日期 from tmp_zengxiang a WHERE 企业名称 != '' GROUP BY a.`申请日期`, a.`企业名称`, a.`准入类别`) b"
+	countSql := "select count(distinct a.`申请日期`, a.`企业名称`, a.`准入类别`) from T_增项 a WHERE 企业名称 != ''"
 	countStr, err := s.DBE.Query(countSql)
 	var total int64
 	if len(countStr) > 0 {
@@ -366,10 +365,10 @@ func (s *TmpzcgtSession) InsertOilSupplierCertAppend() error {
 			start := strconv.Itoa(i * 2000)
 			end := strconv.Itoa(2000)
 			sql := "INSERT INTO OilSupplierCertAppend " +
-				"(Status,CreateOn,SupplierName,AppendType,CreateBy,ApplyDate,OldId) " +
+				"(Status,CreateOn,SupplierName,AppendType,Remark,CreateBy,ApplyDate) " +
 				"SELECT '11' as Status, a.`申请日期` AS CreateOn, a.`企业名称` AS SupplierName, (CASE 准入类别 WHEN '物资类' THEN '01' WHEN '基建类' THEN '02' WHEN '服务类' THEN '03' WHEN '技术服务类' THEN '03' END) AppendType, " +
-				"'导入' AS CreateBy,a.`申请日期` AS ApplyDate, MAX(a.id) AS OldId " +
-				"FROM tmp_zengxiang a WHERE 企业名称 != '' GROUP BY a.`申请日期`, a.`企业名称`, a.`准入类别` ORDER BY a.`申请日期`, a.`准入类别`, a.`准入类别` " +
+				"group_concat(a.id) as Remark, '导入' AS CreateBy, a.`申请日期` AS ApplyDate " +
+				"FROM T_增项 a WHERE 企业名称 != '' GROUP BY a.`申请日期`, a.`企业名称`, a.`准入类别` ORDER BY a.`申请日期`, a.`准入类别`, a.`准入类别` " +
 				"limit " + start + "," +  end
 			_, err = s.DBE.Query(sql)
 		}
@@ -389,18 +388,12 @@ func (s *TmpzcgtSession) InsertOilInfoChange() error {
 		"生产制造许可证获证情况及编号 AS MaunLicense, 企业资质证书编号 AS QualifCert, 企业资质证书级别 AS QualifCertLevel, 安全生产许可证 AS SafetyLicense, 技术服务类准入许可证 AS TechServiceLic, 外地企业进津备案通知书 AS TJInNotify, " +
 		"行业特殊要求的认证证书 AS SpecIndustryCert, 法定代表人姓名 AS LegalPerson, 行业类别代码 AS CategoryCode, 行业类别名称 AS CategoryName, 注册资本 AS RegCapital, 币种 AS Currency, 联系人姓名 AS ContactName, 公司类型 AS CompanyType, " +
 		"开户银行 AS DepositBank, 银行账号 AS BankAccount, 电子邮箱 AS EMail, 银行信用等级 AS BankCreditRating, 移动电话 AS Mobile, 固定电话 AS Telphone, 传真 AS Fax, 公司电话 AS CompanyTel, QQ号码 AS QQ, 公司网址 AS CompanyUrl, " +
-		"申请变更原因及内容 AS Remark, 审核日期 as  CreateOn, 录入员 as CreateBy,ID AS HouseNo from tmp_biangenxinxi "
+		"申请变更原因及内容 AS Remark, 审核日期 as  CreateOn, 录入员 as CreateBy,ID AS HouseNo from T_变更信息 "
 	_, err := s.DBE.Query(sql)
 	return err
 }
 
-func (s *TmpzcgtSession) InsertOilSupplierCertSub() error {
-	sql := "insert into OilSupplierCertSub (ModifiedBy,Type, OldId, SupplierTypeCode, Code, Name, Remark, CreateOn, CreateBy) " +
-		"select 企业名称 as ModifiedBy,'3' as Type, id as OldId, ( case 准入类别 when '物资类' then '01' when '基建类' then '02' when '服务类' then '03' WHEN '技术服务类' THEN '03' end ) SupplierTypeCode, 物资编码 as Code, 产品名称 as Name, 备注 as Remark, 申请日期 as CreateOn, 录入员 as CreateBy " +
-		"ORDER BY a.`申请日期`, a.`准入类别`, a.`准入类别` " +
-		"from tmp_zengxiang "
-	_, err := s.DBE.Query(sql)
-	//return err
+/*func (s *TmpzcgtSession) InsertOilSupplierCertSub() error {
 
 	countSql := "SELECT count(*) from tmp_zengxiang"
 	countStr, err := s.DBE.Query(countSql)
@@ -425,7 +418,7 @@ func (s *TmpzcgtSession) InsertOilSupplierCertSub() error {
 	}
 
 	return err
-}
+}*/
 
 func (s *TmpzcgtSession) UpdateOilInfoChange() error {
 	// sql := "UPDATE OilInfoChange b SET b.SupplierId=IFNULL((SELECT a.SupplierId FROM OilSupplierCert a WHERE a.GfId = b.HouseNo limit 1), 0)"
@@ -445,20 +438,33 @@ func (s *TmpzcgtSession) UpOilSupplierCertAppend() error {
 	return err
 }
 
-func (s *TmpzcgtSession) UpdateCertSubIsType2() 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)"*/
 
-	sql := "UPDATE OilSupplierCertSub b left join OilSupplierCertAppend a ON (a.`OldId` = b.OldId AND a.AppendType = b.SupplierTypeCode AND a.ApplyDate = b.CreateOn) SET " +
+	/*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)
+		"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)
+	var err error
+	for _, certAppend := range certAppendList {
+		appendCodeList := strings.Split(certAppend.Remark, ",")
+		for _, appendCode := range appendCodeList {
+			sql := "UPDATE OilSupplierCertSub a SET a.SupplierCertAppendId=" + strconv.Itoa(certAppend.Id) +
+				", a.`Type`=3 WHERE a.SupplierCertId=" + strconv.Itoa(certAppend.SupplierCertId) +
+				" AND a.SupplierTypeCode LIKE '" + appendCode + "%' and SupplierCertAppendId=0"
+			_, err = s.DBE.Query(sql)
+		}
+	}
 	return err
 }
 
@@ -469,7 +475,7 @@ func (s *TmpzcgtSession) InsertFileName() error {
 		"( CASE 准入类别 WHEN '物资类' THEN '01' WHEN '基建类' THEN '02' WHEN '服务类' THEN '03' WHEN '技术服务类' THEN '03' else '000' END ) SupplierTypeCode, " +
 		"'导入' AS CreateBy " +
 		"FROM `tmp_file` f " +
-		"LEFT JOIN `tmp_zcgf` z ON (f.ID_GF = z.ID) " +
+		"LEFT JOIN `T_资格预审表` z ON (f.ID_GF = z.ID) " +
 		"WHERE z.企业名称 IS NOT NULL "
 	_, err := s.DBE.Query(sql)
 	return err

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

@@ -2,6 +2,7 @@ package tmpzcgf
 
 import (
 	"dashoo.cn/backend/api/business/oilsupplier/goodsaptitudeclass"
+	"dashoo.cn/backend/api/business/oilsupplier/suppliercertappend"
 	"fmt"
 	"time"
 
@@ -494,30 +495,6 @@ func (this *TmpzcgfController) InsertOilInfoChange() {
 	fmt.Println(elapsed)
 }
 
-// @Title 导入增项的准入范围
-// @Description get user by token
-// @Success 200 {object}
-// @router /insertOilSupplierCertSub [get]
-func (this *TmpzcgfController) InsertOilSupplierCertSub() {
-	fmt.Println("==========导入增项的准入范围开始=========")
-	t := time.Now()
-	// session := utils.DBE.NewSession()
-	defer func() {
-		elapsed := time.Since(t)
-		fmt.Println("==========导入增项的准入范围结束=========", t, elapsed)
-		// session.Close()
-	}()
-	// err := session.Begin()
-	svc := tmpzcgf.GetTmpzcgtService(utils.DBE)
-	err := svc.InsertOilSupplierCertSub()
-	if err != nil {
-		// session.Rollback()
-		fmt.Println(err)
-	}
-	// err = session.Commit()
-	// fmt.Println(err)
-}
-
 // @Title 更新
 // @Description get user by token
 // @Success 200 {object}
@@ -546,8 +523,8 @@ func (this *TmpzcgfController) UpdateOilInfoChange() {
 // @Title 更新
 // @Description get user by token
 // @Success 200 {object}
-// @router /updateCertSubIsType1 [get]
-func (this *TmpzcgfController) UpdateCertSubIsType1() {
+// @router /updateOilSupplierCertAppendSub [get]
+func (this *TmpzcgfController) UpdateOilSupplierCertAppendSub() {
 	fmt.Println("==========更新增项的准入范围=========")
 	t := time.Now()
 	// session := utils.DBE.NewSession()
@@ -559,7 +536,7 @@ func (this *TmpzcgfController) UpdateCertSubIsType1() {
 	// err := session.Begin()
 
 	svc := tmpzcgf.GetTmpzcgtService(utils.DBE)
-	err := svc.UpdateCertSubIsType2()
+	err := svc.UpdateOilSupplierCertAppendSub()
 	if err != nil {
 		// session.Rollback()
 		fmt.Println(err)
@@ -622,6 +599,15 @@ func (this *TmpzcgfController) ClearTmpData() {
 	}
 	svc.UpdateEntityBywheretbl("OilSupplierCertSub", certsub, colssub, "")
 
+	var append suppliercertappend.OilSupplierCertAppend
+	append.Remark = ""
+	append.ModifiedBy = ""
+	colsAppend := []string{
+		"Remark",
+		"ModifiedBy",
+	}
+	svc.UpdateEntityBywheretbl("OilSupplierCertAppend", append, colsAppend, "")
+
 	var infoc infochange.OilInfoChange
 	infoc.HouseNo = ""
 	colinfo := []string{
@@ -867,31 +853,37 @@ func (this *TmpzcgfController) ClearAll() {
 // @Success 200 {object}
 // @router /insertAll [get]
 func (this *TmpzcgfController) InsertAll() {
-	//清空所有资质
-	this.ClearAll()
-
-	this.InsertSupplier()
-	this.InsertSupplierCert()
-	this.UpdateCertTypeAndInflag()
-	this.UpdateSupplierId()
-	this.InsertFileName()
-	this.InsertCertSub() // 准入
-	this.UpdateOilSupplierCertSub()
-	this.InsertOilSupplierCertAppend()
-	this.UpdateOilSupplierCertAppend()
-	this.InsertOilSupplierCertSub() //插入增项的准入范围
-	this.UpdateCertSubIsType1() // 更新增项的准入范围
-
-	this.CapacityExpansion() // 编码扩充
-	// 历史数据导入-由于运行到此处中断，上面的代码临时注释
-	// this.UpdateCertSubIsType3() // 更新增项的准入范围 弃用 2020年11月26日
-	this.InsterAnnualAudit()
-	this.UpdateAnnualAudit()
-	this.InsterOilPaymentInfo()
-	this.InsterBadRecord()
-	this.InsertOilInfoChange()
-	this.UpdateOilInfoChange()
-	this.DelBadRecord()
-
-	this.ClearTmpData()
+	go func() {
+		//清空所有资质
+		this.ClearAll()
+
+		this.InsertSupplier()
+		this.InsertSupplierCert()
+		this.UpdateCertTypeAndInflag()
+		this.UpdateSupplierId()
+		this.InsertFileName()
+		this.InsertCertSub() // 准入
+		this.UpdateOilSupplierCertSub()
+		this.InsertOilSupplierCertAppend()
+		this.UpdateOilSupplierCertAppend()
+		this.UpdateOilSupplierCertAppendSub() // 更新增项的准入范围
+
+		this.CapacityExpansion() // 编码扩充
+		// 历史数据导入-由于运行到此处中断，上面的代码临时注释
+		this.InsterAnnualAudit()
+		this.UpdateAnnualAudit()
+		this.InsterOilPaymentInfo()
+		this.InsterBadRecord()
+		this.InsertOilInfoChange()
+		this.UpdateOilInfoChange()
+		this.DelBadRecord()
+
+		this.ClearTmpData()
+	}()
+
+	var errinfo ErrorInfo
+	errinfo.Message = "导入命令下达成功，详情请看后台运行日志，注意不要重复点击！"
+	errinfo.Code = 0
+	this.Data["json"] = &errinfo
+	this.ServeJSON()
 }