diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/workflow/engine/FlowTaskMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/workflow/engine/FlowTaskMapper.xml index 3afe16a1..d2693848 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/workflow/engine/FlowTaskMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/workflow/engine/FlowTaskMapper.xml @@ -324,4 +324,9 @@ select SUM(delivery_num) from jg_delivery_product_relation where f_delete_mark is null and order_id = #{processId} + + diff --git a/jnpf-java-boot/jnpf-public/jnpf-provider/src/main/java/jnpf/engine/service/FlowTaskService.java b/jnpf-java-boot/jnpf-public/jnpf-provider/src/main/java/jnpf/engine/service/FlowTaskService.java index cc28ae3d..42138c56 100644 --- a/jnpf-java-boot/jnpf-public/jnpf-provider/src/main/java/jnpf/engine/service/FlowTaskService.java +++ b/jnpf-java-boot/jnpf-public/jnpf-provider/src/main/java/jnpf/engine/service/FlowTaskService.java @@ -216,5 +216,14 @@ public interface FlowTaskService extends SuperService { */ BigDecimal getNetWeight(String flowName,String processId); + /** + * 获取付款申请重量 + * @return + */ + BigDecimal getNetWeightPayment(String flowName,String processId); + /** + * 待审核可删除流程 + * @return + */ void remove(FlowTaskEntity flowTaskEntity); } diff --git a/jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-biz/src/main/java/jnpf/engine/mapper/FlowTaskMapper.java b/jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-biz/src/main/java/jnpf/engine/mapper/FlowTaskMapper.java index e2e2b108..750b0200 100644 --- a/jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-biz/src/main/java/jnpf/engine/mapper/FlowTaskMapper.java +++ b/jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-biz/src/main/java/jnpf/engine/mapper/FlowTaskMapper.java @@ -55,4 +55,11 @@ public interface FlowTaskMapper extends SuperMapper { * @return */ BigDecimal getNetWeightByReceiptOrder(@Param("processId") String processId); + + /** + * 获取付款申请单重量 + * + * @return + */ + BigDecimal getNetWeightBypayment(@Param("processId") String processId); } diff --git a/jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-biz/src/main/java/jnpf/engine/service/impl/FlowTaskServiceImpl.java b/jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-biz/src/main/java/jnpf/engine/service/impl/FlowTaskServiceImpl.java index 1482f457..2af6c4d1 100644 --- a/jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-biz/src/main/java/jnpf/engine/service/impl/FlowTaskServiceImpl.java +++ b/jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-biz/src/main/java/jnpf/engine/service/impl/FlowTaskServiceImpl.java @@ -867,6 +867,13 @@ public class FlowTaskServiceImpl extends SuperServiceImpl t.getId().equals(vo.getCreatorUserId())).findFirst().orElse(null); vo.setUserName(user != null ? user.getRealName() + "/" + user.getAccount() : "");