From 8441a565d7f5473ef8b9cca82d319d1a0a3d837c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Thu, 27 Jul 2023 19:59:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E4=BA=BA=E5=91=98=E5=8F=98=E6=9B=B4=E5=8F=91=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java    | 48 +++++++++++++++++--
 1 file changed, 44 insertions(+), 4 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 ea81a3930..ea8a77fa1 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
@@ -805,7 +805,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
 					params.put("hrefFeishu_CN", hrefFeishuMap.get("hrefFeishu_CN"));
 					params.put("hrefFeishu_EN", hrefFeishuMap.get("hrefFeishu_EN"));
-					params.put("hrefFeishu_CN_P", hrefFeishuMap.get("hrefFeishu_CN_P"));
+					params.put("hrefFeishu_CN_P", (String) hrefFeishuMap.get("hrefFeishu_CN_P"));
 
 					List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
 					String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
@@ -817,6 +817,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 							||StringUtils.equals(projectLawsInventoryOld.getDesignFlowStatus(), ComplianceFlowStatusEnum.INCONFORMITY.getValue())){
 						params.put("flowTypeCn","设计符合性流程");
 						params.put("flowTypeEn","Design Compliance Process");
+						//处理手机端飞书消息跳转
+						String hrefFeishu_CN_P = this.handlePhoneDesignLink(projectLawsInventoryEO);
+						params.put("hrefFeishu_CN_P", hrefFeishu_CN_P);
 						this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(), params);
 					}else if(StringUtils.equals(projectLawsInventoryOld.getVerifyFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
 							||StringUtils.equals(projectLawsInventoryOld.getVerifyFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
@@ -824,6 +827,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 							||StringUtils.equals(projectLawsInventoryOld.getVerifyFlowStatus(), ComplianceFlowStatusEnum.INCONFORMITY.getValue())){
 						params.put("flowTypeCn","验证符合性流程");
 						params.put("flowTypeEn","Verify Compliance Process");
+						//处理手机端飞书消息跳转
+						String hrefFeishu_CN_P = this.handlePhoneVerifyLink(projectLawsInventoryEO);
+						params.put("hrefFeishu_CN_P", hrefFeishu_CN_P);
 						this.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(), params);
 					}else{
 						this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(), params);
@@ -871,6 +877,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 							||StringUtils.equals(projectLawsInventoryOld.getDesignFlowStatus(), ComplianceFlowStatusEnum.INCONFORMITY.getValue())){
 						params.put("flowTypeCn","设计符合性流程");
 						params.put("flowTypeEn","Design Compliance Process");
+						//处理手机端飞书消息跳转
+						String hrefFeishu_CN_P = this.handlePhoneDesignLink(projectLawsInventoryEO);
+						params.put("hrefFeishu_CN_P", hrefFeishu_CN_P);
 						this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(), params);
 					}else{
 						this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(), params);
@@ -917,6 +926,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 							||StringUtils.equals(projectLawsInventoryOld.getVerifyFlowStatus(), ComplianceFlowStatusEnum.INCONFORMITY.getValue())){
 						params.put("flowTypeCn","验证符合性流程");
 						params.put("flowTypeEn","Verify Compliance Process");
+						//处理手机端飞书消息跳转
+						String hrefFeishu_CN_P = this.handlePhoneVerifyLink(projectLawsInventoryEO);
+						params.put("hrefFeishu_CN_P", hrefFeishu_CN_P);
 						this.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(), params);
 					}else{
 						this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(), params);
@@ -965,7 +977,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
 					String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
 					params.put("Initiator", regulationOwnerUserName);
-					if(StringUtils.equals(projectLawsInventoryOld.getVerifyFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())){
+					if(StringUtils.equals(projectLawsInventoryOld.getDesignFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())){
+						//处理手机端飞书消息跳转
+						String hrefFeishu_CN_P = this.handlePhoneDesignLink(projectLawsInventoryEO);
+						params.put("hrefFeishu_CN_P", hrefFeishu_CN_P);
 						this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(), params);
 					}else{
 						this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(), params);
@@ -1014,6 +1029,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
 					params.put("Initiator", regulationOwnerUserName);
 					if(StringUtils.equals(projectLawsInventoryOld.getVerifyFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())){
+						//处理手机端飞书消息跳转
+						String hrefFeishu_CN_P = this.handlePhoneVerifyLink(projectLawsInventoryEO);
+						params.put("hrefFeishu_CN_P", hrefFeishu_CN_P);
 						this.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(), params);
 					}else{
 						this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(), params);
@@ -1145,6 +1163,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						|| StringUtils.equals(projectLawsInventoryOld.getDesignFlowStatus(), ComplianceFlowStatusEnum.INCONFORMITY.getValue())) {
 					params.put("flowTypeCn", "设计符合性流程");
 					params.put("flowTypeEn", "Design Compliance Process");
+					//处理手机端飞书消息跳转
+					String hrefFeishu_CN_P = this.handlePhoneDesignLink(projectLawsInventoryEO);
+					params.put("hrefFeishu_CN_P", hrefFeishu_CN_P);
 					this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(), params);
 				} else if (StringUtils.equals(projectLawsInventoryOld.getVerifyFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
 						|| StringUtils.equals(projectLawsInventoryOld.getVerifyFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
@@ -1152,6 +1173,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						|| StringUtils.equals(projectLawsInventoryOld.getVerifyFlowStatus(), ComplianceFlowStatusEnum.INCONFORMITY.getValue())) {
 					params.put("flowTypeCn", "验证符合性流程");
 					params.put("flowTypeEn", "Verify Compliance Process");
+					//处理手机端飞书消息跳转
+					String hrefFeishu_CN_P = this.handlePhoneVerifyLink(projectLawsInventoryEO);
+					params.put("hrefFeishu_CN_P", hrefFeishu_CN_P);
 					this.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(), params);
 				} else {
 					this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(), params);
@@ -1198,6 +1222,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						|| StringUtils.equals(projectLawsInventoryOld.getDesignFlowStatus(), ComplianceFlowStatusEnum.INCONFORMITY.getValue())) {
 					params.put("flowTypeCn", "设计符合性流程");
 					params.put("flowTypeEn", "Design Compliance Process");
+					//处理手机端飞书消息跳转
+					String hrefFeishu_CN_P = this.handlePhoneDesignLink(projectLawsInventoryEO);
+					params.put("hrefFeishu_CN_P", hrefFeishu_CN_P);
 					this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(), params);
 				} else if (StringUtils.equals(projectLawsInventoryOld.getVerifyFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
 						|| StringUtils.equals(projectLawsInventoryOld.getVerifyFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
@@ -1205,6 +1232,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						|| StringUtils.equals(projectLawsInventoryOld.getVerifyFlowStatus(), ComplianceFlowStatusEnum.INCONFORMITY.getValue())) {
 					params.put("flowTypeCn", "验证符合性流程");
 					params.put("flowTypeEn", "Verify Compliance Process");
+					//处理手机端飞书消息跳转
+					String hrefFeishu_CN_P = this.handlePhoneVerifyLink(projectLawsInventoryEO);
+					params.put("hrefFeishu_CN_P", hrefFeishu_CN_P);
 					this.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(), params);
 				} else {
 					this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(), params);
@@ -1251,6 +1281,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						|| StringUtils.equals(projectLawsInventoryOld.getDesignFlowStatus(), ComplianceFlowStatusEnum.INCONFORMITY.getValue())) {
 					params.put("flowTypeCn", "设计符合性流程");
 					params.put("flowTypeEn", "Design Compliance Process");
+					//处理手机端飞书消息跳转
+					String hrefFeishu_CN_P = this.handlePhoneDesignLink(projectLawsInventoryEO);
+					params.put("hrefFeishu_CN_P", hrefFeishu_CN_P);
 					this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(), params);
 				} else if (StringUtils.equals(projectLawsInventoryOld.getVerifyFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
 						|| StringUtils.equals(projectLawsInventoryOld.getVerifyFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
@@ -1258,6 +1291,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						|| StringUtils.equals(projectLawsInventoryOld.getVerifyFlowStatus(), ComplianceFlowStatusEnum.INCONFORMITY.getValue())) {
 					params.put("flowTypeCn", "验证符合性流程");
 					params.put("flowTypeEn", "Verify Compliance Process");
+					//处理手机端飞书消息跳转
+					String hrefFeishu_CN_P = this.handlePhoneVerifyLink(projectLawsInventoryEO);
+					params.put("hrefFeishu_CN_P", hrefFeishu_CN_P);
 					this.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(), params);
 				} else {
 					this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(), params);
@@ -1303,6 +1339,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						|| StringUtils.equals(projectLawsInventoryOld.getDesignFlowStatus(), ComplianceFlowStatusEnum.INCONFORMITY.getValue())) {
 					params.put("flowTypeCn", "设计符合性流程");
 					params.put("flowTypeEn", "Design Compliance Process");
+					//处理手机端飞书消息跳转
+					String hrefFeishu_CN_P = this.handlePhoneDesignLink(projectLawsInventoryEO);
+					params.put("hrefFeishu_CN_P", hrefFeishu_CN_P);
 					this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(), params);
 				} else if (StringUtils.equals(projectLawsInventoryOld.getVerifyFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
 						|| StringUtils.equals(projectLawsInventoryOld.getVerifyFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
@@ -1310,14 +1349,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						|| StringUtils.equals(projectLawsInventoryOld.getVerifyFlowStatus(), ComplianceFlowStatusEnum.INCONFORMITY.getValue())) {
 					params.put("flowTypeCn", "验证符合性流程");
 					params.put("flowTypeEn", "Verify Compliance Process");
+					//处理手机端飞书消息跳转
+					String hrefFeishu_CN_P = this.handlePhoneVerifyLink(projectLawsInventoryEO);
+					params.put("hrefFeishu_CN_P", hrefFeishu_CN_P);
 					this.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(), params);
 				} else {
 					this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(), params);
 				}
 			}
-
 		}
-
 	}
 
 	private String handlePhoneDesignLink(ProjectLawsInventoryEO projectLawsInventoryEO,String actiProcInstId,String taskDefinitionKey) {