feature：审批流实例Id更新

opms_parent/app/service/proj/business.go

@@ -583,7 +583,7 @@ func (p *businessService) BusinessTransfer(req *model.BusinessTransferReq) error
 			return err
 		}
 		// 更新项目审批信息
-		_, err = p.Dao.TX(tx).Data(g.Map{p.Dao.C.ApproType: business.ApproType, p.Dao.C.ApproInstanceId: instanceId}).Update()
+		_, err = p.Dao.TX(tx).Data(g.Map{p.Dao.C.ApproType: business.ApproType, p.Dao.C.ApproInstanceId: instanceId}).Where(p.Dao.C.Id, req.Id).Update()
 		if err != nil {
 			return err
 		}
@@ -739,7 +739,7 @@ func (p *businessService) BusinessUpgrade(req *model.BusinessUpgradeReq, fileMap
 			return err
 		}
 		// 更新项目审批信息
-		_, err = p.Dao.TX(tx).Data(g.Map{p.Dao.C.ApproType: business.ApproType, p.Dao.C.ApproInstanceId: instanceId}).Update()
+		_, err = p.Dao.TX(tx).Data(g.Map{p.Dao.C.ApproType: business.ApproType, p.Dao.C.ApproInstanceId: instanceId}).Where(p.Dao.C.Id, req.Id).Update()
 		if err != nil {
 			return err
 		}
@@ -789,7 +789,7 @@ func (p *businessService) BusUpgradeDingEvent(business *model.ProjBusiness, req
 	bizCode := business.NboCode + ":" + strconv.Itoa(business.Id)
 
 	applyData := gconv.Map(business)
-	applyData["abstract"] = fmt.Sprintf("申请人：%v 申请将项目：%v 转为储备项目", p.GetCxtUserName(), business.NboName)
+	applyData["abstract"] = fmt.Sprintf("申请人：%v 申请将项目：%v 项目升级 %v", p.GetCxtUserName(), business.NboName, convertToReserveType[business.NboType])
 	applyData["wxNboType"] = wxBusUpType[business.NboType]
 
 	applyData["productLine"] = productLine
@@ -811,7 +811,7 @@ func (p *businessService) BusUpgradeDingEvent(business *model.ProjBusiness, req
 	applyData["productList"] = gconv.Maps(req.Products)
 	applyData["remark"] = req.Remark
 
-	instanceId, err = workflowSrv.CheckStartProcessInstance(bizCode, workflowModel.ProjectDownGrade, "", applyData)
+	instanceId, err = workflowSrv.CheckStartProcessInstance(bizCode, workflowModel.ProjectUpGrade, "", applyData)
 	if err != nil {
 		g.Log().Error(err)
 		return "", err
@@ -1009,7 +1009,7 @@ func (p *businessService) BusinessDowngrade(req *model.BusinessDowngradeReq) err
 		business.ApproType = BusinessDowngradeRequestProcessCode
 
 		applyData := gconv.Map(business)
-		applyData["abstract"] = fmt.Sprintf("申请人：%v 申请将项目：%v 转为储备项目", p.GetCxtUserName(), business.NboName)
+		applyData["abstract"] = fmt.Sprintf("申请人：%v 申请将项目：%v 项目降级 %v", p.GetCxtUserName(), business.NboName, convertToReserveType[business.NboType])
 		applyData["productLine"] = productLine
 		applyData["nboType"] = convertToReserveType[business.NboType]
 		applyData["downgradeType"] = downgradeType
@@ -1021,7 +1021,7 @@ func (p *businessService) BusinessDowngrade(req *model.BusinessDowngradeReq) err
 			return err
 		}
 		// 更新项目审批信息
-		_, err = p.Dao.TX(tx).Data(g.Map{p.Dao.C.ApproType: business.ApproType, p.Dao.C.ApproInstanceId: instanceId}).Update()
+		_, err = p.Dao.TX(tx).Data(g.Map{p.Dao.C.ApproType: business.ApproType, p.Dao.C.ApproInstanceId: instanceId}).Where(p.Dao.C.Id, req.Id).Update()
 		if err != nil {
 			return err
 		}
@@ -1227,7 +1227,7 @@ func (p *businessService) ConvertToReserve(req *model.BusinessToReserveReq) erro
 			return err
 		}
 		// 更新项目审批信息
-		_, err = p.Dao.TX(tx).Data(g.Map{p.Dao.C.ApproType: business.ApproType, p.Dao.C.ApproInstanceId: instanceId}).Update()
+		_, err = p.Dao.TX(tx).Data(g.Map{p.Dao.C.ApproType: business.ApproType, p.Dao.C.ApproInstanceId: instanceId}).Where(p.Dao.C.Id, req.Id).Update()
 		if err != nil {
 			return err
 		}

opms_parent/app/service/proj/const.go

@@ -81,7 +81,10 @@ var yesOrNoType = g.MapStrStr{
 
 // 微信 项目升级类型
 var wxBusUpType = g.MapStrStr{
-	StatusA: "option-1718873893655", // OMS项目转A/option_0
-	StatusB: "option-1718873893656", // OMS项目转B/option_1
-	StatusC: "option-1718873919895", // OMS项目转C/option_2
+	//StatusA: "option-1718873893655", // OMS项目转A/option_0
+	//StatusB: "option-1718873893656", // OMS项目转B/option_1
+	//StatusC: "option-1718873919895", // OMS项目转C/option_2
+	StatusA: "OMS项目转A", // OMS项目转A/option_0
+	StatusB: "OMS项目转B", // OMS项目转B/option_1
+	StatusC: "OMS项目转C", // OMS项目转C/option_2
 }

opms_parent/config/config.toml

@@ -2,7 +2,6 @@
 [setting]
     logpath = "/tmp/log/admin"
     bind-addr = "192.168.0.77:8889"
-    need-advertise-addr = false
     srv-name = "dashoo.opms.parent-0.0.1-zzh"
     env = "dev"
     swagger = false
@@ -14,18 +13,18 @@
 
 # 数据库连接
 [database]
+    [[database.default]]
+        Debug = true
+        createdAt = "created_time"
+        updatedAt = "updated_time"
+        deletedAt = "deleted_time"
+        link = "mysql:root:Bgt56yhn@@@tcp(192.168.0.218:3306)/opms?loc=Local&parseTime=true"
     [[database.cp5vbwxy]]
         Debug = true
         createdAt = "created_time"
         updatedAt = "updated_time"
         deletedAt = "deleted_time"
         link = "mysql:root:Bgt56yhn@@@tcp(192.168.0.218:3306)/opms?loc=Local&parseTime=true"
-[[database.default]]
-Debug = true
-createdAt = "created_time"
-updatedAt = "updated_time"
-deletedAt = "deleted_time"
-link = "mysql:root:Bgt56yhn@@@tcp(192.168.0.218:3306)/opms?loc=Local&parseTime=true"
 
 [micro_srv]
     auth = "dashoo.opms.admin-0.0.1"
@@ -42,6 +41,7 @@ link = "mysql:root:Bgt56yhn@@@tcp(192.168.0.218:3306)/opms?loc=Local&parseTime=t
     token="WaasHsYk8V3wqwN5xRGsCmiiRDB"
 
 # 企业微信配置
+# 博为高科
 [wechat]
     corp_id="wwb8a793e5cc4d05cd"
     corp_secret="85hF4MDu32Lux2ah2A7Vo7kApQjqmQThjAV19hV2Pac"
@@ -49,7 +49,10 @@ link = "mysql:root:Bgt56yhn@@@tcp(192.168.0.218:3306)/opms?loc=Local&parseTime=t
     token="2A0QikjldWDRHJLu"
     encoding_aes_key="2n1qsuxPkOol71xGZvNOrNbgmGhWMwAtMrVGmgRDuqe"
 
-
-#[micro_srv]
-#    auth = "dashoo.opms.admin-0.0.1-sxy,192.168.0.106:8888"
-#    tenant = "default"
+# 沈阳斯鲁
+#[wechat]
+#    corp_id="ww3aa8109cb1785b21"
+#    corp_secret="uoef7S3z1uTyqpjtRlVQB8x462EFI4tqWBYd4sGqtbg"
+#    agent_id="1000002"
+#    token="QPXfU2IAnF2t"
+#    encoding_aes_key="PwVJgcKkrl3aIanWUwXw7ZTUxInthh1tw5HbkM1izmE"