From 560cef483c751c3bf7160c51751b247e12f5ebeb Mon Sep 17 00:00:00 2001 From: cdf <857448963@qq.com> Date: Thu, 11 Apr 2024 09:44:04 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8A=80=E6=9C=AF=E7=9B=91=E7=9D=A3=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=B9=B2=E6=89=B0=E6=BA=90=E7=94=A8=E6=88=B7=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/process/pojo/dto/flowable/FlowTaskDto.java | 2 +- .../src/main/java/com/njcn/process/pojo/po/FlowableAss.java | 2 +- .../process/service/impl/flowable/FlowTaskServiceImpl.java | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/dto/flowable/FlowTaskDto.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/dto/flowable/FlowTaskDto.java index 4e4dbfb77..a8af3f53f 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/dto/flowable/FlowTaskDto.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/dto/flowable/FlowTaskDto.java @@ -103,6 +103,6 @@ public class FlowTaskDto implements Serializable { @ApiModelProperty("此流程对应的发起表单功能的id") private String formAssId; - @ApiModelProperty("1.普测电站 1.干扰源用户") + @ApiModelProperty("1.普测电站 2.干扰源用户 3.电能质量问题" ) private Integer formType; } diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/FlowableAss.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/FlowableAss.java index 347dd66e2..4fc1093ae 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/FlowableAss.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/FlowableAss.java @@ -40,7 +40,7 @@ public class FlowableAss{ /** - * 技术监督功能 1.普测电站 2.干扰源用户 + * 技术监督功能 1.普测电站 2.干扰源用户 3.电能质量问题 */ private Integer type; diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/flowable/FlowTaskServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/flowable/FlowTaskServiceImpl.java index 21760dd95..429f46013 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/flowable/FlowTaskServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/flowable/FlowTaskServiceImpl.java @@ -203,6 +203,9 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask FlowableAss flowableAss = flowableAssMapper.selectOne(new LambdaQueryWrapper().eq(FlowableAss::getExecIndex,hisIns.getId())); flowTask.setFormAssId(flowableAss.getThsIndex()); + flowTask.setFormType(flowableAss.getType()); + + // 计算耗时 if (Objects.nonNull(hisIns.getEndTime())) { long time = hisIns.getEndTime().getTime() - hisIns.getStartTime().getTime();