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();