后:年审和增项审核缴费前就修改基本信息,为了发票

src/dashoo.cn/backend/api/controllers/oilsupplier/annualListener.go

@@ -356,14 +356,14 @@ func (this *OilAnnualListenerController) WorkflowEndAudit() {
 		}
 	}
 
-	// 更新主表信息
+	// 更新主表信息-放到缴费前更新
 	var infoItems []infochange.OilAnnualChangeItem
-	where := "SupplierId = " + utils.ToStr(annualEntity.SupplierId) + " and InfoId = " + utils.ToStr(annualEntity.Id)
-	srv.GetEntities(&infoItems, where)
-	err := this.updateSupplierAfterInStorage(OilSupplierName, annualEntity.SupplierId, infoItems)
-	if err != nil {
-		log.Print("年审实际变更信息出错: ", err)
-	}
+	//where := "SupplierId = " + utils.ToStr(annualEntity.SupplierId) + " and InfoId = " + utils.ToStr(annualEntity.Id)
+	//srv.GetEntities(&infoItems, where)
+	//err := this.updateSupplierAfterInStorage(OilSupplierName, annualEntity.SupplierId, infoItems)
+	//if err != nil {
+	//	log.Print("年审实际变更信息出错: ", err)
+	//}
 
 	// 更新user表的RealName
 	var user userRole.Base_User

src/dashoo.cn/backend/api/controllers/oilsupplier/annualaudit.go

@@ -1103,6 +1103,14 @@ func (this *AnnualAuditController) CommonAuditEntity() {
 	if receiveVal != "true" {
 		log.Println("工作流异常, 业务ID："+annualEntity.BusinessKey+"， 流程ID："+annualEntity.WorkflowId, " 工作流传参: ", ActiComplete, receiveVal)
 		panic("任务已审批，请刷新！")
+	} else {
+		// 交费前,企管法规处审批后就修改基本信息
+		if annualEntity.Status == suppliercert.CENT_AUDIT_STATUS {
+			var infoItems []infochange.OilAnnualChangeItem
+			where := "SupplierId = " + utils.ToStr(annualEntity.SupplierId) + " and InfoId = " + utils.ToStr(annualEntity.Id)
+			svc.GetEntities(&infoItems, where)
+			this.updatesupplier(OilSupplierName, annualEntity.SupplierId, infoItems)
+		}
 	}
 }
 
@@ -1253,7 +1261,7 @@ func (this *AnnualAuditController) AuditCallback() {
 // @Description 审核
 // @Success	200	{object} controllers.Request
 // @router /auditfirst [put]
-func (this *AnnualAuditController) AnnualAudit() {
+func (this *AnnualAuditController) AnnualAudit() 	{
 	svc := annualaudit.GetOilAnnualAuditService(utils.DBE)
 	var jsonblob = this.Ctx.Input.RequestBody
 	var dataother ShenHeModel
@@ -1730,8 +1738,8 @@ func (this *AnnualAuditController) AddQualChange() {
 	supplierfile.SupplierTypeCode = model.SupplierTypeCode
 	supplierfile.IsManuf = tableHeader.IsManuf
 	supplierfile.NeedFileType = model.NeedFileType
-	supplierfile.FileType = 1
-	supplierfile.SupType = 4
+	supplierfile.FileType = 0
+	supplierfile.SupType = 2
 	supplierfile.CreateOn = time.Now()
 	supplierfile.CreateUserId, _ = strconv.Atoi(this.User.Id)
 	supplierfile.CreateBy = this.User.Realname

src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercertAppendListener.go

@@ -8,8 +8,6 @@ import (
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercertsub"
 	"dashoo.cn/backend/api/business/oilsupplier/supplierfile"
 	"dashoo.cn/backend/api/business/paymentinfo"
-	"dashoo.cn/backend/api/business/register"
-	"dashoo.cn/business/userRole"
 	"encoding/json"
 	"log"
 	"strconv"
@@ -408,53 +406,53 @@ func (this *OilSupplierCertAppendListenerController) WorkflowEndAudit() {
 	appendModel.Status = suppliercert.ALL_PASE_STATUS
 	certAppendSrv.UpdateEntityBywheretbl(OilSupplierCertAppendName, &appendModel, []string{"Status"}, appdWhere)
 	//信息变更
-	var infoItems []suppliercertappendsub.OilAppendChangeItem
-	where := "SupplierId = " + utils.ToStr(supplierCertAppendEntity.SupplierId) + " and InfoId = " + utils.ToStr(supplierCertAppendId)
-	certAppendSrv.GetEntities(&infoItems, where)
-	var _ error
-	if len(infoItems) > 0 {
-		for i := 0; i < len(infoItems); i++ {
-			if infoItems[i].SelectItem == "SupplierName" {
-				var user userRole.Base_User
-				var oldName supplier.OilSupplierOldName
-				user.Realname = infoItems[i].ChangeInfo
-				var cor register.OilCorporateInfo
-				var supplier supplier.OilSupplier
-				certAppendSrv.GetEntityByWhere(OilSupplierName, "Id = "+strconv.Itoa(supplierCertAppendEntity.SupplierId), &supplier)
-				certAppendSrv.GetEntityByWhere(OilCorporateInfoName, "CommercialNo = '"+supplier.CommercialNo+"'", &cor)
-				if cor.UserId > 0 {
-					// 更新user表的RealName
-					certAppendSrv.UpdateEntityBywheretbl("Base_User", &user, []string{"RealName"}, "Id = "+strconv.Itoa(cor.UserId))
-				}
-
-				// 曾用名存到主表
-				supplier.OldSupplierName = infoItems[i].BeChangeInfo
-				certAppendSrv.UpdateEntityBywheretbl(OilSupplierName, &supplier, []string{"OldSupplierName"}, "Id = "+strconv.Itoa(supplierCertAppendEntity.SupplierId))
-
-				oldName.OldName = infoItems[i].BeChangeInfo
-				oldName.Name = infoItems[i].ChangeInfo
-				oldName.SupplierId = supplierCertAppendEntity.SupplierId
-				oldName.GfId = 0
-				oldName.CreateOn = infoItems[i].CreateOn
-				oldName.CreateBy = infoItems[i].CreateBy
-				oldName.CreateUserId = infoItems[i].CreateUserId
-				// 曾用名存到子表
-				if oldName.OldName != "" && oldName.Name != "" {
-					certAppendSrv.InsertEntityBytbl("OilSupplierOldName", &oldName)
-				}
-
-			}
-
-			where := " Id = " + utils.ToStr(supplierCertAppendEntity.SupplierId)
-			var sql string
-			if infoItems[i].SelectItem == "SetupTime" {
-				sql = `UPDATE ` + OilSupplierName + ` set ` + infoItems[i].SelectItem + ` = '` + infoItems[i].ChangeInfo[0:10] + `' where ` + where
-			} else {
-				sql = `UPDATE ` + OilSupplierName + ` set ` + infoItems[i].SelectItem + ` = '` + infoItems[i].ChangeInfo + `' where ` + where
-			}
-			_, _ = certAppendSrv.DBE.Exec(sql)
-		}
-	}
+	//var infoItems []suppliercertappendsub.OilAppendChangeItem
+	//where := "SupplierId = " + utils.ToStr(supplierCertAppendEntity.SupplierId) + " and InfoId = " + utils.ToStr(supplierCertAppendId)
+	//certAppendSrv.GetEntities(&infoItems, where)
+	//var _ error
+	//if len(infoItems) > 0 {
+	//	for i := 0; i < len(infoItems); i++ {
+	//		if infoItems[i].SelectItem == "SupplierName" {
+	//			var user userRole.Base_User
+	//			var oldName supplier.OilSupplierOldName
+	//			user.Realname = infoItems[i].ChangeInfo
+	//			var cor register.OilCorporateInfo
+	//			var supplier supplier.OilSupplier
+	//			certAppendSrv.GetEntityByWhere(OilSupplierName, "Id = "+strconv.Itoa(supplierCertAppendEntity.SupplierId), &supplier)
+	//			certAppendSrv.GetEntityByWhere(OilCorporateInfoName, "CommercialNo = '"+supplier.CommercialNo+"'", &cor)
+	//			if cor.UserId > 0 {
+	//				// 更新user表的RealName
+	//				certAppendSrv.UpdateEntityBywheretbl("Base_User", &user, []string{"RealName"}, "Id = "+strconv.Itoa(cor.UserId))
+	//			}
+	//
+	//			// 曾用名存到主表
+	//			supplier.OldSupplierName = infoItems[i].BeChangeInfo
+	//			certAppendSrv.UpdateEntityBywheretbl(OilSupplierName, &supplier, []string{"OldSupplierName"}, "Id = "+strconv.Itoa(supplierCertAppendEntity.SupplierId))
+	//
+	//			oldName.OldName = infoItems[i].BeChangeInfo
+	//			oldName.Name = infoItems[i].ChangeInfo
+	//			oldName.SupplierId = supplierCertAppendEntity.SupplierId
+	//			oldName.GfId = 0
+	//			oldName.CreateOn = infoItems[i].CreateOn
+	//			oldName.CreateBy = infoItems[i].CreateBy
+	//			oldName.CreateUserId = infoItems[i].CreateUserId
+	//			// 曾用名存到子表
+	//			if oldName.OldName != "" && oldName.Name != "" {
+	//				certAppendSrv.InsertEntityBytbl("OilSupplierOldName", &oldName)
+	//			}
+	//
+	//		}
+	//
+	//		where := " Id = " + utils.ToStr(supplierCertAppendEntity.SupplierId)
+	//		var sql string
+	//		if infoItems[i].SelectItem == "SetupTime" {
+	//			sql = `UPDATE ` + OilSupplierName + ` set ` + infoItems[i].SelectItem + ` = '` + infoItems[i].ChangeInfo[0:10] + `' where ` + where
+	//		} else {
+	//			sql = `UPDATE ` + OilSupplierName + ` set ` + infoItems[i].SelectItem + ` = '` + infoItems[i].ChangeInfo + `' where ` + where
+	//		}
+	//		_, _ = certAppendSrv.DBE.Exec(sql)
+	//	}
+	//}
 
 	// 更新资质
 	var qualDetail []suppliercertappendsub.OilAppendChangeDetail

src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercertappend.go

@@ -1020,6 +1020,57 @@ func (this *OilSupplierCertAppendController) AppendCommonAuditEntity() {
 	if receiveVal != "true" {
 		log.Println("工作流异常, 业务ID："+supplierCertAppendEntity.BusinessKey+"， 流程ID："+supplierCertAppendEntity.WorkFlowId, " 工作流传参: ", ActiComplete, receiveVal)
 		panic("任务已审批，请刷新！")
+	} else {
+		// 更新主表信息-放到缴费前更新
+		if supplierCertAppendEntity.Status == suppliercert.LAW_AUDIT_STATUS {
+			var infoItems []suppliercertappendsub.OilAppendChangeItem
+			where := "SupplierId = " + utils.ToStr(supplierCertAppendEntity.SupplierId) + " and InfoId = " + certAppendId
+			certSrv.GetEntities(&infoItems, where)
+			var _ error
+			if len(infoItems) > 0 {
+				for i := 0; i < len(infoItems); i++ {
+					if infoItems[i].SelectItem == "SupplierName" {
+						var user userRole.Base_User
+						var oldName supplier.OilSupplierOldName
+						user.Realname = infoItems[i].ChangeInfo
+						var cor register.OilCorporateInfo
+						var supplier supplier.OilSupplier
+						certSrv.GetEntityByWhere(OilSupplierName, "Id = "+strconv.Itoa(supplierCertAppendEntity.SupplierId), &supplier)
+						certSrv.GetEntityByWhere(OilCorporateInfoName, "CommercialNo = '"+supplier.CommercialNo+"'", &cor)
+						if cor.UserId > 0 {
+							// 更新user表的RealName
+							certSrv.UpdateEntityBywheretbl("Base_User", &user, []string{"RealName"}, "Id = "+strconv.Itoa(cor.UserId))
+						}
+
+						// 曾用名存到主表
+						supplier.OldSupplierName = infoItems[i].BeChangeInfo
+						certSrv.UpdateEntityBywheretbl(OilSupplierName, &supplier, []string{"OldSupplierName"}, "Id = "+strconv.Itoa(supplierCertAppendEntity.SupplierId))
+
+						oldName.OldName = infoItems[i].BeChangeInfo
+						oldName.Name = infoItems[i].ChangeInfo
+						oldName.SupplierId = supplierCertAppendEntity.SupplierId
+						oldName.GfId = 0
+						oldName.CreateOn = infoItems[i].CreateOn
+						oldName.CreateBy = infoItems[i].CreateBy
+						oldName.CreateUserId = infoItems[i].CreateUserId
+						// 曾用名存到子表
+						if oldName.OldName != "" && oldName.Name != "" {
+							certSrv.InsertEntityBytbl("OilSupplierOldName", &oldName)
+						}
+
+					}
+
+					where := " Id = " + utils.ToStr(supplierCertAppendEntity.SupplierId)
+					var sql string
+					if infoItems[i].SelectItem == "SetupTime" {
+						sql = `UPDATE ` + OilSupplierName + ` set ` + infoItems[i].SelectItem + ` = '` + infoItems[i].ChangeInfo[0:10] + `' where ` + where
+					} else {
+						sql = `UPDATE ` + OilSupplierName + ` set ` + infoItems[i].SelectItem + ` = '` + infoItems[i].ChangeInfo + `' where ` + where
+					}
+					_, _ = certSrv.DBE.Exec(sql)
+				}
+			}
+		}
 	}
 }