diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java index dd55752ed..09779899f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java @@ -87,6 +87,8 @@ public class AuthDummyInventoryBaseEOServiceImpl extends ServiceImpl params = new HashMap<>(); params.put("contentInfoFeiCn",contentInfoFeiCn + "\n" + contentCn); params.put("contentInfoFeiEn",contentLogFeishuTemp + "\n" + contentEn); params.put("userIdList",userIdList); params.put("back_url",href); + params.put("back_url_phone",backUrlPhone); params.put("titleCn", TemplateInfoEnum2.SUBSCRIPTION_INFORM.getNameCn()); params.put("titleEn",TemplateInfoEnum2.SUBSCRIPTION_INFORM.getNameEn()); iFeishuService.sendMessageSubscriptionNotification(TemplateInfoEnum2.SUBSCRIPTION_INFORM.getValue(),params); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 6c1dfd3c7..79e35447f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -175,6 +175,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl params = new HashMap<>(); params.put("contentInfoFeiCn",contentInfoFeiCn); @@ -2313,6 +2318,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl params = new HashMap<>(); params.put("contentInfoFeiCn",contentInfoFeiCn); @@ -2335,6 +2343,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl params = new HashMap<>(); params.put("contentInfoFeiCn",contentInfoFeiCn); @@ -2663,6 +2677,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl params = new HashMap<>(); @@ -6467,6 +6488,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl params = new HashMap<>(); @@ -6505,6 +6530,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl params = new HashMap<>(); @@ -6544,6 +6573,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl params = new HashMap<>(); params.put("contentInfoFeiCn",contentInfoFeiCn); @@ -7165,6 +7206,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl> mapList = bussDocumentLibraryEOMapper.selectMapsAll(documentIds); List serialNumberList = new ArrayList<>(); List urlList = new ArrayList<>(); + List urlPhonelList = new ArrayList<>(); List hrefList = new ArrayList<>(); for (Map map : mapList) { serialNumberList.add(StringUtils.valueOf(map.get("serial_number"))); @@ -5637,11 +5643,15 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl" + map.get("serial_number") + ""; + + String urlPhone = backUrlPhone + "/phoneDocumentDetails?id=" + map.get("id"); urlList.add(url); hrefList.add(href); + urlPhonelList.add(urlPhone); } @@ -5671,7 +5681,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl list = new ArrayList<>(); mapList.stream().forEach(e->{ @@ -5695,6 +5706,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl params = new HashMap<>(); params.put("contentInfoFeiCn",contentInfoFeiCn + "\n" + contentCn); params.put("contentInfoFeiEn",contentLogFeishuTemp + "\n" + contentEn); params.put("userIdList",userIdList); params.put("back_url",href); + params.put("back_url_phone",backUrlPhone); params.put("titleCn",TemplateInfoEnum2.SUBSCRIPTION_INFORM.getNameCn()); params.put("titleEn",TemplateInfoEnum2.SUBSCRIPTION_INFORM.getNameEn()); iFeishuService.sendMessageSubscriptionNotification(TemplateInfoEnum2.SUBSCRIPTION_INFORM.getValue(),params); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java index 35b9a561d..96d366fde 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java @@ -1445,6 +1445,7 @@ public class FeishuServiceImpl implements IFeishuService { String contentCn = (String) params.get("contentInfoFeiCn"); String contentEn = (String) params.get("contentInfoFeiEn"); String back_url = (String) params.get("back_url"); + String back_url_phone = (String) params.get("back_url_phone"); String titleCn = (String) params.get("titleCn"); String titleEn = (String) params.get("titleEn"); try { @@ -1460,6 +1461,7 @@ public class FeishuServiceImpl implements IFeishuService { templateVariableMap.put("contentInfoFeiEn",contentEn); templateVariableMap.put("view_url_cn",back_url); templateVariableMap.put("view_url_en",back_url); + templateVariableMap.put("view_url_Phone",back_url_phone); templateVariableMap.put("titleCn",titleCn); templateVariableMap.put("titleEn",titleEn); @@ -1487,6 +1489,7 @@ public class FeishuServiceImpl implements IFeishuService { String contentCn = (String) params.get("contentInfoFeiCn"); String contentEn = (String) params.get("contentInfoFeiEn"); String back_url = (String) params.get("back_url"); + String back_url_phone = (String) params.get("back_url_phone"); String titleCn = (String) params.get("titleCn"); String titleEn = (String) params.get("titleEn"); String regulationNo = (String) params.get("regulationNo"); @@ -1505,6 +1508,7 @@ public class FeishuServiceImpl implements IFeishuService { templateVariableMap.put("contentInfoFeiEn",contentEn); templateVariableMap.put("view_url_cn",back_url); templateVariableMap.put("view_url_en",back_url); + templateVariableMap.put("back_url_phone",back_url_phone); templateVariableMap.put("titleCn",titleCn); templateVariableMap.put("titleEn",titleEn); templateVariableMap.put("regulationNo",regulationNo); @@ -1535,6 +1539,7 @@ public class FeishuServiceImpl implements IFeishuService { String contentCn = (String) params.get("contentInfoFeiCn"); String contentEn = (String) params.get("contentInfoFeiEn"); String back_url = (String) params.get("back_url"); + String back_url_Phone = (String) params.get("back_url_Phone"); String titleCn = (String) params.get("titleCn"); String titleEn = (String) params.get("titleEn"); String regulationNo = (String) params.get("regulationNo"); @@ -1555,7 +1560,8 @@ public class FeishuServiceImpl implements IFeishuService { templateVariableMap.put("contentInfoFeiCn",contentCn); templateVariableMap.put("contentInfoFeiEn",contentEn); templateVariableMap.put("view_url_cn",back_url); - templateVariableMap.put("view_url_en",back_url); + templateVariableMap.put("view_url_en",back_url);; + templateVariableMap.put("back_url_Phone",back_url_Phone); templateVariableMap.put("titleCn",titleCn); templateVariableMap.put("titleEn",titleEn); templateVariableMap.put("regulationNo",regulationNo); @@ -1590,6 +1596,7 @@ public class FeishuServiceImpl implements IFeishuService { String contentEn = (String) params.get("contentInfoFeiEn"); String back_url_cn = (String) params.get("back_url_cn"); String back_url_en = (String) params.get("back_url_en"); + String back_url_Phone = (String) params.get("back_url_phone"); String projectCn = (String) params.get("projectCn"); String projectEn = (String) params.get("projectEn"); String initiatorCn = (String) params.get("initiatorCn"); @@ -1608,6 +1615,7 @@ public class FeishuServiceImpl implements IFeishuService { templateVariableMap.put("contentInfoFeiEn",contentEn); templateVariableMap.put("view_url_cn",back_url_cn); templateVariableMap.put("view_url_en",back_url_en); + templateVariableMap.put("back_url_Phone",back_url_Phone); templateVariableMap.put("projectCn"," " + projectCn); templateVariableMap.put("projectEn"," " + projectEn); templateVariableMap.put("initiatorCn"," " + initiatorCn); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java index 628e729e6..c966233e6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java @@ -84,6 +84,9 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl userList,String userId, List list, String templateId, - Date endTime) { + Date endTime, + String taskDefinitionKey){ String thirdId = this.sysUserService.getUserThirdIdByUserId(userList,userId); if(StringUtils.isNotEmpty(thirdId)){ @@ -699,7 +712,9 @@ public class CertificationInventoryJob implements Job { String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN"); String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN"); String hrefFeishu_CN_P = (String) hrefFeishuMap.get("hrefFeishu_CN_P"); - + if(StringUtils.isNotEmpty(taskDefinitionKey)){ + hrefFeishu_CN_P = this.projectCertificationInventoryEOService.handlePhoneLink(projectLibraryBase.getId(),PRN_CN,taskDefinitionKey); + } Map standNameAndItemName = this.projectCertificationInventoryEOService.getStandNameAndItemName(list); String standName = (String) standNameAndItemName.get("standName"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java index 03b944d72..594ad8c17 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java @@ -147,6 +147,7 @@ public class TaskAffirmJob implements Job { Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P")); String regulationOwnerId = designDutyDataList.get(0).getRegulationOwnerId(); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); @@ -187,6 +188,7 @@ public class TaskAffirmJob implements Job { Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P")); String regulationOwnerId = designDutyDataList.get(0).getRegulationOwnerId(); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); @@ -227,6 +229,7 @@ public class TaskAffirmJob implements Job { Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P")); String regulationOwnerId = overdueList.get(0).getRegulationOwnerId(); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); @@ -282,6 +285,7 @@ public class TaskAffirmJob implements Job { Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P")); String regulationOwnerId = threeDaysList.get(0).getRegulationOwnerId(); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); @@ -322,6 +326,7 @@ public class TaskAffirmJob implements Job { Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P")); String regulationOwnerId = currentDaysList.get(0).getRegulationOwnerId(); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); @@ -362,6 +367,7 @@ public class TaskAffirmJob implements Job { Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P")); String regulationOwnerId = overdueList.get(0).getRegulationOwnerId(); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java index 7c2db9b57..868ced1ca 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java @@ -136,6 +136,7 @@ public class VerifyComplianceJob implements Job { Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P")); String regulationOwnerId = fourteenDaysList.get(0).getRegulationOwnerId(); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); @@ -175,6 +176,7 @@ public class VerifyComplianceJob implements Job { Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P")); String regulationOwnerId = sevenDaysList.get(0).getRegulationOwnerId(); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); @@ -214,6 +216,7 @@ public class VerifyComplianceJob implements Job { Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P")); String regulationOwnerId = currentDaysList.get(0).getRegulationOwnerId(); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); @@ -252,6 +255,7 @@ public class VerifyComplianceJob implements Job { Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P")); String regulationOwnerId = overdueList.get(0).getRegulationOwnerId(); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java index 8eecd0f8a..348b92929 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java @@ -136,6 +136,7 @@ public class designComplianceJob implements Job { Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P")); String regulationOwnerId = fourteenDaysList.get(0).getRegulationOwnerId(); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); @@ -175,6 +176,7 @@ public class designComplianceJob implements Job { Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P")); String regulationOwnerId = sevenDaysList.get(0).getRegulationOwnerId(); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); @@ -214,6 +216,7 @@ public class designComplianceJob implements Job { Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P")); String regulationOwnerId = currentDaysList.get(0).getRegulationOwnerId(); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); @@ -252,6 +255,7 @@ public class designComplianceJob implements Job { Map hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P")); String regulationOwnerId = overdueList.get(0).getRegulationOwnerId(); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java index 2a53d7390..4c99ee3a5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java @@ -226,7 +226,7 @@ public interface IProjectCertificationInventoryEOService extends IService projectCertificationInventoryEOS, String templeteId, List userIdList, List userInfoList, Date endTime); + void sendMessageByTemplateId(List projectCertificationInventoryEOS, String templeteId, List userIdList, List userInfoList, Date endTimeString, String taskDefinitionKey); /** * 数据唯一校验。 @@ -249,7 +249,7 @@ public interface IProjectCertificationInventoryEOService extends IService addConfigByIds(JSONObject json); - + String handlePhoneLink(String id, String prn_cn, String key); void certificationInventoryEOListSortByEndTimeAsc(List projectCertificationInventoryEOList); void certificationInventoryEOListSortByInventoryVerifyEndTimeAsc(List projectCertificationInventoryEOList); void certificationInventoryEOListSortByTaskConfirmEndTimeAsc(List projectCertificationInventoryEOList); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index a87189caf..2063aa759 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -232,7 +232,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl userIdList, List userInfoList, - Date endTime){ + Date endTime, + String taskDefinitionKey){ LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectCertificationInventoryEOS.get(0).getProjectLibraryId()); @@ -700,6 +701,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl standNameAndItemName = this.projectCertificationInventoryEOService.getStandNameAndItemName(projectCertificationInventoryEOS); String standName = (String) standNameAndItemName.get("standName"); @@ -1863,7 +1867,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getCertificationInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN); String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN"); String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN"); - String hrefFeishu_CN_P = (String) hrefFeishuMap.get("hrefFeishu_CN_P"); + String hrefFeishu_CN_P = this.handlePhoneLink(projectLibraryBase.getId(),PRN_CN,CertificationFlowNodeEnum.TASK_HANDLING.getKey()); Map standNameAndItemName = this.projectCertificationInventoryEOService.getStandNameAndItemName(projectCertificationInventoryEOList); String standName = (String) standNameAndItemName.get("standName"); @@ -2495,7 +2501,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getCertificationInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN); String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN"); String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN"); - String hrefFeishu_CN_P = (String) hrefFeishuMap.get("hrefFeishu_CN_P"); + //飞书手机跳转链接 + String hrefFeishu_CN_P = this.handlePhoneLink(projectLibraryBase.getId(),PRN_CN,CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey()); Map> certifycationInventoryListByDutyPersonMap = projectCertificationInventoryEOList.stream().collect(Collectors.groupingBy(ProjectCertificationInventoryEO::getDutyPerson)); try { @@ -2578,6 +2585,14 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); + 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")); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); @@ -870,6 +872,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN_P", (String) hrefFeishuMap.get("hrefFeishu_CN_P")); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); params.put("Initiator", regulationOwnerUserName); @@ -906,6 +909,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN_P", (String) hrefFeishuMap.get("hrefFeishu_CN_P")); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); params.put("Initiator", regulationOwnerUserName); @@ -951,6 +955,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P")); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); params.put("Initiator", regulationOwnerUserName); @@ -995,6 +1000,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P")); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); params.put("Initiator", regulationOwnerUserName); @@ -1041,7 +1047,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); - + //处理手机端飞书消息跳转 + String hrefFeishu_CN_P = this.handlePhoneDesignLink(projectLawsInventoryEO); + params.put("hrefFeishu_CN_P", hrefFeishu_CN_P); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); params.put("Initiator", regulationOwnerUserName); @@ -1081,6 +1089,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); + //处理手机端飞书消息跳转 + String hrefFeishu_CN_P = this.handlePhoneVerifyLink(projectLawsInventoryEO); + params.put("hrefFeishu_CN_P", hrefFeishu_CN_P); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); @@ -1093,6 +1104,38 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl processInfoDetailEOQueryWrapper = new QueryWrapper<>(); + processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId, projectLawsInventoryEO.getId()); + processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType, FlowTypeEnum.SJFHXSHLC.getValue()); + List processInfoDetailEOS = this.processInfoDetailEOService.list(processInfoDetailEOQueryWrapper); + if (CollectionUtils.isNotEmpty(processInfoDetailEOS)) { + String designPId = processInfoDetailEOS.get(0).getActiProcInstId(); + url = backUrlPhone + JumpLinkEnum.TASK_HANDING_PHONE.getLink() + "?actiProcInstId=" + designPId + "&projectTaskInventoryId=" + projectLawsInventoryEO.getId() + + "&projectLibraryId=" + projectLawsInventoryEO.getProjectLibraryId() + "&TaskKey=" + processInfoDetailEOS.get(0).getTaskDefinitionKey() + + "&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; + } + + private String handlePhoneVerifyLink(ProjectLawsInventoryEO projectLawsInventoryEO) { + String url = backUrlPhone + JumpLinkEnum.TO_DO_CENTER_PHONE.getLink(); + QueryWrapper processInfoDetailEOQueryWrapper = new QueryWrapper<>(); + processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId, projectLawsInventoryEO.getId()); + processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType, FlowTypeEnum.YZFHXSCLC.getValue()); + List processInfoDetailEOS = this.processInfoDetailEOService.list(processInfoDetailEOQueryWrapper); + if (CollectionUtils.isNotEmpty(processInfoDetailEOS)) { + String verifyPId = processInfoDetailEOS.get(0).getActiProcInstId(); + url = backUrlPhone + JumpLinkEnum.TASK_HANDING_PHONE.getLink() + "?actiProcInstId="+verifyPId+"&projectTaskInventoryId="+projectLawsInventoryEO.getId() + +"&projectLibraryId="+projectLawsInventoryEO.getProjectLibraryId()+"&TaskKey="+processInfoDetailEOS.get(0).getTaskDefinitionKey() + +"&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; + } + private void setProjectLawsInventoryPermission(String userId, String projectId, String lawsInventoryId, Date now, List adds, String belong) { QueryWrapper del = new QueryWrapper<>(); del.eq("project_id", projectId) @@ -3574,6 +3617,18 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); @@ -10643,6 +10698,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P")); String regulationOwnerId = lawsInventoryEOList.get(0).getRegulationOwnerId(); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); @@ -10710,6 +10766,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryId, todoCenterParams); params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P")); String regulationOwnerId = lawsInventoryEOList.get(0).getRegulationOwnerId(); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); @@ -10776,6 +10833,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P")); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); @@ -10900,6 +10958,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P")); String regulationOwnerId = lawsInventoryEOList.get(0).getRegulationOwnerId(); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); @@ -10967,6 +11026,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryId, todoCenterParams); params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P")); String regulationOwnerId = lawsInventoryEOList.get(0).getRegulationOwnerId(); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); @@ -11033,6 +11093,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P")); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); @@ -12092,7 +12153,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl userIdListNew = userIdList; mapList.stream().forEach(e->{ if(s.contains((String)e.get("id"))){ @@ -599,6 +601,7 @@ public class LawsWarnService { params.put("contentInfoFeiEn",contentInfoFei); params.put("userIdList",userIdListNew); params.put("back_url",encode); + params.put("back_url_phone",backUrlPhone); params.put("titleCn", " "+documentTitleCn); params.put("titleEn"," "+documentTitleEn); params.put("regulationNo"," "+serialNumber); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/TimedTaskWarn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/TimedTaskWarn.java index b0ab1f770..8c2ab9692 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/TimedTaskWarn.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/TimedTaskWarn.java @@ -56,6 +56,8 @@ public class TimedTaskWarn implements Job { private SysUserMapper sysUserMapper; @Value(value = "${jero.backUrl}") private String backUrl; + @Value(value = "${jero.backUrlPhone}") + private String backUrlPhone; /** * 法规预警定时任务 @@ -106,6 +108,7 @@ public class TimedTaskWarn implements Job { "&serial_number=" + serialNumber + "'" + " target='_blank'>" + serialNumber + ""; //跳转文档详情 String url = backUrl + "/docManage/library/detail?id=" + id; + String urlPhone = backUrlPhone + "/phoneDocumentDetails?id=" + id; //订阅的用户 List onlCgformSubscribe = subscribeList.stream().filter(e -> e.getDocumentId().equals(bussDocumentLibraryEO.getId())).collect(Collectors.toList()); List userIdList = new ArrayList<>(); @@ -139,19 +142,19 @@ public class TimedTaskWarn implements Job { // } if(currentTime.equals(beforeTimeSixTen)){ //发送飞书消息(提前一年) - sendFeishu(sdf, bussDocumentLibraryEO, url, thirdIdList,"1",userIdList); + sendFeishu(sdf, bussDocumentLibraryEO, url, urlPhone,thirdIdList,"1",userIdList); //站内消息 sendMessage(bussDocumentLibraryEO, userIdList,"1",sdf,href); } if(currentTime.equals(beforeTimeSix)){ //发送飞书消息(提前6个月) - sendFeishu(sdf, bussDocumentLibraryEO, url, thirdIdList,"6",userIdList); + sendFeishu(sdf, bussDocumentLibraryEO, url, urlPhone,thirdIdList,"6",userIdList); //站内消息 sendMessage(bussDocumentLibraryEO, userIdList,"6",sdf,href); } if(currentTime.equals(xin1Che1Xing2Shi2Shi1Ri4Qi1Str)){ //发送飞书消息(当天) - sendFeishu(sdf, bussDocumentLibraryEO, url, thirdIdList,"0",userIdList); + sendFeishu(sdf, bussDocumentLibraryEO, url, urlPhone,thirdIdList,"0",userIdList); //站内消息 sendMessage(bussDocumentLibraryEO, userIdList,"0",sdf,href); } @@ -178,19 +181,19 @@ public class TimedTaskWarn implements Job { } if(currentTime.equals(beforeTimeSixTen)){ //发送飞书消息(提前一年) - sendFeishu(sdf, bussDocumentLibraryEO, url, thirdIdList,"1",userIdList); + sendFeishu(sdf, bussDocumentLibraryEO, url, urlPhone,thirdIdList,"1",userIdList); //站内消息 sendMessage(bussDocumentLibraryEO, userIdList,"1",sdf,href); } if(currentTime.equals(beforeTimeSix)){ //发送飞书消息(提前6个月) - sendFeishu(sdf, bussDocumentLibraryEO, url, thirdIdList,"6",userIdList); + sendFeishu(sdf, bussDocumentLibraryEO, url, urlPhone,thirdIdList,"6",userIdList); //站内消息 sendMessage(bussDocumentLibraryEO, userIdList,"6",sdf,href); } if(currentTime.equals(implementTimeStr)){ //发送飞书消息(当天) - sendFeishu(sdf, bussDocumentLibraryEO, url, thirdIdList,"0",userIdList); + sendFeishu(sdf, bussDocumentLibraryEO, url, urlPhone,thirdIdList,"0",userIdList); //站内消息 sendMessage(bussDocumentLibraryEO, userIdList,"0",sdf,href); } @@ -201,6 +204,7 @@ public class TimedTaskWarn implements Job { private void sendFeishu(SimpleDateFormat sdf, BussDocumentLibraryEO bussDocumentLibraryEO, String url, + String urlPhone, List thirdIdList, String flag, List userIdList) { @@ -241,6 +245,7 @@ public class TimedTaskWarn implements Job { params.put("contentInfoFeiEn",contentEn); params.put("userIdList",userIdList); params.put("back_url",url); + params.put("back_url_phone",urlPhone); params.put("titleCn", " "+ bussDocumentLibraryEO.getTitle()); params.put("titleEn", " "+ bussDocumentLibraryEO.getTitleEn()); params.put("regulationNo", " "+ bussDocumentLibraryEO.getSerialNumber());