From 399461961c628999f9e11c05afe197c2bcf8011e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Fri, 14 Jul 2023 11:38:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E6=9C=BA=E7=AB=AF?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java    | 32 +++++++++++++++++--
 .../DesignComplianceFlowNodeKeyEnum.java      |  1 +
 .../VerifyComplianceFlowNodeKeyEnum.java      |  1 +
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 601b155ab..4951e5d44 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -1104,6 +1104,28 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		}
 	}
 
+	private String handlePhoneDesignLink(ProjectLawsInventoryEO projectLawsInventoryEO,String actiProcInstId,String taskDefinitionKey) {
+		String url = backUrlPhone + JumpLinkEnum.TO_DO_CENTER_PHONE.getLink();
+		if(!DesignComplianceFlowNodeKeyEnum.TGSC.getValue().equals(taskDefinitionKey)){
+			url = backUrlPhone + JumpLinkEnum.TASK_HANDING_PHONE.getLink() + "?actiProcInstId=" + actiProcInstId + "&projectTaskInventoryId=" + projectLawsInventoryEO.getId()
+					+ "&projectLibraryId=" + projectLawsInventoryEO.getProjectLibraryId() + "&TaskKey=" + taskDefinitionKey
+					+ "&TaskKeyName=" + DesignComplianceFlowNodeKeyEnum.getTextByValue(taskDefinitionKey, CutEnum.CN.getValue())
+					+ "&isDisplay=false&flowType=2&Sponsor=regulationOwnerName&personLiable=designDutyIdName&typeOfDeliverables=designDeliverableTypeName&deliverableTemplate=designDeliverableTemplate&DueDate=designDueDate&remarks=designRemark";
+		}
+		return URLUtil.encode(url);
+	}
+
+	private String handlePhoneVerifyLink(ProjectLawsInventoryEO projectLawsInventoryEO,String actiProcInstId,String taskDefinitionKey) {
+		String url = backUrlPhone + JumpLinkEnum.TO_DO_CENTER_PHONE.getLink();
+		if (!VerifyComplianceFlowNodeKeyEnum.TGSC.getValue().equals(taskDefinitionKey)) {
+			url = backUrlPhone + JumpLinkEnum.TASK_HANDING_PHONE.getLink() + "?actiProcInstId="+actiProcInstId+"&projectTaskInventoryId="+projectLawsInventoryEO.getId()
+					+"&projectLibraryId="+projectLawsInventoryEO.getProjectLibraryId()+"&TaskKey="+taskDefinitionKey
+					+"&TaskKeyName="+ VerifyComplianceFlowNodeKeyEnum.getTextByValue(taskDefinitionKey,CutEnum.CN.getValue())
+					+"&isDisplay=false&flowType=4&Sponsor=regulationOwnerName&personLiable=verifyDutyIdName&typeOfDeliverables=verifyDeliverableTypeName&deliverableTemplate=verifyDeliverableTemplate&DueDate=verifyDueDate&remarks=verifyRemark";
+		}
+		return URLUtil.encode(url);
+	}
+
 	private String handlePhoneDesignLink(ProjectLawsInventoryEO projectLawsInventoryEO) {
 		String url = backUrlPhone + JumpLinkEnum.TO_DO_CENTER_PHONE.getLink();
 		QueryWrapper<ProcessInfoDetailEO> processInfoDetailEOQueryWrapper = new QueryWrapper<>();
@@ -3622,12 +3644,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 				//处理手机端飞书消息跳转
 				String flowType = jsonObject.getString("flowType");
+				String actiProcInstId = jsonObject.getString("actiProcInstId");
+				String taskDefinitionKey = jsonObject.getString("taskDefinitionKey");
 				if(StringUtils.isNotEmpty(flowType)){
 					if("Design".equals(flowType)){
-						String hrefFeishu_CN_P = this.handlePhoneDesignLink(projectLawsInventoryEO);
+						String hrefFeishu_CN_P = this.handlePhoneDesignLink(projectLawsInventoryEO,actiProcInstId,taskDefinitionKey);
 						prarams.put("hrefFeishu_CN_P", hrefFeishu_CN_P);
 					}else if("Verify".equals(flowType)){
-						String hrefFeishu_CN_P = this.handlePhoneVerifyLink(projectLawsInventoryEO);
+						String hrefFeishu_CN_P = this.handlePhoneVerifyLink(projectLawsInventoryEO,actiProcInstId,taskDefinitionKey);
 						prarams.put("hrefFeishu_CN_P", hrefFeishu_CN_P);
 					}
 				}
@@ -13041,6 +13065,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 							params.put("id", projectLawsInventoryId);
 
 							JSONObject sendMsgJson = new JSONObject();
+							sendMsgJson.put("actiProcInstId",pidEo.getActiProcInstId());
+							sendMsgJson.put("taskDefinitionKey", taskDefinitionKey);
 							sendMsgJson.put("requestSource", RequestSourceEnum.WORK_FLOW.getValue());
 							sendMsgJson.put("operatorType", OperatorTypeEnum.SEND_MSG.getValue());
 							sendMsgJson.put("templateId", templateId);
@@ -13152,6 +13178,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 							params.put("id", projectLawsInventoryId);
 
 							JSONObject sendMsgJson = new JSONObject();
+							sendMsgJson.put("actiProcInstId",pidEo.getActiProcInstId());
+							sendMsgJson.put("taskDefinitionKey", taskDefinitionKey);
 							sendMsgJson.put("requestSource", RequestSourceEnum.WORK_FLOW.getValue());
 							sendMsgJson.put("operatorType", OperatorTypeEnum.SEND_MSG.getValue());
 							sendMsgJson.put("templateId", templateId);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java
index 8d06fe50c..4c7146efc 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java
@@ -13,6 +13,7 @@ public enum DesignComplianceFlowNodeKeyEnum {
     ZRRTJJFW("符合性确认","Compliance Confirmation","zrrtjjfw"),// "责任人提交交付物"
     DEZRRTJJFW("符合性确认","Compliance Confirmation","dezrrtjjfw"),// 第二责任人提交交付物
     FGGCSSH("符合性审查","Compliance Review","fggcssh"), // 法规工程师审核
+    TGSC("通过审查","","tgsc"), // 通过审查，发消息用
 
     // 修改交付物流程
     BCTJ_ZRRBCTJFQ("补充提交","Supplementary Submission","zrrbctjfq"), // 责任人补充提交发起
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java
index 26a44749a..5994bb36d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java
@@ -13,6 +13,7 @@ public enum VerifyComplianceFlowNodeKeyEnum {
     ZRRTJJFW("符合性确认","Compliance Confirm","zrrtjjfw"),// "责任人提交交付物"
     DEZRRTJJFW("符合性确认","Compliance Confirm","dezrrtjjfw"),// 第二责任人提交交付物
     FGGCSSH("符合性审查","Compliance Review","fggcssh"), // 法规工程师审核
+    TGSC("通过审查","","tgsc"), // 通过审查，发消息用
 
     // 修改交付物流程
     BCTJ_ZRRBCTJFQ("补充提交","Supplementary Submission","zrrbctjfq"), // 责任人补充提交发起