后:增项和年审审批通过后也修改基本信息,为了老流程

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

@@ -358,27 +358,27 @@ 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
-	for _,item := range infoItems{
+	for _, item := range infoItems {
 		if item.SelectItem == "SupplierName" {
 			user.Realname = item.ChangeInfo
 			var cor register.OilCorporateInfo
 			var cert suppliercert.OilSupplierCert
 			var oldName supplier.OilSupplierOldName
 			var supplier supplier.OilSupplier
-			srv.GetEntityByWhere(OilSupplierCertName,"Id = " + strconv.Itoa(annualEntity.CerId),&cert)
-			srv.GetEntityByWhere(OilSupplierName,"Id = " + strconv.Itoa(cert.SupplierId),&supplier)
-			srv.GetEntityByWhere(OilCorporateInfoName,"CommercialNo = '" + supplier.CommercialNo + "'",&cor)
-			if cor.UserId > 0{
-				srv.UpdateEntityBywheretbl("Base_User", &user, []string{"RealName"}, "Id = " + strconv.Itoa(cor.UserId))
+			srv.GetEntityByWhere(OilSupplierCertName, "Id = "+strconv.Itoa(annualEntity.CerId), &cert)
+			srv.GetEntityByWhere(OilSupplierName, "Id = "+strconv.Itoa(cert.SupplierId), &supplier)
+			srv.GetEntityByWhere(OilCorporateInfoName, "CommercialNo = '"+supplier.CommercialNo+"'", &cor)
+			if cor.UserId > 0 {
+				srv.UpdateEntityBywheretbl("Base_User", &user, []string{"RealName"}, "Id = "+strconv.Itoa(cor.UserId))
 			}
 			// 曾用名存到主表
 			supplier.OldSupplierName = item.BeChangeInfo

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

@@ -8,6 +8,8 @@ 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/business2/userRole"
 	"encoding/json"
 	"log"
 	"strconv"
@@ -406,53 +408,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