From 1c9d6bb86f48f83ae0962185c61cd294d253f174 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 6 May 2022 11:41:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AEprojectId=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=97=B6=E4=B8=8B=E6=8B=89=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=20-=20=E5=A4=9A=E4=B8=AA=E9=A2=86=E5=9F=9F=E7=94=A8=E6=88=B7?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E9=87=8D=E3=80=82=20=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=B0=83=E7=94=A8-=E4=BB=BB=E5=8A=A1=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ProjectTaskInventoryDetailEO.java | 5 +++ .../entity/ProjectTaskInventoryEO.java | 15 +++++++++ .../project/enums/OperatorTypeEnum.java | 2 ++ .../ProjectRelatedPersonnelServiceImpl.java | 16 ++++++++++ .../ProjectTaskInventoryEOServiceImpl.java | 31 ++++++++++++++++--- 5 files changed, 65 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java index f6befb6bf..8024da376 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java @@ -71,6 +71,11 @@ public class ProjectTaskInventoryDetailEO implements Serializable { @ApiModelProperty(value = "待办id") private java.lang.String taskId; + /**任务节点定义key**/ + @Excel(name = "任务节点定义key", width = 15) + @ApiModelProperty(value = "任务节点定义key") + private String taskDefinitionKey; + /**流程实例id*/ @Excel(name = "流程实例id", width = 15) @ApiModelProperty(value = "流程实例id") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java index 7a9e4f42f..8d0ac3542 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java @@ -74,6 +74,11 @@ public class ProjectTaskInventoryEO implements Serializable { @ApiModelProperty(value = "设计符合性流程状态") private String designStatus; + /**设计符合性流程-任务状态*/ + @Excel(name = "设计符合性流程-任务状态", width = 15) + @ApiModelProperty(value = "设计符合性流程-任务状态") + private String designFlowTaskStatus; + /**设计符合性流程 流程实例id*/ @Excel(name = "设计符合性流程 流程实例id", width = 15) @ApiModelProperty(value = "设计符合性流程 流程实例id") @@ -84,6 +89,11 @@ public class ProjectTaskInventoryEO implements Serializable { @ApiModelProperty(value = "prehomo确认流程状态") private String prehomoStatus; + /**prehomo确认流程-任务状态*/ + @Excel(name = "prehomo确认流程-任务状态", width = 15) + @ApiModelProperty(value = "prehomo确认流程-任务状态") + private String prehomoFlowTaskStatus; + /**prehomo流程 流程实例id*/ @Excel(name = "prehomo流程 流程实例id", width = 15) @ApiModelProperty(value = "prehomo流程 流程实例id") @@ -94,6 +104,11 @@ public class ProjectTaskInventoryEO implements Serializable { @ApiModelProperty(value = "验证符合性流程状态") private String verifyStatus; + /**验证符合性流程-任务状态*/ + @Excel(name = "验证符合性流程-任务状态", width = 15) + @ApiModelProperty(value = "验证符合性流程-任务状态") + private String verifyFlowTaskStatus; + /**验证符合性流程 流程实例id*/ @Excel(name = "验证符合性流程 流程实例id", width = 15) @ApiModelProperty(value = "验证符合性流程 流程实例id") 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 db22b91d7..2723b20b2 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 @@ -19,6 +19,8 @@ public enum OperatorTypeEnum { TASK_AFFIRM_QUERY("任务确认流程，查询法规清单信息","taskAffirmQuery"), ADD_TASK_INVENTORY_DETAIL("添加法规清单明细信息","addTaskInventoryDetail"), + QUERY_TASK_INVENTORY_DETAIL("查询法规清单明细信息","queryTaskInventoryDetail"), + UPDATE_TASK_INVENTORY_DETAIL("更新法规清单明细信息","updateTaskInventoryDetail"), ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 96ad1df07..568a71f90 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -334,6 +334,22 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl(Comparator.comparing(o -> (String)o.get("value")))), ArrayList::new ) ); + lawEngineerList = lawEngineerList.stream().collect( + Collectors.collectingAndThen(Collectors.toCollection(() -> + new TreeSet<>(Comparator.comparing(o -> (String)o.get("value")))), ArrayList::new + ) + ); + certificationEngineerList = certificationEngineerList.stream().collect( + Collectors.collectingAndThen(Collectors.toCollection(() -> + new TreeSet<>(Comparator.comparing(o -> (String)o.get("value")))), ArrayList::new + ) + ); + engineeringInterfacePersonList = engineeringInterfacePersonList.stream().collect( + Collectors.collectingAndThen(Collectors.toCollection(() -> + new TreeSet<>(Comparator.comparing(o -> (String)o.get("value")))), ArrayList::new + ) + ); + result.put("lawEngineerList",lawEngineerList); result.put("certificationEngineerList",certificationEngineerList); 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 0af3ffb81..7b6e096d5 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 @@ -20,10 +20,7 @@ import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Date; +import java.util.*; import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -204,8 +201,34 @@ 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); } + }else if(StringUtils.equals(operatorType,OperatorTypeEnum.QUERY_TASK_INVENTORY_DETAIL.getValue())){ + String userId = jsonObject.getString("userId"); + String flowType = jsonObject.getString("flowType"); + String actiProcInstId = jsonObject.getString("actiProcInstId"); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getUserId,userId); + queryWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getFlowType,flowType); + queryWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getActiProcInstId,actiProcInstId); + queryWrapper.isNull("task_id"); + + List projectTaskInventoryDetailEOS = projectTaskInventoryDetailEOMapper.selectList(queryWrapper); + Result> objectResult = new Result<>(); + objectResult.setResult(projectTaskInventoryDetailEOS); + objectResult.setSuccess(true); + return objectResult; + }else if(StringUtils.equals(operatorType,OperatorTypeEnum.UPDATE_TASK_INVENTORY_DETAIL.getValue())){ + ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO = JSONObject.parseObject(jsonObject.toString(), ProjectTaskInventoryDetailEO.class); + this.projectTaskInventoryDetailEOMapper.updateById(projectTaskInventoryDetailEO); } return new Result<>().success("调用成功！");