Sfoglia il codice sorgente

feature:企业微信审批

ZZH-wl 1 anno fa
parent
commit
4713d600ff

+ 2 - 0
opms_parent/app/service/proj/business.go

@@ -790,6 +790,8 @@ func (p *businessService) BusUpgradeDingEvent(business *model.ProjBusiness, req
 
 	applyData := gconv.Map(business)
 	applyData["abstract"] = fmt.Sprintf("申请人:%v 申请将项目:%v 转为储备项目", p.GetCxtUserName(), business.NboName)
+	applyData["wxNboType"] = wxBusUpType[business.NboType]
+
 	applyData["productLine"] = productLine
 	applyData["upgradeType"] = upgradeType
 	applyData["nboType"] = convertToReserveType[business.NboType]

+ 7 - 0
opms_parent/app/service/proj/const.go

@@ -78,3 +78,10 @@ var yesOrNoType = g.MapStrStr{
 	"10": "是", // 是/option_0
 	"20": "否", // 否/option_1
 }
+
+// 微信 项目升级类型
+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
+}

+ 7 - 6
opms_parent/app/service/workflow/work_flow.go

@@ -199,7 +199,7 @@ func WeChatStructConversion(itemMap g.MapStrStr, approvalData g.Map) (WXwork.OAC
 			Selector: WXwork.OAContentSelector{
 				Type: "single",
 				Options: []WXwork.OAContentSelectorOption{
-					{Key: "option-1608632503204"},
+					{Key: gconv.String(approvalData[itemMap["code"]])},
 				},
 			},
 		}
@@ -207,13 +207,14 @@ func WeChatStructConversion(itemMap g.MapStrStr, approvalData g.Map) (WXwork.OAC
 		content.Control = WXwork.OAControlSelector
 		content.Value = WXwork.OAContentValue{
 			Selector: WXwork.OAContentSelector{
-				Type: "multi",
-				Options: []WXwork.OAContentSelectorOption{
-					{Key: "option-1608632504330"},
-					{Key: "option-1608632504331"},
-				},
+				Type:    "multi",
+				Options: []WXwork.OAContentSelectorOption{},
 			},
 		}
+		vals := gconv.Strings(approvalData[itemMap["code"]])
+		for _, val := range vals {
+			content.Value.Selector.Options = append(content.Value.Selector.Options, WXwork.OAContentSelectorOption{Key: val})
+		}
 	case string(WXwork.OAControlContact):
 		content.Control = WXwork.OAControlContact
 		content.Value = WXwork.OAContentValue{