diff --git a/SC-boot/linkage-admin/src/main/resources/mapper/workflow/engine/FlowTaskMapper.xml b/SC-boot/linkage-admin/src/main/resources/mapper/workflow/engine/FlowTaskMapper.xml index df798bd3..cae1eebd 100644 --- a/SC-boot/linkage-admin/src/main/resources/mapper/workflow/engine/FlowTaskMapper.xml +++ b/SC-boot/linkage-admin/src/main/resources/mapper/workflow/engine/FlowTaskMapper.xml @@ -64,7 +64,7 @@ diff --git a/SC-boot/linkage-workflow/src/main/java/jnpf/engine/model/flowbefore/FlowBeforeListVO.java b/SC-boot/linkage-workflow/src/main/java/jnpf/engine/model/flowbefore/FlowBeforeListVO.java index fc85aa99..8dcdcdc3 100644 --- a/SC-boot/linkage-workflow/src/main/java/jnpf/engine/model/flowbefore/FlowBeforeListVO.java +++ b/SC-boot/linkage-workflow/src/main/java/jnpf/engine/model/flowbefore/FlowBeforeListVO.java @@ -55,4 +55,6 @@ public class FlowBeforeListVO { @ApiModelProperty(value = "版本") private String flowVersion; + @ApiModelProperty(value = "付款申请描述") + private String paymentDescription; } diff --git a/SC-boot/linkage-workflow/src/main/java/jnpf/engine/model/flowtask/FlowTaskListModel.java b/SC-boot/linkage-workflow/src/main/java/jnpf/engine/model/flowtask/FlowTaskListModel.java index f5950972..96d50d0b 100644 --- a/SC-boot/linkage-workflow/src/main/java/jnpf/engine/model/flowtask/FlowTaskListModel.java +++ b/SC-boot/linkage-workflow/src/main/java/jnpf/engine/model/flowtask/FlowTaskListModel.java @@ -42,4 +42,5 @@ public class FlowTaskListModel { private String description; private String flowVersion; private Integer taskStatus; + private String paymentDescription; } diff --git a/SC-boot/linkage-workflow/src/main/java/jnpf/engine/service/impl/FlowTaskNewServiceImpl.java b/SC-boot/linkage-workflow/src/main/java/jnpf/engine/service/impl/FlowTaskNewServiceImpl.java index ab444887..b8358a6e 100644 --- a/SC-boot/linkage-workflow/src/main/java/jnpf/engine/service/impl/FlowTaskNewServiceImpl.java +++ b/SC-boot/linkage-workflow/src/main/java/jnpf/engine/service/impl/FlowTaskNewServiceImpl.java @@ -1382,6 +1382,7 @@ public class FlowTaskNewServiceImpl implements FlowTaskNewService { taskEntity.setFlowType(engine.getType()); taskEntity.setFlowCategory(engine.getCategory()); taskEntity.setFlowForm(engine.getFormData()); + taskEntity.setDescription(flowModel.getFormData().get("documentNo") + "-" + flowModel.getFormData().get("num") + "-" + flowModel.getFormData().get("ramount").toString()); taskEntity.setFlowTemplateJson(engine.getFlowTemplateJson()); taskEntity.setFlowVersion(engine.getVersion()); taskEntity.setStatus(FlowStatusEnum.save.getMessage().equals(flowModel.getStatus()) ? FlowTaskStatusEnum.Draft.getCode() : FlowTaskStatusEnum.Handle.getCode()); diff --git a/SC-boot/linkage-workflow/src/main/java/jnpf/engine/service/impl/FlowTaskServiceImpl.java b/SC-boot/linkage-workflow/src/main/java/jnpf/engine/service/impl/FlowTaskServiceImpl.java index dcfe7097..05c00f9c 100644 --- a/SC-boot/linkage-workflow/src/main/java/jnpf/engine/service/impl/FlowTaskServiceImpl.java +++ b/SC-boot/linkage-workflow/src/main/java/jnpf/engine/service/impl/FlowTaskServiceImpl.java @@ -222,7 +222,7 @@ public class FlowTaskServiceImpl extends ServiceImpl +