历史记录导入整理

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

@@ -4,19 +4,16 @@ import (
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercertsub"
 	. "dashoo.cn/backend/api/mydb"
 
-	"strconv"
 	"fmt"
+	"strconv"
+
 	"github.com/go-xorm/xorm"
 )
 
-type TmpCertSession struct {
-	MySessionBase
-}
-
 type TmpCertEntity struct {
-	SupplierCertId   int      	    `xorm:"INT"`
-	SupplierTypeCode string		    `xorm:" VARCHAR"`
-	AccessRange      string 		`xorm:"VARCHAR"`
+	SupplierCertId   int    `xorm:"INT"`
+	SupplierTypeCode string `xorm:" VARCHAR"`
+	AccessRange      string `xorm:"VARCHAR"`
 }
 
 type SubClassId struct {
@@ -27,23 +24,37 @@ type AllId struct {
 	Id int
 }
 
+/** type TmpCertSession struct {
+	MySessionBase
+}
+
 func GetTmpCertService(session *xorm.Session) *TmpCertSession {
 	s := new(TmpCertSession)
 	s.Session = session
 	return s
+} */
+
+type TmpCertSession struct {
+	MyServiceBase
+}
+
+func GetTmpCertService(xormEngine *xorm.Engine) *TmpCertSession {
+	s := new(TmpCertSession)
+	s.DBE = xormEngine
+	return s
 }
 
 //获取tmp_zcgf所有Id
 func (s *TmpCertSession) GetAllId() []AllId {
 	var ids []AllId
 	sql := "SELECT id  FROM	tmp_zcgf"
-	s.Session.SQL(sql).Find(&ids)
+	s.DBE.SQL(sql).Find(&ids)
 	fmt.Println(sql)
 	return ids
 }
 
 //从tmp_zcgf获取一条数据
-func (s *TmpCertSession) SelectOne(id int) TmpCertEntity{
+func (s *TmpCertSession) SelectOne(id int) TmpCertEntity {
 	var one []TmpCertEntity
 	var result TmpCertEntity
 	//var result TmpCertEntity
@@ -56,12 +67,12 @@ func (s *TmpCertSession) SelectOne(id int) TmpCertEntity{
 	//LogError(err)
 	//sql := "SELECT id, 国家 country , 级别 class FROM tmp_zcgf where id=8803"
 	//sql := "select AccessRange, SupplierTypeCode, SupplierCertId FROM (SELECT	a.准入范围 AccessRange,	c.id SupplierCertId,c.SupplierTypeCode SupplierTypeCode	FROM tmp_zcgf a	 JOIN oilsupplier b ON a.企业名称 = b.SupplierName JOIN oilsuppliercert c ON b.id = c.SupplierId AND a.准入类别 = c.SupplierTypeName WHERE	a.id =8830) TmpCertEntity"
-	sql := "SELECT	tmp_zcgf.`准入范围` AS AccessRange,	OilSupplierCert.SupplierTypeCode,	OilSupplierCert.id SupplierCertId FROM	OilSupplier	INNER JOIN OilSupplierCert ON OilSupplier.Id = OilSupplierCert.SupplierId	INNER JOIN tmp_zcgf ON tmp_zcgf.`企业名称` = OilSupplier.supplierName AND tmp_zcgf.`准入类别` = OilSupplierCert.SupplierTypeName WHERE	tmp_zcgf.ID = "+strId
+	sql := "SELECT	tmp_zcgf.`准入范围` AS AccessRange,	OilSupplierCert.SupplierTypeCode,	OilSupplierCert.id SupplierCertId FROM	OilSupplier	INNER JOIN OilSupplierCert ON OilSupplier.Id = OilSupplierCert.SupplierId	INNER JOIN tmp_zcgf ON tmp_zcgf.`企业名称` = OilSupplier.supplierName AND tmp_zcgf.`准入类别` = OilSupplierCert.SupplierTypeName WHERE	tmp_zcgf.ID = " + strId
 	fmt.Println(sql)
 	//s.Session.SQL(sql).Get(&one)
-	s.Session.SQL(sql).Find(&one)
-	if len(one)>0 {
-		 result = one[0]
+	s.DBE.SQL(sql).Find(&one)
+	if len(one) > 0 {
+		result = one[0]
 	}
 	//fmt.Println("123",result)
 
@@ -74,7 +85,7 @@ func (s *TmpCertSession) SelectOne(id int) TmpCertEntity{
 }
 
 //获取subClassId
-func (s *TmpCertSession) GetSubClassId(code string, supplierTypeCode string) int{
+func (s *TmpCertSession) GetSubClassId(code string, supplierTypeCode string) int {
 	//var subClassName
 	var subClassId SubClassId
 	var tableName string
@@ -86,17 +97,17 @@ func (s *TmpCertSession) GetSubClassId(code string, supplierTypeCode string) int
 	case "03":
 		tableName = "OilTechnologyServiceClass"
 	}
-	var sql = `SELECT id FROM ` + tableName + ` WHERE  code = '` + code+ `'`
+	var sql = `SELECT id FROM ` + tableName + ` WHERE  code = '` + code + `'`
 	fmt.Println(sql)
-	 //a, err := s.Session.SQL(sql).Find(&subClassId)
-	  s.Session.SQL(sql).Get(&subClassId)
+	//a, err := s.Session.SQL(sql).Find(&subClassId)
+	s.DBE.SQL(sql).Get(&subClassId)
 
 	// fmt.Println(result)
 	// if err!=nil{
 	// 	fmt.Println(err)
 	// }
-	 sub := subClassId.Id
-	 return  sub
+	sub := subClassId.Id
+	return sub
 	//a := s.Session.SQL(sql).Find(&subClassId)
 	//fmt.Println("a:",&a)
 	//fmt.Println("subclassid:",subClassId)
@@ -111,6 +122,6 @@ func (s *TmpCertSession) InsertSupplierCertSub(sub suppliercertsub.OilSupplierCe
 	var name = sub.Name
 	sql := `INSERT INTO OilSupplierCertSub_tmp ( SupplierCertId, SupplierTypeCode, SubClassId, CODE, NAME ) VALUES ('` + supplierCertId + `','` + supplierTypeCode + `','` + subClassId + `','` + code + `','` + name + `')`
 
-	_, err := s.Session.Query(sql)
+	_, err := s.DBE.Query(sql)
 	return err
 }

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

@@ -5,7 +5,7 @@ import (
 	"github.com/go-xorm/xorm"
 )
 
-type TmpzcgtSession struct {
+/** type TmpzcgtSession struct {
 	MySessionBase
 }
 
@@ -13,6 +13,16 @@ func GetTmpzcgtService(session *xorm.Session) *TmpzcgtSession {
 	s := new(TmpzcgtSession)
 	s.Session = session
 	return s
+} */
+
+type TmpzcgtSession struct {
+	MyServiceBase
+}
+
+func GetTmpzcgtService(xormEngine *xorm.Engine) *TmpzcgtSession {
+	s := new(TmpzcgtSession)
+	s.DBE = xormEngine
+	return s
 }
 
 func (s *TmpzcgtSession) InsertSupplier() error {
@@ -100,7 +110,7 @@ func (s *TmpzcgtSession) InsertSupplier() error {
 	'导入' As CreateBy
 FROM 
 	tmp_zcgf WHERE ID IN (SELECT MAX(ID) FROM tmp_zcgf WHERE 准入标识 != '取消' GROUP BY 企业名称);`
-	_, err := s.Session.Query(sql)
+	_, err := s.DBE.Query(sql)
 	return err
 }
 
@@ -108,44 +118,44 @@ func (s *TmpzcgtSession) InsertSupplierCert() error {
 	sql := "INSERT INTO OilSupplierCert (SupplierId,OutsideFlog, `Status` ,AccessCardNo,SupplierTypeName,InFlag,EffectStartTime,EffectEndTime,ApplyTime,Remark,CreateBy,GfID) " +
 		"SELECT -1 As SupplierId,企业名称 AS OutsideFlog,'8' As `Status`,准入证号 As AccessCardNo,准入类别 AS SupplierTypeName,准入标识 AS InFlag,有效期起 AS EffectStartTime,有效期止 AS EffectEndTime,年审日期 AS ApplyTime,备注 AS Remark,'导入' As CreateBy,ID " +
 		"FROM tmp_zcgf WHERE 准入标识 != '取消' ;"
-	_, err := s.Session.Query(sql)
+	_, err := s.DBE.Query(sql)
 	return err
 }
 
 func (s *TmpzcgtSession) UpdateSupplierCert() error {
 	sql := "UPDATE `OilSupplierCert` b SET b.SupplierId=(SELECT Id FROM OilSupplier a WHERE a.SupplierName = b.OutsideFlog)"
-	_, err := s.Session.Query(sql)
+	_, err := s.DBE.Query(sql)
 	return err
 }
 
 func (s *TmpzcgtSession) UpdateSupplierTypeCodeAndInFlag() error {
 	sql1 := "update `OilSupplierCert` set SupplierTypeCode = '01' where SupplierTypeName='物资类'"
-	_, err := s.Session.Query(sql1)
+	_, err := s.DBE.Query(sql1)
 	if err != nil {
 		return err
 	}
 	sql2 := "UPDATE `OilSupplierCert` SET SupplierTypeCode = '02' WHERE SupplierTypeName='基建类'"
-	_, err = s.Session.Query(sql2)
+	_, err = s.DBE.Query(sql2)
 	if err != nil {
 		return err
 	}
 	sql3 := "UPDATE `OilSupplierCert` SET SupplierTypeCode = '03' WHERE SupplierTypeName='服务类'"
-	_, err = s.Session.Query(sql3)
+	_, err = s.DBE.Query(sql3)
 	if err != nil {
 		return err
 	}
 	sql4 := "UPDATE `OilSupplierCert` SET InFlag = '1' WHERE InFlag='准入'"
-	_, err = s.Session.Query(sql4)
+	_, err = s.DBE.Query(sql4)
 	if err != nil {
 		return err
 	}
 	sql5 := "UPDATE `OilSupplierCert` SET InFlag = '2' WHERE InFlag='暂停'"
-	_, err = s.Session.Query(sql5)
+	_, err = s.DBE.Query(sql5)
 	if err != nil {
 		return err
 	}
 	sql6 := "UPDATE `OilSupplierCert` SET InFlag = '3' WHERE InFlag='取消'"
-	_, err = s.Session.Query(sql6)
+	_, err = s.DBE.Query(sql6)
 	return err
 
 }
@@ -156,7 +166,7 @@ func (s *TmpzcgtSession) InsterAnnual() error {
 		"企业名称 AS SupplierName, 申请日期 AS CreateOn, 录入员 AS CreateBy, 推荐单位编码 AS RecUnitId, 年审日期 AS ApplyTime, 准入证号 AS AccessCardNo, id AS oldId " +
 		"FROM tmp_nianshen"
 
-	_, err := s.Session.Query(sql)
+	_, err := s.DBE.Query(sql)
 	return err
 }
 
@@ -184,13 +194,13 @@ func (s *TmpzcgtSession) InsertOilPaymentInfo() error {
 		" 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"
 
-	_, err := s.Session.Query(sql)
+	_, err := s.DBE.Query(sql)
 	return err
 }
 
 func (s *TmpzcgtSession) UpdateOilPaymentInfo() error {
 	sql := "UPDATE OilPaymentInfo b SET b.SupplierId= (SELECT  DISTINCT(a.SupplierId) FROM `OilSupplierCert` a WHERE  a.GfId = b.ID_GF )"
-	_, err := s.Session.Query(sql)
+	_, err := s.DBE.Query(sql)
 	return err
 }
 
@@ -213,7 +223,7 @@ func (s *TmpzcgtSession) InsterBadRecord() error {
 		"'' AS CategoryName, " +
 		"'' AS CategoryCode " +
 		"FROM tmp_buliangjl WHERE 内容 IS NOT NULL"
-	_, err := s.Session.Query(sql)
+	_, err := s.DBE.Query(sql)
 	return err
 }
 
@@ -221,7 +231,7 @@ 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) "
-	_, err := s.Session.Query(sql)
+	_, err := s.DBE.Query(sql)
 	return err
 }
 
@@ -229,7 +239,7 @@ 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 )"
-	_, err := s.Session.Query(sql)
+	_, err := s.DBE.Query(sql)
 	return err
 }
 
@@ -256,14 +266,14 @@ func (s *TmpzcgtSession) InsertCertSub() error {
 		"1=1 and 准入标识 != '取消' " +
 		"AND LENGTH( SUBSTRING_INDEX(SUBSTRING_INDEX(t.`准入范围`,';', b.help_topic_id + 1), ';', -1) ) > 0 " +
 		"ORDER BY t.ID "
-	_, err := s.Session.Query(sql)
+	_, err := s.DBE.Query(sql)
 	return err
 }
 
 func (s *TmpzcgtSession) UpdateCertSub(where string) error {
 	sql := "UPDATE OilSupplierCertSub b SET b.SupplierId = (SELECT a.SupplierId FROM OilSupplierCert a WHERE a.GfId =b.OldId AND a.SupplierTypeCode = b.SupplierTypeCode )," +
 		"b.SupplierCertId = (SELECT a.Id FROM OilSupplierCert a WHERE a.GfId =b.OldId AND a.SupplierTypeCode = b.SupplierTypeCode ) " + where
-	_, err := s.Session.Query(sql)
+	_, err := s.DBE.Query(sql)
 	return err
 }
 
@@ -271,14 +281,14 @@ func (s *TmpzcgtSession) UpdateCertSub01classId(where string) error {
 
 	sql1 := "UPDATE OilSupplierCertSub b SET b.SubClassId = (SELECT a.Id FROM OilGoodsAptitudeClass a WHERE a.Code = b.Code ) " +
 		"WHERE b.SupplierTypeCode = '01'" + where
-	_, err := s.Session.Query(sql1)
+	_, err := s.DBE.Query(sql1)
 	return err
 }
 
 func (s *TmpzcgtSession) UpdateCertSub02classId(where string) error {
 	sql2 := "UPDATE OilSupplierCertSub b SET b.SubClassId = (SELECT a.Id FROM OilBasisBuild a WHERE a.Code = b.Code ) " +
 		"WHERE b.SupplierTypeCode = '02'" + where
-	_, err := s.Session.Query(sql2)
+	_, err := s.DBE.Query(sql2)
 	return err
 
 }
@@ -286,7 +296,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
-	_, err := s.Session.Query(sql3)
+	_, err := s.DBE.Query(sql3)
 	return err
 }
 
@@ -296,66 +306,65 @@ func (s *TmpzcgtSession) InsertOilSupplierCertAppend() error {
 	//	"企业名称 as SupplierName, 录入员 as CreateBy, 推荐单位编码 as RecUnitId, 申请日期 as ApplyDate "+
 	//	"from tmp_zengxiang "+
 	//	"group by id,申请日期,企业名称,录入员,推荐单位编码,申请日期,准入类别"
-	sql := "INSERT INTO OilSupplierCertAppend "+
-	"(Status,CreateOn,SupplierName,AppendType,CreateBy,ApplyDate,OldId) " +
-	"SELECT '11' as Status, a.`申请日期` AS CreateOn, a.`企业名称` AS SupplierName, (CASE 准入类别 WHEN '物资类' THEN '01' WHEN '基建类' THEN '02' 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.`准入类别`"
-	_, err := s.Session.Query(sql)
+	sql := "INSERT INTO OilSupplierCertAppend " +
+		"(Status,CreateOn,SupplierName,AppendType,CreateBy,ApplyDate,OldId) " +
+		"SELECT '11' as Status, a.`申请日期` AS CreateOn, a.`企业名称` AS SupplierName, (CASE 准入类别 WHEN '物资类' THEN '01' WHEN '基建类' THEN '02' 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.`准入类别`"
+	_, err := s.DBE.Query(sql)
 	return err
 }
 
-
-func (s *TmpzcgtSession) InsertOilInfoChange () error {
-	sql := "INSERT INTO OilInfoChange (Status,AccessCardNo,SupplierName,OldSupplierName,SupplierTypeName,SupplierTypeCode,OilCertificateNo,Grade,OperType,Country,MaunAgent,ConstructTeam,CommercialNo,OrganCode,CountryTaxNo,LocalTaxNo, "+
-		"Address,ZipCode,QualitySystemCert,ProductQualityCert,MaunLicense,QualifCert,QualifCertLevel,SafetyLicense,TechServiceLic,TJInNotify, "+
-		"SpecIndustryCert,LegalPerson,CategoryCode,CategoryName,RegCapital,Currency,ContactName,CompanyType,DepositBank,BankAccount,EMail, "+
-		"BankCreditRating,Mobile,Telphone,Fax,CompanyTel,QQ,CompanyUrl,Remark,CreateOn,CreateBy,HouseNo) "+
-	"select '11' as Status, 准入证号 as AccessCardNo, 企业名称 as SupplierName, 曾用名 as OldSupplierName, 准入类别 as SupplierTypeName,(case 准入类别 when '物资类' then '01' when '基建类' then '02' when '服务类' then '03' end) SupplierTypeCode, "+
-		"中石油供应商证书号 as OilCertificateNo, 级别 as Grade, 经营方式 as OperType, 国家 as Country, 所代理制造商名称 as MaunAgent, 施工队伍名称 as ConstructTeam, 工商注册号 as CommercialNo, 组织机构代码 as OrganCode, "+
-		"税务登记证国税编号 as CountryTaxNo, 税务登记证地税编号 as LocalTaxNo, 单位地址 as Address, 邮编 AS ZipCode, 质量管理体系认证情况及认证机构 AS QualitySystemCert, 产品质量认证情况及认证机构 AS ProductQualityCert, "+
-		"生产制造许可证获证情况及编号 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, "+
+func (s *TmpzcgtSession) InsertOilInfoChange() error {
+	sql := "INSERT INTO OilInfoChange (Status,AccessCardNo,SupplierName,OldSupplierName,SupplierTypeName,SupplierTypeCode,OilCertificateNo,Grade,OperType,Country,MaunAgent,ConstructTeam,CommercialNo,OrganCode,CountryTaxNo,LocalTaxNo, " +
+		"Address,ZipCode,QualitySystemCert,ProductQualityCert,MaunLicense,QualifCert,QualifCertLevel,SafetyLicense,TechServiceLic,TJInNotify, " +
+		"SpecIndustryCert,LegalPerson,CategoryCode,CategoryName,RegCapital,Currency,ContactName,CompanyType,DepositBank,BankAccount,EMail, " +
+		"BankCreditRating,Mobile,Telphone,Fax,CompanyTel,QQ,CompanyUrl,Remark,CreateOn,CreateBy,HouseNo) " +
+		"select '11' as Status, 准入证号 as AccessCardNo, 企业名称 as SupplierName, 曾用名 as OldSupplierName, 准入类别 as SupplierTypeName,(case 准入类别 when '物资类' then '01' when '基建类' then '02' when '服务类' then '03' end) SupplierTypeCode, " +
+		"中石油供应商证书号 as OilCertificateNo, 级别 as Grade, 经营方式 as OperType, 国家 as Country, 所代理制造商名称 as MaunAgent, 施工队伍名称 as ConstructTeam, 工商注册号 as CommercialNo, 组织机构代码 as OrganCode, " +
+		"税务登记证国税编号 as CountryTaxNo, 税务登记证地税编号 as LocalTaxNo, 单位地址 as Address, 邮编 AS ZipCode, 质量管理体系认证情况及认证机构 AS QualitySystemCert, 产品质量认证情况及认证机构 AS ProductQualityCert, " +
+		"生产制造许可证获证情况及编号 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 "
-	_, err := s.Session.Query(sql)
+	_, 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' end ) SupplierTypeCode, 物资编码 as Code, 产品名称 as Name, 备注 as Remark, 申请日期 as CreateOn, 录入员 as CreateBy "+
+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' end ) SupplierTypeCode, 物资编码 as Code, 产品名称 as Name, 备注 as Remark, 申请日期 as CreateOn, 录入员 as CreateBy " +
 		"from tmp_zengxiang "
-	_, err := s.Session.Query(sql)
+	_, err := s.DBE.Query(sql)
 	return err
 }
 
-func (s *TmpzcgtSession) UpdateOilInfoChange () error {
+func (s *TmpzcgtSession) UpdateOilInfoChange() error {
 	sql := "UPDATE OilInfoChange b SET b.SupplierId=(SELECT a.SupplierId FROM OilSupplierCert a WHERE a.GfId = b.HouseNo)"
-	_, err := s.Session.Query(sql)
+	_, err := s.DBE.Query(sql)
 	return err
 }
 
-func (s *TmpzcgtSession) UpOilSupplierCertAppend () error {
+func (s *TmpzcgtSession) UpOilSupplierCertAppend() error {
 	sql := "UPDATE OilSupplierCertAppend b SET " +
-	"b.SupplierId = (SELECT a.`SupplierId` FROM OilSupplierCert a WHERE a.`GfId` = b.OldId AND a.SupplierTypeCode = b.AppendType), "+
-	"b.SupplierCertId = (SELECT a.`Id` FROM OilSupplierCert a WHERE a.`GfId` = b.OldId AND a.SupplierTypeCode = b.AppendType) "
-	_, err := s.Session.Query(sql)
+		"b.SupplierId = (SELECT a.`SupplierId` FROM OilSupplierCert a WHERE a.`GfId` = b.OldId AND a.SupplierTypeCode = b.AppendType), " +
+		"b.SupplierCertId = (SELECT a.`Id` FROM OilSupplierCert a WHERE a.`GfId` = b.OldId AND a.SupplierTypeCode = b.AppendType) "
+	_, err := s.DBE.Query(sql)
 	return err
 }
 
-func (s *TmpzcgtSession) UpdateCertSubIsType2 (where string) error {
-	sql := "UPDATE OilSupplierCertSub b SET "+
-	"b.SupplierId = (SELECT a.`SupplierId` FROM OilSupplierCertAppend a WHERE a.`OldId` = b.OldId AND a.AppendType = b.SupplierTypeCode AND a.ApplyDate = b.CreateOn ), "+
-	"b.SupplierCertId = (SELECT a.`SupplierCertId` FROM OilSupplierCertAppend a WHERE a.`OldId` = b.OldId AND a.AppendType = b.SupplierTypeCode AND a.ApplyDate = b.CreateOn ), "+
-	"b.SupplierCertAppendId = (SELECT a.`Id` FROM OilSupplierCertAppend a WHERE a.`OldId` = b.OldId AND a.AppendType = b.SupplierTypeCode AND a.ApplyDate = b.CreateOn ) "+
-	where
-	_, err := s.Session.Query(sql)
+func (s *TmpzcgtSession) UpdateCertSubIsType2(where string) error {
+	sql := "UPDATE OilSupplierCertSub b SET " +
+		"b.SupplierId = (SELECT a.`SupplierId` FROM OilSupplierCertAppend a WHERE a.`OldId` = b.OldId AND a.AppendType = b.SupplierTypeCode AND a.ApplyDate = b.CreateOn ), " +
+		"b.SupplierCertId = (SELECT a.`SupplierCertId` FROM OilSupplierCertAppend a WHERE a.`OldId` = b.OldId AND a.AppendType = b.SupplierTypeCode AND a.ApplyDate = b.CreateOn ), " +
+		"b.SupplierCertAppendId = (SELECT a.`Id` FROM OilSupplierCertAppend a WHERE a.`OldId` = b.OldId AND a.AppendType = b.SupplierTypeCode AND a.ApplyDate = b.CreateOn ) " +
+		where
+	_, err := s.DBE.Query(sql)
 	return err
 }
 
 // 导入资质名称
-func (s *TmpzcgtSession) InsertFileName () error {
+func (s *TmpzcgtSession) InsertFileName() error {
 	sql := "INSERT INTO `OilSupplierFile` (Remark, NeedFileType, OtherRemark, SupplierTypeCode,CreateBy) " +
 		"SELECT z.企业名称 AS Remark ,f.类别 AS NeedFileType, f.说明 AS OtherRemark, " +
 		"( CASE 准入类别 WHEN '物资类' THEN '01' WHEN '基建类' THEN '02' WHEN '服务类' THEN '03' END ) SupplierTypeCode, " +
@@ -363,12 +372,12 @@ func (s *TmpzcgtSession) InsertFileName () error {
 		"FROM `tmp_file` f " +
 		"LEFT JOIN `tmp_zcgf` z ON (f.ID_GF = z.ID) " +
 		"WHERE z.企业名称 IS NOT NULL "
-	_, err := s.Session.Query(sql)
+	_, err := s.DBE.Query(sql)
 	return err
 }
 
-func (s *TmpzcgtSession) UpdateSupplierFileSId () error {
+func (s *TmpzcgtSession) UpdateSupplierFileSId() error {
 	sql := "UPDATE `OilSupplierFile` b SET b.SupplierId = (SELECT a.Id FROM `OilSupplier` a WHERE a.SupplierName = b.Remark ) "
-	_, err := s.Session.Query(sql)
+	_, err := s.DBE.Query(sql)
 	return err
-}
+}

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

@@ -1,13 +1,7 @@
 package tmpzcgf
 
 import (
-	"dashoo.cn/backend/api/business/oilsupplier/suppliercertsub"
-	"dashoo.cn/backend/api/business/tmpzcgf"
 	. "dashoo.cn/backend/api/controllers"
-	"dashoo.cn/utils"
-	"fmt"
-	"strings"
-	"time"
 )
 
 //type TmpCertController struct {
@@ -27,7 +21,7 @@ type TmpCertController struct {
 
 
 
-
+/**
 // @Title 跟新OilSupplier
 // @Description get user by token
 // @Success 200 {object}
@@ -87,6 +81,7 @@ func (this *TmpCertController) InsertCertSub(){
 	elapsed := time.Since(t)
 	fmt.Println(elapsed)
 }
+*/
 
 
 

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

@@ -1,6 +1,10 @@
 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"
@@ -9,9 +13,6 @@ import (
 	"dashoo.cn/backend/api/business/tmpzcgf"
 	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/utils"
-	"fmt"
-	"strconv"
-	"time"
 )
 
 type TmpzcgfController struct {
@@ -25,19 +26,20 @@ type TmpzcgfController struct {
 func (this *TmpzcgfController) InsertSupplier() {
 	fmt.Println("======开始导入OilSupplier表======")
 	t := time.Now()
-	session := utils.DBE.NewSession()
+	// session := utils.DBE.NewSession()
 	defer func() {
 		fmt.Println("======OilSupplier表结束======")
-		session.Close()
+		// session.Close()
 	}()
-	err := session.Begin()
-	svc := tmpzcgf.GetTmpzcgtService(session)
-	err = svc.InsertSupplier()
+	// err := session.Begin()
+	svc := tmpzcgf.GetTmpzcgtService(utils.DBE)
+	err := svc.InsertSupplier()
 	if err != nil {
-		session.Rollback()
+		fmt.Println(err)
+		// session.Rollback()
 	}
-	err = session.Commit()
-	fmt.Println(err)
+	//err = session.Commit()
+
 	elapsed := time.Since(t)
 	fmt.Println(elapsed)
 }
@@ -49,19 +51,19 @@ func (this *TmpzcgfController) InsertSupplier() {
 func (this *TmpzcgfController) InsertSupplierCert() {
 	fmt.Println("=============开始导入Cert表==========")
 	t := time.Now()
-	session := utils.DBE.NewSession()
+	// session := utils.DBE.NewSession()
 	defer func() {
 		fmt.Println("=============导入Cert表结束==========")
-		session.Close()
+		// session.Close()
 	}()
-	err := session.Begin()
-	svc := tmpzcgf.GetTmpzcgtService(session)
-	err = svc.InsertSupplierCert()
+	// err := session.Begin()
+	svc := tmpzcgf.GetTmpzcgtService(utils.DBE)
+	err := svc.InsertSupplierCert()
 	if err != nil {
-		session.Rollback()
+		// session.Rollback()
+		fmt.Println(err)
 	}
-	err = session.Commit()
-	fmt.Println(err)
+	// err = session.Commit()
 	elapsed := time.Since(t)
 	fmt.Println(elapsed)
 }
@@ -73,19 +75,19 @@ func (this *TmpzcgfController) InsertSupplierCert() {
 func (this *TmpzcgfController) UpdateCertTypeAndInflag() {
 	fmt.Println("=============开始更新Cert==========")
 	t := time.Now()
-	session := utils.DBE.NewSession()
+	// session := utils.DBE.NewSession()
 	defer func() {
 		fmt.Println("=============开始更新Cert==========")
-		session.Close()
+		// session.Close()
 	}()
-	err := session.Begin()
-	svc := tmpzcgf.GetTmpzcgtService(session)
-	err = svc.UpdateSupplierTypeCodeAndInFlag()
+	// err := session.Begin()
+	svc := tmpzcgf.GetTmpzcgtService(utils.DBE)
+	err := svc.UpdateSupplierTypeCodeAndInFlag()
 	if err != nil {
-		session.Rollback()
+		// session.Rollback()
+		fmt.Println(err)
 	}
-	err = session.Commit()
-	fmt.Println(err)
+	// err = session.Commit()
 	elapsed := time.Since(t)
 	fmt.Println(elapsed)
 }
@@ -97,14 +99,14 @@ func (this *TmpzcgfController) UpdateCertTypeAndInflag() {
 func (this *TmpzcgfController) UpdateSupplierId() {
 	fmt.Println("=============开始更新Cert的SupplierId==========")
 	t := time.Now()
-	session := utils.DBE.NewSession()
+	// session := utils.DBE.NewSession()
 	defer func() {
 		fmt.Println("=============更新Cert的SupplierId结束==========")
-		session.Close()
+		// session.Close()
 	}()
-	err := session.Begin()
-	svc := tmpzcgf.GetTmpzcgtService(session)
-	err = svc.UpdateSupplierCert()
+	// err := session.Begin()
+	svc := tmpzcgf.GetTmpzcgtService(utils.DBE)
+	err := svc.UpdateSupplierCert()
 	//var supp []supplier.OilSupplier
 	//var certs  []suppliercert.OilSupplierCert
 	//var  c  suppliercert.OilSupplierCert
@@ -127,7 +129,7 @@ func (this *TmpzcgfController) UpdateSupplierId() {
 	//	}
 	//}
 
-	err = session.Commit()
+	// err = session.Commit()
 	fmt.Println(err)
 	elapsed := time.Since(t)
 	fmt.Println(elapsed)
@@ -140,19 +142,19 @@ func (this *TmpzcgfController) UpdateSupplierId() {
 func (this *TmpzcgfController) InsterAnnualAudit() {
 	fmt.Println("=============开始导入年审表==========")
 	t := time.Now()
-	session := utils.DBE.NewSession()
+	// session := utils.DBE.NewSession()
 	defer func() {
 		fmt.Println("=============导入年审表结束==========")
-		session.Close()
+		// session.Close()
 	}()
-	err := session.Begin()
-	svc := tmpzcgf.GetTmpzcgtService(session)
-	err = svc.InsterAnnual()
+	// err := session.Begin()
+	svc := tmpzcgf.GetTmpzcgtService(utils.DBE)
+	err := svc.InsterAnnual()
 	if err != nil {
-		session.Rollback()
+		// session.Rollback()
+		fmt.Println(err)
 	}
-	err = session.Commit()
-	fmt.Println(err)
+	// err = session.Commit()
 	elapsed := time.Since(t)
 	fmt.Println(elapsed)
 }
@@ -164,14 +166,14 @@ func (this *TmpzcgfController) InsterAnnualAudit() {
 func (this *TmpzcgfController) UpdateAnnualAudit() {
 	fmt.Println("=============开始更新年审表==========")
 	t := time.Now()
-	session := utils.DBE.NewSession()
+	// session := utils.DBE.NewSession()
 	defer func() {
 		fmt.Println("=============开始年审表结束==========")
-		session.Close()
+		// session.Close()
 	}()
-	err := session.Begin()
-	svc := tmpzcgf.GetTmpzcgtService(session)
-	err = svc.UpdateOilAnnualAudit()
+	// err := session.Begin()
+	svc := tmpzcgf.GetTmpzcgtService(utils.DBE)
+	err := svc.UpdateOilAnnualAudit()
 	//var annus []annualaudit.OilAnnualAudit
 	//var certs  []suppliercert.OilSupplierCert
 	//var  annual  annualaudit.OilAnnualAudit
@@ -196,8 +198,11 @@ func (this *TmpzcgfController) UpdateAnnualAudit() {
 	//	}
 	//}
 
-	err = session.Commit()
-	fmt.Println(err)
+	// err = session.Commit()
+	if err != nil {
+		// session.Rollback()
+		fmt.Println(err)
+	}
 	elapsed := time.Since(t)
 	fmt.Println(elapsed)
 }
@@ -209,15 +214,15 @@ func (this *TmpzcgfController) UpdateAnnualAudit() {
 func (this *TmpzcgfController) UpdateOilSupplierCertAppend() {
 	fmt.Println("=============开始更新CertAppend==========")
 	t := time.Now()
-	session := utils.DBE.NewSession()
+	// session := utils.DBE.NewSession()
 	defer func() {
 		fmt.Println("=============开始CertAppend结束==========")
-		session.Close()
+		// session.Close()
 	}()
-	err := session.Begin()
-	svc := tmpzcgf.GetTmpzcgtService(session)
+	// err := session.Begin()
+	svc := tmpzcgf.GetTmpzcgtService(utils.DBE)
 
-	err = svc.UpOilSupplierCertAppend()
+	err := svc.UpOilSupplierCertAppend()
 
 	//var appendlist []suppliercertappend.OilSupplierCertAppend
 	//var certlist  []suppliercert.OilSupplierCert
@@ -243,10 +248,11 @@ func (this *TmpzcgfController) UpdateOilSupplierCertAppend() {
 	//}
 
 	if err != nil {
-		session.Rollback()
+		// session.Rollback()
+		fmt.Println(err)
 	}
-	err = session.Commit()
-	fmt.Println(err)
+	// err = session.Commit()
+
 	elapsed := time.Since(t)
 	fmt.Println(elapsed)
 
@@ -259,23 +265,24 @@ func (this *TmpzcgfController) UpdateOilSupplierCertAppend() {
 func (this *TmpzcgfController) InsterOilPaymentInfo() {
 	fmt.Println("=============导入交费记录开始==========")
 	t := time.Now()
-	session := utils.DBE.NewSession()
+	// session := utils.DBE.NewSession()
 	defer func() {
 		fmt.Println("=============导入交费记录结束==========")
-		session.Close()
+		// session.Close()
 	}()
-	err := session.Begin()
-	svc := tmpzcgf.GetTmpzcgtService(session)
-	err = svc.InsertOilPaymentInfo()
+	// err := session.Begin()
+	svc := tmpzcgf.GetTmpzcgtService(utils.DBE)
+	err := svc.InsertOilPaymentInfo()
 	if err != nil {
-		session.Rollback()
+		// session.Rollback()
+		fmt.Println(err)
 	}
 	err = svc.UpdateOilPaymentInfo()
 	if err != nil {
-		session.Rollback()
+		// session.Rollback()
+		fmt.Println(err)
 	}
-	err = session.Commit()
-	fmt.Println(err)
+	// err = session.Commit()
 	elapsed := time.Since(t)
 	fmt.Println(elapsed)
 }
@@ -287,24 +294,25 @@ func (this *TmpzcgfController) InsterOilPaymentInfo() {
 func (this *TmpzcgfController) InsterBadRecord() {
 	fmt.Println("=============导入不良记录开始==========")
 	t := time.Now()
-	session := utils.DBE.NewSession()
+	// session := utils.DBE.NewSession()
 	defer func() {
 		fmt.Println("=============导入不良记录结束==========")
-		session.Close()
+		// session.Close()
 	}()
-	err := session.Begin()
-	svc := tmpzcgf.GetTmpzcgtService(session)
-	err = svc.InsterBadRecord()
+	// err := session.Begin()
+	svc := tmpzcgf.GetTmpzcgtService(utils.DBE)
+	err := svc.InsterBadRecord()
 
 	if err != nil {
-		session.Rollback()
+		// session.Rollback()
+		fmt.Println(err)
 	}
 	err = svc.UpdateBadRecord()
 	if err != nil {
-		session.Rollback()
+		// session.Rollback()
+		fmt.Println(err)
 	}
-	err = session.Commit()
-	fmt.Println(err)
+	// err = session.Commit()
 	elapsed := time.Since(t)
 	fmt.Println(elapsed)
 }
@@ -340,19 +348,19 @@ func (this *TmpzcgfController) InsterBadRecord() {
 func (this *TmpzcgfController) InsertCertSub() {
 	fmt.Println("=============开始导入准入范围==========")
 	t := time.Now()
-	session := utils.DBE.NewSession()
+	// session := utils.DBE.NewSession()
 	defer func() {
 		fmt.Println("=============导入准入范围结束==========")
-		session.Close()
+		// session.Close()
 	}()
-	err := session.Begin()
-	svc := tmpzcgf.GetTmpzcgtService(session)
-	err = svc.InsertCertSub()
+	// err := session.Begin()
+	svc := tmpzcgf.GetTmpzcgtService(utils.DBE)
+	err := svc.InsertCertSub()
 	if err != nil {
-		session.Rollback()
+		// session.Rollback()
+		fmt.Println(err)
 	}
-	err = session.Commit()
-	fmt.Println(err)
+	// err = session.Commit()
 	elapsed := time.Since(t)
 	fmt.Println(elapsed)
 }
@@ -364,25 +372,25 @@ func (this *TmpzcgfController) InsertCertSub() {
 func (this *TmpzcgfController) UpdateOilSupplierCertSub() {
 	fmt.Println("=============开始更新准入范围==========")
 	t := time.Now()
-	session := utils.DBE.NewSession()
+	// session := utils.DBE.NewSession()
 	defer func() {
 		fmt.Println("=============更新范围结束==========")
-		session.Close()
+		// session.Close()
 	}()
-	err := session.Begin()
-	svc := tmpzcgf.GetTmpzcgtService(session)
+	// err := session.Begin()
+	svc := tmpzcgf.GetTmpzcgtService(utils.DBE)
 	var supplierlist []supplier.OilSupplier
 	where := "CreateBy='导入'"
 	svc.GetEntities(&supplierlist, where)
 	for _, item := range supplierlist {
 		where := "where b.Type = '1' and b.CreateBy='导入1' and b.Remark = '" + item.SupplierName + "'"
-		err = svc.UpdateCertSub(where)
+		err := svc.UpdateCertSub(where)
 		if err != nil {
-			session.Rollback()
+			// session.Rollback()
+			fmt.Println(err)
 		}
 	}
-	err = session.Commit()
-	fmt.Println(err)
+	// err = session.Commit()
 	elapsed := time.Since(t)
 	fmt.Println(elapsed)
 }
@@ -394,37 +402,40 @@ func (this *TmpzcgfController) UpdateOilSupplierCertSub() {
 func (this *TmpzcgfController) UpdateCertSubclassID() {
 	fmt.Println("=============开始更新编码ID==========")
 	t := time.Now()
-	session := utils.DBE.NewSession()
+	// session := utils.DBE.NewSession()
 	defer func() {
 		fmt.Println("=============导入更新编码ID==========")
-		session.Close()
+		// session.Close()
 	}()
-	err := session.Begin()
-	svc := tmpzcgf.GetTmpzcgtService(session)
+	// err := session.Begin()
+	svc := tmpzcgf.GetTmpzcgtService(utils.DBE)
 	var supplierlist []supplier.OilSupplier
 	where := "CreateBy='导入'"
 	svc.GetEntities(&supplierlist, where)
 	for _, item := range supplierlist {
 		where := " and  b.Type = '1' and b.CreateBy='导入1' and b.Remark = '" + item.SupplierName + "'"
-		err = svc.UpdateCertSub01classId(where)
+		err := svc.UpdateCertSub01classId(where)
 		if err != nil {
-			session.Rollback()
-			return
+			fmt.Println(err)
+			// session.Rollback()
+			// return
 		}
 		err = svc.UpdateCertSub02classId(where)
 		if err != nil {
-			session.Rollback()
-			return
+			fmt.Println(err)
+			//session.Rollback()
+			//return
 		}
 		err = svc.UpdateCertSub03classId(where)
 		if err != nil {
-			session.Rollback()
-			return
+			fmt.Println(err)
+			// session.Rollback()
+			// return
 		}
 	}
 
-	err = session.Commit()
-	fmt.Println(err)
+	// err = session.Commit()
+	// fmt.Println(err)
 	elapsed := time.Since(t)
 	fmt.Println(elapsed)
 
@@ -437,18 +448,19 @@ func (this *TmpzcgfController) UpdateCertSubclassID() {
 func (this *TmpzcgfController) InsertOilSupplierCertAppend() {
 	fmt.Println("==========导入增项申请开始=========")
 	t := time.Now()
-	session := utils.DBE.NewSession()
+	// session := utils.DBE.NewSession()
 	defer func() {
 		fmt.Println("==========导入增项申请结束=========")
-		session.Close()
+		// session.Close()
 	}()
-	err := session.Begin()
-	svc := tmpzcgf.GetTmpzcgtService(session)
-	err = svc.InsertOilSupplierCertAppend()
+	// err := session.Begin()
+	svc := tmpzcgf.GetTmpzcgtService(utils.DBE)
+	err := svc.InsertOilSupplierCertAppend()
 	if err != nil {
-		session.Rollback()
+		// session.Rollback()
+		fmt.Println(err)
 	}
-	err = session.Commit()
+	// err = session.Commit()
 	fmt.Println(err)
 	elapsed := time.Since(t)
 	fmt.Println(elapsed)
@@ -461,19 +473,20 @@ func (this *TmpzcgfController) InsertOilSupplierCertAppend() {
 func (this *TmpzcgfController) InsertOilInfoChange() {
 	fmt.Println("==========导入信息变更开始=========")
 	t := time.Now()
-	session := utils.DBE.NewSession()
+	// session := utils.DBE.NewSession()
 	defer func() {
 		fmt.Println("==========导入信息变更结束=========")
-		session.Close()
+		// session.Close()
 	}()
-	err := session.Begin()
-	svc := tmpzcgf.GetTmpzcgtService(session)
-	err = svc.InsertOilInfoChange()
+	// err := session.Begin()
+	svc := tmpzcgf.GetTmpzcgtService(utils.DBE)
+	err := svc.InsertOilInfoChange()
 	if err != nil {
-		session.Rollback()
+		// session.Rollback()
+		fmt.Println(err)
 	}
-	err = session.Commit()
-	fmt.Println(err)
+	// err = session.Commit()
+	// fmt.Println(err)
 	elapsed := time.Since(t)
 	fmt.Println(elapsed)
 }
@@ -485,19 +498,20 @@ func (this *TmpzcgfController) InsertOilInfoChange() {
 func (this *TmpzcgfController) InsertOilSupplierCertSub() {
 	fmt.Println("==========导入增项的准入范围开始=========")
 	t := time.Now()
-	session := utils.DBE.NewSession()
+	// session := utils.DBE.NewSession()
 	defer func() {
 		fmt.Println("==========导入增项的准入范围结束=========")
-		session.Close()
+		// session.Close()
 	}()
-	err := session.Begin()
-	svc := tmpzcgf.GetTmpzcgtService(session)
-	err = svc.InsertOilSupplierCertSub()
+	// err := session.Begin()
+	svc := tmpzcgf.GetTmpzcgtService(utils.DBE)
+	err := svc.InsertOilSupplierCertSub()
 	if err != nil {
-		session.Rollback()
+		// session.Rollback()
+		fmt.Println(err)
 	}
-	err = session.Commit()
-	fmt.Println(err)
+	// err = session.Commit()
+	// fmt.Println(err)
 	elapsed := time.Since(t)
 	fmt.Println(elapsed)
 }
@@ -509,19 +523,20 @@ func (this *TmpzcgfController) InsertOilSupplierCertSub() {
 func (this *TmpzcgfController) UpdateOilInfoChange() {
 	fmt.Println("==========更新信息变更开始=========")
 	t := time.Now()
-	session := utils.DBE.NewSession()
+	// session := utils.DBE.NewSession()
 	defer func() {
 		fmt.Println("==========更新信息变更结束=========")
-		session.Close()
+		// session.Close()
 	}()
-	err := session.Begin()
-	svc := tmpzcgf.GetTmpzcgtService(session)
-	err = svc.UpdateOilInfoChange()
+	// err := session.Begin()
+	svc := tmpzcgf.GetTmpzcgtService(utils.DBE)
+	err := svc.UpdateOilInfoChange()
 	if err != nil {
-		session.Rollback()
+		// session.Rollback()
+		fmt.Println(err)
 	}
-	err = session.Commit()
-	fmt.Println(err)
+	// err = session.Commit()
+	// fmt.Println(err)
 	elapsed := time.Since(t)
 	fmt.Println(elapsed)
 }
@@ -533,28 +548,28 @@ func (this *TmpzcgfController) UpdateOilInfoChange() {
 func (this *TmpzcgfController) UpdateCertSubIsType1() {
 	fmt.Println("==========更新增项的准入范围=========")
 	t := time.Now()
-	session := utils.DBE.NewSession()
+	// session := utils.DBE.NewSession()
 	defer func() {
 		fmt.Println("==========增项的准入范围结束=========")
-		session.Close()
+		// session.Close()
 	}()
-	err := session.Begin()
+	// err := session.Begin()
 
 	var supplierlist []supplier.OilSupplier
 	where := "CreateBy='导入'"
-	svc := tmpzcgf.GetTmpzcgtService(session)
+	svc := tmpzcgf.GetTmpzcgtService(utils.DBE)
 	svc.GetEntities(&supplierlist, where)
 	for _, item := range supplierlist {
 		fmt.Println(item.SupplierName)
 		where := "where b.Type = '3' and b.ModifiedBy = '" + item.SupplierName + "'"
-		err = svc.UpdateCertSubIsType2(where)
+		err := svc.UpdateCertSubIsType2(where)
 		if err != nil {
-			session.Rollback()
+			// session.Rollback()
+			fmt.Println(err)
 		}
-		err = session.Commit()
+		// err = session.Commit()
 	}
 
-	fmt.Println(err)
 	elapsed := time.Since(t)
 	fmt.Println(elapsed)
 }
@@ -568,8 +583,10 @@ func (this *TmpzcgfController) UpdateCertSubIsType3() {
 	t := time.Now()
 	svc := tmpzcgf.GetTmpzcgfService1(utils.DBE)
 	err := svc.UpdateCertSubIsType3()
-
-	fmt.Println(err)
+	if err != nil {
+		// session.Rollback()
+		fmt.Println(err)
+	}
 	elapsed := time.Since(t)
 	fmt.Println(elapsed)
 	fmt.Println("==========更新增项的准入范围结束=========")
@@ -617,24 +634,21 @@ func (this *TmpzcgfController) ClearTmpData() {
 func (this *TmpzcgfController) DelBadRecord() {
 	fmt.Println("==========删除多余的不良记录=========")
 	t := time.Now()
-	session := utils.DBE.NewSession()
+	// session := utils.DBE.NewSession()
 	defer func() {
 		fmt.Println("==========删除多余的不良记录=========")
-		session.Close()
+		// session.Close()
 	}()
-	err := session.Begin()
+	// err := session.Begin()
 
-	svc := tmpzcgf.GetTmpzcgtService(session)
+	svc := tmpzcgf.GetTmpzcgtService(utils.DBE)
 	where := "CompanyName is null"
-	err = svc.DeleteEntityBytbl(BaseBadRecord, where)
+	err := svc.DeleteEntityBytbl(BaseBadRecord, where)
 
 	if err != nil {
-		session.Rollback()
-	} else {
-		err = session.Commit()
+		// session.Rollback()
+		fmt.Println(err)
 	}
-
-	fmt.Println(err)
 	elapsed := time.Since(t)
 	fmt.Println(elapsed)
 }
@@ -653,7 +667,7 @@ func (this *TmpzcgfController) CapacityExpansion() {
 	svc.GetEntities(&suppliercertList, where)
 
 	// 供应商
-	for _, suppliercert :=  range suppliercertList {
+	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)
@@ -679,7 +693,7 @@ func (this *TmpzcgfController) CapacityExpansion() {
 			svc.InsertEntityBytbl(OilSupplierCertSubName, &entitys) */
 			// fmt.Println("编码扩充:")
 			// fmt.Println(entitys)
-			
+
 			for _, goodsAptitudeClass := range goodsAptitudeClassList {
 				var entity suppliercertsub.OilSupplierCertSub
 				entity.SupplierId = supplierCertSub.SupplierId
@@ -714,23 +728,170 @@ func (this *TmpzcgfController) CapacityExpansion() {
 func (this *TmpzcgfController) InsertFileName() {
 	fmt.Println("==========导入资质名称开始=========")
 	t := time.Now()
-	session := utils.DBE.NewSession()
+	// session := utils.DBE.NewSession()
 	defer func() {
 		fmt.Println("==========导入资质名称结束=========")
-		session.Close()
+		// session.Close()
 	}()
-	err := session.Begin()
-	svc := tmpzcgf.GetTmpzcgtService(session)
-	err = svc.InsertFileName()
+	// err := session.Begin()
+	svc := tmpzcgf.GetTmpzcgtService(utils.DBE)
+	err := svc.InsertFileName()
 	if err != nil {
-		session.Rollback()
+		// session.Rollback()
+		fmt.Println(err)
 	}
 	err = svc.UpdateSupplierFileSId()
 	if err != nil {
-		session.Rollback()
+		// session.Rollback()
+		fmt.Println(err)
 	}
-	err = session.Commit()
-	fmt.Println(err)
+	// err = session.Commit()
+	// fmt.Println(err)
 	elapsed := time.Since(t)
 	fmt.Println(elapsed)
-}
+}
+
+// @Title 清空所有资质
+// @Description get user by token
+// @Success 200 {object}
+// @router /clearAll [get]
+func (this *TmpzcgfController) ClearAll() {
+	fmt.Println("==========truncate table开始=========")
+	svc := tmpzcgf.GetTmpzcgtService(utils.DBE)
+	sql := "truncate table OilAnnualAudit"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table OilCorporateInfo"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table OilEnterpriseMajorEquipment"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table OilInfoChange"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table OilInfoChangeItem"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table OilPatentStatistical"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table OilPaymentInfo"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table OilQualChangeDetail"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table OilQualChangeMain"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table OilSupplier"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table OilSupplierCert"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table OilSupplierCert2File"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table OilSupplierCertAppend"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table OilSupplierCertAppendSub"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table OilSupplierCertSub"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table OilSupplierFile"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table OilSupplierOldInfo"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table OilSupplierOpinion"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table OilThreeYearsPerformance"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table OilWinningProject"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table s5OVEDocumentHistory"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table s5OVEDocumentInfo"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table Del_OilAnnualAudit"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table Del_OilInfoChange"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table Del_OilPaymentInfo"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table Del_OilSupplier"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table Del_OilSupplierCert"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table Del_OilSupplierCertAppend"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table Del_OilSupplierCertSub"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table Del_OilSupplierFile"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table Manufacturer"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table BadRecord"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table BadRecordHistory"
+	svc.DBE.SQL(sql).Exec()
+
+	sql = "truncate table Base_AuditHistory"
+	svc.DBE.SQL(sql).Exec()
+	fmt.Println("==========truncate table结束=========")
+
+}
+// @Title 一键执行所有导入
+// @Description get user by token
+// @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()
+	this.InsterAnnualAudit()
+	this.UpdateAnnualAudit()
+	this.UpdateAnnualAudit()
+	this.InsterOilPaymentInfo()
+	this.InsterBadRecord()
+	this.InsertOilInfoChange()
+	this.UpdateOilInfoChange()
+	this.DelBadRecord()
+
+	this.ClearTmpData()
+}

src/dashoo.cn/frontend_web/src/pages/system/tmpzcgf.vue

@@ -9,13 +9,13 @@
         <el-breadcrumb class="heading"
                        style="float: left; margin-left: 5px">
           <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-          <el-breadcrumb-item :to="{ path: '/system/users' }">收费管理</el-breadcrumb-item>
+          <el-breadcrumb-item :to="{ path: '/system/users' }">导入历史数据</el-breadcrumb-item>
         </el-breadcrumb>
         <span style="float: right;">
           <!--<el-button size="mini" type="primary" style="margin-left:10px; margin-top: -4px;" @click="opendatadialog(1,null,-1);resetForm('organizeform')">新增用户</el-button>-->
         </span>
       </div>
-      <el-row :gutter="20"
+      <!--<el-row :gutter="20"
               style="margin-bottom: 20px;">
         <el-col :span="24">
           <el-badge :value="1"
@@ -186,6 +186,15 @@
                      @click="cleartmpdata"
                      v-loading.fullscreen.lock="fullscreenLoading">清空临时数据</el-button>
         </el-col>
+      </el-row>-->
+
+      <el-row style="margin-bottom: 20px;">
+        <el-col :span="24">
+          <el-button size="mini"
+                     type="primary"
+                     @click="InsertAll"
+                     v-loading.fullscreen.lock="fullscreenLoading">导入全部数据，点击后可以关闭页面</el-button>
+        </el-col>
       </el-row>
 
       <!--<el-button size="mini" type="primary" @click="insertCertSub" v-loading.fullscreen.lock="fullscreenLoading">导入准入范围</el-button>-->
@@ -744,6 +753,25 @@ export default {
               this.fullscreenLoading = false
             })
         })
+    },
+    InsertAll () {
+      this.$confirm('导入全部历史数据，请打开后台监控日志，确定是否完成，是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          this.fullscreenLoading = true
+          this.$axios.get('tmpzcgf/insertAll')
+            .then(res => {
+              this.fullscreenLoading = false
+              this.$notify({
+                title: '成功',
+                message: '全部导入成功！',
+                type: 'success'
+              });
+            })
+        })
     }
   }
 }