WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改手机端发送消息

Browse Source
This commit is contained in:
高嵩
2023-07-13 18:18:09 +08:00
parent 0f2aef50a1
commit 80ebff1c76
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java
+1 -1
View File
@@ -1622,7 +1622,7 @@ public class FeishuServiceImpl implements IFeishuService {
if(StringUtils.isNotBlank(flag)){
templateVariableMap.put("initiatorEn"," " + initiatorEn);
}else{
templateVariableMap.put("initiatorEn"," " + initiatorCn);
templateVariableMap.put("initiatorCn"," " + initiatorCn);
}
templateVariableMap.put("dueDate"," " + dueDate);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+1 -1
View File
@@ -2590,7 +2590,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
String hrefFeishu_CN_P = backUrlPhone
+ JumpLinkEnum.PRE_TASK_HANDING_PHONE.getLink() + "?isDisplay=false&projectLibraryId=" + id
+ "&projectName=" + prn_cn + "&taskDefinitionKey=" + key;
return hrefFeishu_CN_P;
return URLUtil.encode(hrefFeishu_CN_P);
}
/**
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+4 -2
View File
@@ -1109,6 +1109,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
QueryWrapper<ProcessInfoDetailEO> processInfoDetailEOQueryWrapper = new QueryWrapper<>();
processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId, projectLawsInventoryEO.getId());
processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType, FlowTypeEnum.SJFHXSHLC.getValue());
processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getStatus, TaskStatusEnum.NOT_DONE.getValue());
List<ProcessInfoDetailEO> processInfoDetailEOS = this.processInfoDetailEOService.list(processInfoDetailEOQueryWrapper);
if (CollectionUtils.isNotEmpty(processInfoDetailEOS)) {
String designPId = processInfoDetailEOS.get(0).getActiProcInstId();
@@ -1117,7 +1118,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
+ "&TaskKeyName=" + DesignComplianceFlowNodeKeyEnum.getTextByValue(processInfoDetailEOS.get(0).getTaskDefinitionKey(), CutEnum.CN.getValue())
+ "&isDisplay=false&flowType=2&Sponsor=regulationOwnerName&personLiable=designDutyIdName&typeOfDeliverables=designDeliverableTypeName&deliverableTemplate=designDeliverableTemplate&DueDate=designDueDate&remarks=designRemark";
}
return url;
return URLUtil.encode(url);
}
private String handlePhoneVerifyLink(ProjectLawsInventoryEO projectLawsInventoryEO) {
@@ -1125,6 +1126,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
QueryWrapper<ProcessInfoDetailEO> processInfoDetailEOQueryWrapper = new QueryWrapper<>();
processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId, projectLawsInventoryEO.getId());
processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType, FlowTypeEnum.YZFHXSCLC.getValue());
processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getStatus, TaskStatusEnum.NOT_DONE.getValue());
List<ProcessInfoDetailEO> processInfoDetailEOS = this.processInfoDetailEOService.list(processInfoDetailEOQueryWrapper);
if (CollectionUtils.isNotEmpty(processInfoDetailEOS)) {
String verifyPId = processInfoDetailEOS.get(0).getActiProcInstId();
@@ -1133,7 +1135,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
+"&TaskKeyName="+ VerifyComplianceFlowNodeKeyEnum.getTextByValue(processInfoDetailEOS.get(0).getTaskDefinitionKey(),CutEnum.CN.getValue())
+"&isDisplay=false&flowType=4&Sponsor=regulationOwnerName&personLiable=verifyDutyIdName&typeOfDeliverables=verifyDeliverableTypeName&deliverableTemplate=verifyDeliverableTemplate&DueDate=verifyDueDate&remarks=verifyRemark";
}
return url;
return URLUtil.encode(url);
}
private void setProjectLawsInventoryPermission(String userId, String projectId, String lawsInventoryId, Date now, List<ProjectUserPermission> adds, String belong) {