From 2396a365e156ad6b951a444d3978dcb1b24479a0 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 21 Dec 2023 16:11:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86-=E5=82=AC?= =?UTF-8?q?=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOController.java | 6 ++ .../mapper/xml/ParamsManifestEOMapper.xml | 1 + .../IParamsCollectManifestEOService.java | 2 + .../ParamsCollectManifestEOServiceImpl.java | 100 ++++++++++++++++++ .../impl/ParamsManifestEOServiceImpl.java | 3 + 5 files changed, 112 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java index 531e4aa80..d8f161445 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java @@ -729,4 +729,10 @@ public class ParamsCollectManifestEOController extends JeroController queryDutyTerritory(String id); Result queryDutyTerritoryHistory(String id); + + void urge(String ids,String projectId,String title,String inventoryName,String url); } 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 dcaf163db..0a127d124 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 @@ -8091,4 +8091,104 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.in(ParamsCollectManifestEO::getId,Arrays.asList(ids.split(","))); + List paramsCollectManifestEOList = this.list(wrapper); + if(ObjectUtils.isEmpty(paramsCollectManifestEOList)){ + return; + } + //催办状态为待工程接口人处理（给工程接口人发消息） + List paramsCollectManifestEOSdtList = paramsCollectManifestEOList.stream() + .filter(e -> CollectManifestStateEnum.WAIT_SDT.getValue().equals(e.getState())).collect(Collectors.toList()); + + //催办状态为待填写的（给填写人发消息） + List paramsCollectManifestEOFillList = paramsCollectManifestEOList.stream() + .filter(e -> CollectManifestStateEnum.WAIT_FILL.getValue().equals(e.getState())).collect(Collectors.toList()); + + List userNameList = new ArrayList<>(); + + //给工程接口人发消息 + if(ObjectUtils.isNotEmpty(paramsCollectManifestEOSdtList)){ + List sdtList = paramsCollectManifestEOSdtList.stream() + .filter(e -> StringUtils.isNotBlank(e.getSdt())).map(ParamsCollectManifestEO::getSdt).distinct().collect(Collectors.toList()); + if(ObjectUtils.isNotEmpty(sdtList)){ + userNameList.addAll(sdtList); + } + } + //给填写人发消息 + if(ObjectUtils.isNotEmpty(paramsCollectManifestEOFillList)){ + List dreList = paramsCollectManifestEOFillList.stream() + .filter(e -> StringUtils.isNotBlank(e.getDre())).map(ParamsCollectManifestEO::getDre).distinct().collect(Collectors.toList()); + if(ObjectUtils.isNotEmpty(dreList)){ + userNameList.addAll(dreList); + } + } + + //最新的截止时间 + List deadlineList = paramsCollectManifestEOList.stream() + .filter(e -> ObjectUtils.isEmpty(e.getDeadline())).map(ParamsCollectManifestEO::getDeadline).collect(Collectors.toList()); + Date deadline = null; + if(ObjectUtils.isNotEmpty(deadlineList)){ + Collections.sort(deadlineList, new Comparator() { + @Override + public int compare(Date o1, Date o2) { + return o2.compareTo(o1); + } + }); + deadline = deadlineList.get(0); + } + + if(ObjectUtils.isEmpty(userNameList)){ + return; + } + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(SysUser::getUsername,userNameList); + List sysUserList = sysUserService.list(); + List userIdList = sysUserList.stream().map(SysUser::getId).collect(Collectors.toList()); + + try { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String contentInfoFeiCn = "您好，您参与填写的" + inventoryNameCn + "，请及时查看处理，谢谢！"; + String contentInfoFeiEn = "Hello! Please fill in the " + inventoryNameEn + " in a timely manner. Thank you!"; + + //飞书消息（模板-20230410） + Map params = new HashMap<>(); + params.put("contentInfoFeiCn",contentInfoFeiCn); + params.put("contentInfoFeiEn",contentInfoFeiEn); + params.put("userIdList",userIdList); + params.put("projectCn",projectNameCn); + params.put("projectEn",projectNameEn); + params.put("initiatorCn",currentUser.getUsername()); + params.put("initiatorEn",currentUser.getUsername()); + params.put("dueDate",sdf.format(deadline)); +// params.put("back_url_cn",hrefFeishuCn); +// params.put("back_url_en",hrefFeishuEn); +// params.put("back_url_phone",backUrlPhone + "/phoneTaskData?activeTab=parametercollection"); + feishuService.sendMessageHomoParameterCollection(TemplateInfoEnum2.HOMO_PARAMETER_COLLECTION_GREEN.getValue(),params,null); + } catch (Exception e) { + log.error("飞书消息推送失败"); + } + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index 2eaa16b45..b464274d1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -1155,6 +1155,9 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl