From 950bbcb66f88ef8d55a00586849ca2905bd059e7 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 5 Jul 2022 14:21:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E3=80=81prehomo=E3=80=81?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=AC=A6=E5=90=88=E6=80=A7=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=EF=BC=8C=E5=8F=91=E8=B5=B7=E4=BA=BA=E9=80=80=E5=9B=9E=E5=8F=91?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=86=85=E5=AE=B9=E5=AE=8C=E5=96=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/project/enums/JumpLinkEnum.java | 1 + .../project/enums/OperatorTypeEnum.java | 1 + .../ProjectTaskInventoryEOServiceImpl.java | 187 ++++++++++++++++-- 3 files changed, 174 insertions(+), 15 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java index 7bca08f04..54aa3225b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java @@ -18,6 +18,7 @@ public enum JumpLinkEnum { VERIFY_AFFIRM_LINK("验证符合性确认链接","3","/ProjectDetails?id=","&type=103"), DESIGN_AFFIRM_LINK("设计符合性确认链接","4","/ProjectDetails?id=","&type=103"), TASK_AFFIRM_LINK("任务确认链接","2","/ProcessCenter",""), + COMPLIANCE_PROCESS_DETAIL_LINK("符合性流程明细页路由","2","/taskListProcess",""), ; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java index 145dfceda..5e2058238 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java @@ -22,6 +22,7 @@ public enum OperatorTypeEnum { QUERY_TASK_INVENTORY_DETAIL("查询法规清单明细信息","queryTaskInventoryDetail"), UPDATE_TASK_INVENTORY_DETAIL("更新法规清单明细信息","updateTaskInventoryDetail"), UPDATE_DRE_TASK_STATUS("更新法规清单明细信息，dre任务状态","updateDreTaskStatus"), + UPDATE_TASK_INVENTORY_DETAIL_BY_TASK("根据任务节点定义key更新数据","updateTaskInventoryDetailByTask"), GET_CURRENT_USER_ID("获取当前登录用户id","getCurrentUserId"), diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java index 8165dbfad..399267b15 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java @@ -22,6 +22,7 @@ import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.mapper.SysUserMapper; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; +import com.jero.modules.wkflow.enums.DesignComplianceNodeEnum; import com.jero.modules.wkflow.enums.FlowTypeEnum; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -78,6 +79,9 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl deleteWrapper = new QueryWrapper<>(); + deleteWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getActiProcInstId,projectTaskInventoryDetailEO.getActiProcInstId()); + deleteWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getUserId,projectTaskInventoryDetailEO.getUserId()); + deleteWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getFlowType,projectTaskInventoryDetailEO.getFlowType()); + projectTaskInventoryDetailEOMapper.delete(deleteWrapper); + projectTaskInventoryDetailEOMapper.insert(projectTaskInventoryDetailEO); + } } return new Result<>().success("调用成功！"); @@ -650,8 +669,35 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl detailEOQueryWrapper = new QueryWrapper<>(); + detailEOQueryWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getActiProcInstId,actiProcInstId); + detailEOQueryWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getTaskDefinitionKey, taskKey); + List projectTaskInventoryDetailEOS = this.projectTaskInventoryDetailEOMapper.selectList(detailEOQueryWrapper); + + ProjectTaskInventoryEO projectTaskInventoryEO = null; + + if (CollectionUtils.isNotEmpty(projectTaskInventoryDetailEOS)) { + ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO = projectTaskInventoryDetailEOS.get(0); + taskIds = projectTaskInventoryDetailEO.getTaskId(); + projectTaskInventoryId = projectTaskInventoryDetailEO.getProjectTaskInventoryId(); + primaryKeyId = projectTaskInventoryDetailEO.getId(); + + projectTaskInventoryEO = this.projectTaskInventoryEOService.getOne( + new QueryWrapper().lambda().eq(ProjectTaskInventoryEO::getId, projectTaskInventoryId) + ); + + } + + if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_ISSUE_DRE_MSG.getValue()) + || StringUtils.equals(msgType, MsgTypeEnum.DESIGN_RETURN_MSG.getValue())){ + flowType = FlowTypeEnum.SJFHXSHLC.getValue(); + sponsor = "designInitiatorName"; + personLiable = "designDutyName"; + typeOfDeliverables = "designDeliverableTypeName"; + deliverableTemplate = "designDeliverableTemplate"; + dueDate = "designDueDate"; + remarks = "designRemark"; + + personChargeFeedback = projectTaskInventoryEO.getDesignPersonChargeFeedback(); + }else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_RETURN_MSG.getValue())){ + flowType = FlowTypeEnum.PREHOMOQRLC.getValue(); + sponsor = "prehomoInitiatorName"; + personLiable = "prehomoDutyName"; + typeOfDeliverables = "prehomoDeliverableTypeName"; + deliverableTemplate = "prehomoDeliverableTemplate"; + dueDate = "prehomoDueDate"; + remarks = "prehomoRemark"; + + personChargeFeedback = projectTaskInventoryEO.getPrehomoPersonChargeFeedback(); + }else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_RETURN_MSG.getValue())){ + flowType = FlowTypeEnum.YZFHXSCLC.getValue(); + sponsor = "verifyInitiatorName"; + personLiable = "verifyDutyName"; + typeOfDeliverables = "verifyDeliverableTypeName"; + deliverableTemplate = "verifyDeliverableTemplate"; + dueDate = "verifyDueDate"; + remarks = "verifyRemark"; + + personChargeFeedback = projectTaskInventoryEO.getVerifyPersonChargeFeedback(); + }*/ + if(CollectionUtils.isNotEmpty(userIdList) && StringUtils.isNotEmpty(msgContentEN)){ //飞书跳转链接 @@ -709,6 +815,57 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl" + "Jump link" + ""; + + //飞书跳转链接 拼接跳转至任务详情页参数 + /*String hrefFeishu = backUrl + + JumpLinkEnum.COMPLIANCE_PROCESS_DETAIL_LINK.getLink() + + "?taskIds=" + taskIds + + "&actiProcInstId=" + actiProcInstId + + "&projectTaskInventoryId=" + projectTaskInventoryId + + "&projectLibraryId=" + projectLibraryId + + "&id=" + projectLibraryId + + "&studioEngineer=" + studioEngineer + + "&serialNumber=" + serialNumber + + "&TaskKey=" + taskKey + + "&isDisplay=" + isDisplay + + "&flowType=" + flowType + + "&Sponsor=" + sponsor + + "&personLiable=" + personLiable + + "&typeOfDeliverables=" + typeOfDeliverables + + "&deliverableTemplate=" + deliverableTemplate + + "&DueDate=" + dueDate + + "&remarks=" + remarks + + "&projectName=" + projectName + + "&targetMarket=" + targetMarket + + "&projectNameId=" + projectNameId + + "&primaryKeyId=" + primaryKeyId + + "&PersonChargeFeedback=" + personChargeFeedback; + + //系统内部跳转链接 拼接跳转至任务详情页参数 + String href = "" + "Jump link" + "";*/ String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); sendMessageMap.put("hrefFeishu",hrefFeishu);