历史数据导入-更新

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

@@ -115,8 +115,8 @@ FROM
 }
 
 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 " +
+	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 准入标识 != '取消' ;"
 	_, err := s.DBE.Query(sql)
 	return err
@@ -345,7 +345,7 @@ func (s *TmpzcgtSession) InsertOilSupplierCertSub() error {
 }
 
 func (s *TmpzcgtSession) UpdateOilInfoChange() error {
-	sql := "UPDATE OilInfoChange b SET b.SupplierId=(SELECT a.SupplierId FROM OilSupplierCert a WHERE a.GfId = b.HouseNo)"
+	sql := "UPDATE OilInfoChange b SET b.SupplierId=IFNULL((SELECT a.SupplierId FROM OilSupplierCert a WHERE a.GfId = b.HouseNo limit 1), 0)"
 	_, err := s.DBE.Query(sql)
 	return err
 }

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

@@ -868,7 +868,7 @@ func (this *TmpzcgfController) ClearAll() {
 // @router /insertAll [get]
 func (this *TmpzcgfController) InsertAll() {
 	//清空所有资质
-	/*this.ClearAll()
+	this.ClearAll()
 
 	this.InsertSupplier()
 	this.InsertSupplierCert()
@@ -882,7 +882,7 @@ func (this *TmpzcgfController) InsertAll() {
 	this.InsertOilSupplierCertSub()
 	this.UpdateCertSubIsType1()
 
-	this.CapacityExpansion()*/
+	this.CapacityExpansion()
 	// 历史数据导入-由于运行到此处中断，上面的代码临时注释
 	this.UpdateCertSubIsType3()
 	this.InsterAnnualAudit()