From 3cacb86a8b02033d44fe8fed7fd1fe97c015fadd Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 4 Nov 2022 13:39:31 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85-?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0=E5=88=97=E8=A1=A8=E4=B8=AD?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=BC=96=E8=BE=91=E5=8E=BB=E6=8E=89=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E4=BF=AE=E6=94=B9=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/TaskParameterCollection.vue | 2 +- .../projectManagement/dialog/ParameterTemplateAdd.vue | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index f3e6b97fc..cc4d87d93 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -357,7 +357,7 @@ this.areaVisible = true this.areaTitle = this.$t('editDetailList') setTimeout(() => { - this.$refs.templateRef.editData(edit) + this.$refs.templateRef.editData(edit,1) }, 50) }, handleAdd() { diff --git a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue index 6e8b589cf..088a28d55 100644 --- a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue +++ b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue @@ -79,7 +79,7 @@ - +
@@ -143,6 +143,7 @@
Date: Fri, 4 Nov 2022 13:45:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/problemKnowledgeBaseList.vue | 19 +++++++------------ .../problemKnowledgeBase/index.vue | 9 ++++++++- .../library/docDetail/index.vue | 17 ++++++++++------- .../components/problemKnowledgeBase.vue | 2 +- 4 files changed, 26 insertions(+), 21 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 35b7746c7..281dffe9e 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -100,7 +100,7 @@ {{item.targetMarket_dicText}}
- + {{item.showPermissions_dicText}}
@@ -217,22 +217,17 @@ } }, mounted() { - let serial_number = localStorage.getItem('serial_number') + let serial_number = this.$route.query.serial_number if (serial_number) { this.searchStr = serial_number - localStorage.removeItem('serial_number') } this.isTrue = true - let BaseQuery = localStorage.getItem('problemknowledgeBase') + let BaseQuery = this.$route.query.id if (BaseQuery) { - let content = JSON.parse(BaseQuery) - if (content.id) { - this.isTrue = false - this.$nextTick(() => { - this.$refs.problemKnowledgeBaseListViewRef.getData(JSON.parse(JSON.stringify(content))) - }) - } - localStorage.removeItem('problemknowledgeBase') + this.isTrue = false + this.$nextTick(() => { + this.$refs.problemKnowledgeBaseListViewRef.getData({ id: BaseQuery }) + }) } this.getList() this.replacePage() diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/index.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/index.vue index 7a4a2757f..61d4e96ee 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/index.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/index.vue @@ -29,7 +29,14 @@ }, methods: { callback(key) { - + if (key == 'Country Card') { + if (this.$route.query.serial_number || this.$route.query.id) { + this.$router.push({ + path: '/problemknowledgeBase' + }) + } + } + this.tabModel = key } } } diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue index b0de57787..bfd52bea2 100644 --- a/jero-web/src/views/documentManage/library/docDetail/index.vue +++ b/jero-web/src/views/documentManage/library/docDetail/index.vue @@ -26,11 +26,11 @@ {{$t('DocumentSplitting')}}
- - - - - + + + + +
@@ -405,9 +405,12 @@ } }) } - localStorage.setItem('serial_number',serial_number) + // localStorage.setItem('serial_number',serial_number) let newUrl = this.$router.resolve({ path: '/problemknowledgeBase', + query: { + serial_number: serial_number + } }) window.open(newUrl.href, '_blank') }, @@ -466,7 +469,7 @@ } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) window.open(url, '_blank') - }else if(fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg'){ + } else if (fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + fileQuery.id + fileSuffix) window.open(url, '_blank') } else { diff --git a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue index f22aa238b..39fe20342 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue @@ -176,7 +176,7 @@ }) }, checkedClick(item) { - localStorage.setItem('problemknowledgeBase',JSON.stringify(item)) + // localStorage.setItem('problemknowledgeBase',JSON.stringify(item)) this.$router.push({ path: '/problemknowledgeBase', query: { From 85f677ac0f74fd02f57ab70740fae1b9b58a4426 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 4 Nov 2022 13:58:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93=E5=8F=91=E5=B8=83=E6=B6=88=E6=81=AF=E5=92=8C=E9=A3=9E?= =?UTF-8?q?=E4=B9=A6-=E8=B7=B3=E8=BD=AC=E8=AF=A6=E6=83=85=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProblemKnowledgeBaseCommentEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCommentEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCommentEOServiceImpl.java index 82050c16a..d19c2d5b0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCommentEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCommentEOServiceImpl.java @@ -91,7 +91,7 @@ public class ProblemKnowledgeBaseCommentEOServiceImpl extends ServiceImpl"+ problemKnowledgeBaseEO.getTitle() + ""; String contentINfoCNNo = "您发布的问题知识库信息"+href+"有新评论,请注意查看."; From ffda1d0f8d3c79966d576cf007c5a661f59bef3d Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Fri, 4 Nov 2022 14:33:12 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E8=B7=B3=E8=BD=AC=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsTechnologyEvaluationRemindJob.java | 43 ++-- ...echnologyEvaluationFlowDetailEOMapper.java | 3 +- ...TechnologyEvaluationFlowDetailEOMapper.xml | 2 +- ...LawsTechnologyEvaluationEOServiceImpl.java | 191 +++++++++++++++--- .../feginClient/WorkFlowFeignClient.java | 5 + 5 files changed, 193 insertions(+), 51 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationRemindJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationRemindJob.java index e2cdfab4b..e63518c3f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationRemindJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationRemindJob.java @@ -19,10 +19,7 @@ import org.quartz.JobExecutionException; import org.springframework.beans.factory.annotation.Autowired; import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.GregorianCalendar; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; /** @@ -104,13 +101,18 @@ public class LawsTechnologyEvaluationRemindJob implements Job { }).map(LawsTechnologyEvaluationFlowDetailEO::getActiProcInstId).distinct().collect(Collectors.joining(",")); if(StringUtils.isNotEmpty(actiProcInstIds)){ - List userIdList = this.workFlowFeignClient.getTaskAssigneeListByPrcIds(actiProcInstIds); - if(CollectionUtils.isNotEmpty(userIdList)){ - JSONObject sendJsonObject = new JSONObject(); - sendJsonObject.put("msgType", MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_EXPIRE_REMIND_THREE_DAYS_BEFORE_MSG.getValue()); - sendJsonObject.put("lawsTechnologyEvaluationId",lawsTechnologyEvaluationEO.getId()); - sendJsonObject.put("userIdList",userIdList); - this.lawsTechnologyEvaluationEOService.workFlowSendMsg(sendJsonObject); + //List userIdList = this.workFlowFeignClient.getTaskAssigneeListByPrcIds(actiProcInstIds); + for (String actiProcInstId : actiProcInstIds.split(",")) { + Map map = this.workFlowFeignClient.getTaskInfo(actiProcInstId); + if (!map.isEmpty()) { + JSONObject sendJsonObject = new JSONObject(); + sendJsonObject.put("msgType", MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_EXPIRE_REMIND_THREE_DAYS_BEFORE_MSG.getValue()); + sendJsonObject.put("lawsTechnologyEvaluationId",lawsTechnologyEvaluationEO.getId()); + sendJsonObject.put("userId",map.get("userId")); + sendJsonObject.put("taskId",map.get("taskId")); + sendJsonObject.put("taskDefKey",map.get("taskDefKey")); + this.lawsTechnologyEvaluationEOService.workFlowSendMsg(sendJsonObject); + } } } } else if (endTime.equals(now)){ @@ -124,13 +126,18 @@ public class LawsTechnologyEvaluationRemindJob implements Job { }).map(LawsTechnologyEvaluationFlowDetailEO::getActiProcInstId).distinct().collect(Collectors.joining(",")); if(StringUtils.isNotEmpty(actiProcInstIds)){ - List userIdList = this.workFlowFeignClient.getTaskAssigneeListByPrcIds(actiProcInstIds); - if(CollectionUtils.isNotEmpty(userIdList)){ - JSONObject sendJsonObject = new JSONObject(); - sendJsonObject.put("msgType", MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_EXPIRE_REMIND_TODAY_MSG.getValue()); - sendJsonObject.put("lawsTechnologyEvaluationId",lawsTechnologyEvaluationEO.getId()); - sendJsonObject.put("userIdList",userIdList); - this.lawsTechnologyEvaluationEOService.workFlowSendMsg(sendJsonObject); + //List userIdList = this.workFlowFeignClient.getTaskAssigneeListByPrcIds(actiProcInstIds); + for (String actiProcInstId : actiProcInstIds.split(",")) { + Map map = this.workFlowFeignClient.getTaskInfo(actiProcInstId); + if (!map.isEmpty()) { + JSONObject sendJsonObject = new JSONObject(); + sendJsonObject.put("msgType", MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_EXPIRE_REMIND_TODAY_MSG.getValue()); + sendJsonObject.put("lawsTechnologyEvaluationId",lawsTechnologyEvaluationEO.getId()); + sendJsonObject.put("userId",map.get("userId")); + sendJsonObject.put("taskId",map.get("taskId")); + sendJsonObject.put("taskDefKey",map.get("taskDefKey")); + this.lawsTechnologyEvaluationEOService.workFlowSendMsg(sendJsonObject); + } } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationFlowDetailEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationFlowDetailEOMapper.java index f2c103e1f..aee4a72d2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationFlowDetailEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationFlowDetailEOMapper.java @@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface LawsTechnologyEvaluationFlowDetailEOMapper extends BaseMapper { - LawsTechnologyEvaluationFlowDetailEO queryByEvaluationId(@Param("lawsTechnologyEvaluationId") String lawsTechnologyEvaluationId); + LawsTechnologyEvaluationFlowDetailEO queryByEvaluationId(@Param("lawsTechnologyEvaluationId") String lawsTechnologyEvaluationId, + @Param("evaluator") String evaluator); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationFlowDetailEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationFlowDetailEOMapper.xml index c1fdf969b..a3c8145e4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationFlowDetailEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationFlowDetailEOMapper.xml @@ -17,7 +17,7 @@ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java index 39dfd81ee..8c0810429 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java @@ -623,17 +623,18 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl userIdList = new ArrayList<>(); - + String taskId = jsonObject.getString("taskId"); + //飞书跳转链接 + String hrefFeishu = ""; //String msgContentEN = ""; //String msgTitle = ""; String initiator = ""; String lawsTechnologyEvaluationId = jsonObject.getString("lawsTechnologyEvaluationId"); LawsTechnologyEvaluationEO lawsTechnologyEvaluationEO = queryById(lawsTechnologyEvaluationId); - //LawsTechnologyEvaluationFlowDetailEO flowDetailEO = flowDetailEOMapper.queryByEvaluationId(lawsTechnologyEvaluationId); + //String number = flowDetailEO.getPrcNum(); //String name = flowDetailEO.getPrcName(); String endTime = new SimpleDateFormat("yyyy-MM-dd").format(lawsTechnologyEvaluationEO.getEndTime()); - //英文标题 BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(lawsTechnologyEvaluationEO.getStandId()); @@ -643,7 +644,7 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, currentUserId)); - userIdList.add(jsonObject.getString("initiatorUserId")); + //userIdList.add(jsonObject.getString("initiatorUserId")); //XXX（人员账号）已提交GB 7258 的法规意见收集流程，请及时查看审核。 //msgContentEN = currentUser.getUsername() + " has submitted the collection process of Regulatory and technical assessment of "+serialNumber+", Please check and address it in time."; //msgTitle = "You have a Regulatory and technical assessment task to complete"; initiator = currentUser.getUsername(); - cnContentUpper = "您好，"+ currentUser.getUsername() +"已提交评估结果，请审核"; + cnContentUpper = "您好，"+ initiator +"已提交评估结果，请审核"; cnContentLower = "编号：" + lawsTechnologyEvaluationEO.getSerialNumber() + "\n标题: " + lawsTechnologyEvaluationEO.getTitle() + "\n发起人: " + initiator + "\n截止时间: " + endTime; - enContentUpper = "Hello! "+ currentUser.getUsername() +" has submitted the assessment result. Please review it"; + enContentUpper = "Hello! "+ initiator +" has submitted the assessment result. Please review it"; enContentLower = "Regulation No :" + lawsTechnologyEvaluationEO.getSerialNumber() + "\nTitle: " + bussDocumentLibraryEO.getTitleEn() + "\nInitiator: " + initiator + "\nDue Date: " + endTime; + + LawsTechnologyEvaluationFlowDetailEO flowDetailEO = flowDetailEOMapper.queryByEvaluationId(lawsTechnologyEvaluationId,jsonObject.getString("evaluators")); + if (ObjectUtils.isNotEmpty(flowDetailEO)) { + hrefFeishu = backUrl + "/evaluationProcess?taskDefinitionKey=fqrsc&taskIds="+ taskId +"&prcType=6&prcNum="+ flowDetailEO.getPrcNum() +"&prcId="+ flowDetailEO.getActiProcInstId() +"&router=%2FregulatoryAssessmentTasks&isDisabled=false"; + + String[] thirdId = new String[1]; + SysUser sysUser = sysUserService.getById(jsonObject.getString("evaluators")); + if (ObjectUtils.isNotEmpty(sysUser)) { + thirdId[0] = sysUser.getThirdId(); + } + try { + FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo(); + feishuMsgVo.setTitle(title); + feishuMsgVo.setCnContentUpper(cnContentUpper); + feishuMsgVo.setCnContentLower(cnContentLower); + feishuMsgVo.setEnContentUpper(enContentUpper); + feishuMsgVo.setEnContentLower(enContentLower); + feishuMsgVo.setUrl(hrefFeishu); + feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色 + feishuService.sendCard(thirdId, feishuMsgVo); + } catch (IOException e) { + log.error("飞书消息推送失败"); + } + } + + + + }else if(StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_AUDIT_ACCEPTED_MSG.getValue())){ - userIdList.add(jsonObject.getString("evaluationId")); + //userIdList.add(jsonObject.getString("evaluationId")); //您提交的GB 7258 的法规技术评估流程已通过。 //msgContentEN = "The regulatory and technical assessment process for "+serialNumber+" you submitted has passed."; //msgTitle = "You have a Regulatory and technical assessment task completed"; @@ -701,8 +757,33 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl) jsonObject.get("userIdList"); + + LawsTechnologyEvaluationFlowDetailEO flowDetailEO = flowDetailEOMapper.queryByEvaluationId(lawsTechnologyEvaluationId,jsonObject.getString("userId")); + if (ObjectUtils.isNotEmpty(flowDetailEO)) { + hrefFeishu = backUrl + "/evaluationProcess?taskDefinitionKey="+ jsonObject.getString("taskDefKey") +"&taskIds="+ taskId +"&prcType=6&prcNum="+ flowDetailEO.getPrcNum() +"&prcId="+ flowDetailEO.getActiProcInstId() +"&router=%2FregulatoryAssessmentTasks&isDisabled=false"; + String[] thirdId = new String[1]; + SysUser sysUser = sysUserService.getById(jsonObject.getString("userId")); + if (ObjectUtils.isNotEmpty(sysUser)) { + thirdId[0] = sysUser.getThirdId(); + } + try { + FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo(); + feishuMsgVo.setTitle(title); + feishuMsgVo.setCnContentUpper(cnContentUpper); + feishuMsgVo.setCnContentLower(cnContentLower); + feishuMsgVo.setEnContentUpper(enContentUpper); + feishuMsgVo.setEnContentLower(enContentLower); + feishuMsgVo.setUrl(hrefFeishu); + feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色 + feishuService.sendCard(thirdId, feishuMsgVo); + } catch (IOException e) { + log.error("飞书消息推送失败"); + } + } } else if (StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_EXPIRE_REMIND_TODAY_MSG.getValue())) { cnContentUpper = "您好，该任务将于今天到期，请尽快查看处理，谢谢！"; @@ -739,7 +866,29 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl) jsonObject.get("userIdList"); + + LawsTechnologyEvaluationFlowDetailEO flowDetailEO = flowDetailEOMapper.queryByEvaluationId(lawsTechnologyEvaluationId,jsonObject.getString("userId")); + if (ObjectUtils.isNotEmpty(flowDetailEO)) { + hrefFeishu = backUrl + "/evaluationProcess?taskDefinitionKey="+ jsonObject.getString("taskDefKey") +"&taskIds="+ taskId +"&prcType=6&prcNum="+ flowDetailEO.getPrcNum() +"&prcId="+ flowDetailEO.getActiProcInstId() +"&router=%2FregulatoryAssessmentTasks&isDisabled=false"; + String[] thirdId = new String[1]; + SysUser sysUser = sysUserService.getById(jsonObject.getString("userId")); + if (ObjectUtils.isNotEmpty(sysUser)) { + thirdId[0] = sysUser.getThirdId(); + } + try { + FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo(); + feishuMsgVo.setTitle(title); + feishuMsgVo.setCnContentUpper(cnContentUpper); + feishuMsgVo.setCnContentLower(cnContentLower); + feishuMsgVo.setEnContentUpper(enContentUpper); + feishuMsgVo.setEnContentLower(enContentLower); + feishuMsgVo.setUrl(hrefFeishu); + feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色 + feishuService.sendCard(thirdId, feishuMsgVo); + } catch (IOException e) { + log.error("飞书消息推送失败"); + } + } } /*else if (StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_EXPIRE_REMIND_MSG.getValue())) { userIdList = (List) jsonObject.get("userIdList"); @@ -750,26 +899,6 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl thirdIdList = new ArrayList<>(); - List sysUsers = sysUserService.listByIds(userIdList); - if (ObjectUtils.isNotEmpty(sysUsers)) { - thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList()); - } - //飞书跳转链接 - String hrefFeishu = backUrl + JumpLinkEnum.FGPG_TODO_CENTER_LINK.getLink(); - try { - FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo(); - feishuMsgVo.setTitle(title); - feishuMsgVo.setCnContentUpper(cnContentUpper); - feishuMsgVo.setCnContentLower(cnContentLower); - feishuMsgVo.setEnContentUpper(enContentUpper); - feishuMsgVo.setEnContentLower(enContentLower); - feishuMsgVo.setUrl(hrefFeishu); - feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色 - feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo); - } catch (IOException e) { - log.error("飞书消息推送失败"); - } //系统内部跳转链接 //String href = "" + " View details" + ""; //String contentInfo = msgContentEN + " " + href; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java index 28a479a45..32b08b47e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java @@ -198,4 +198,9 @@ public interface WorkFlowFeignClient { */ @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/dispostHistoryBusProcessNewData",method = RequestMethod.GET) Result dispostHistoryBusProcessNewData(); + + @RequestMapping(value = "/bat-wkflow/task/getTaskInfo",method = RequestMethod.GET) + Map getTaskInfo(@RequestParam("actiProcInstId") String actiProcInstId); + + }