From b1a5cae68301fc918ab02955f263573b76d74f5e Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 26 May 2022 15:52:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8F=8A=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E6=B5=81=E7=A8=8B=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/bussalesorder/BusSalesOrder.java | 2 + .../api/bussalesorder/BusSalesOrderVo.java | 3 ++ .../bussalesorder/BusSalesOrderMapper.java | 2 +- .../biz/bussalesorder/BusSalesOrderMapper.xml | 6 ++- .../bussalesorder/BusSalesOrderService.java | 53 +++++++++++++++---- .../flowable/biz/flow/FlowableService.java | 1 + 6 files changed, 53 insertions(+), 14 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java index c139db019e..15f5107fe8 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java @@ -111,4 +111,6 @@ public class BusSalesOrder extends BaseEntity { private String customerClass; @ApiModelProperty(value = "客户头像") private String customerPhoto; + @ApiModelProperty(value = "任务编号id") + private String taskId; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderVo.java index 8d0209e2d2..72037e3ed2 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderVo.java @@ -77,4 +77,7 @@ public class BusSalesOrderVo implements Vo { @ApiModelProperty(value = "是否保险") private String isInsurance; + @ApiModelProperty(value = "任务编号id") + private String taskId; + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java index a8e9c4b702..54bb58abcd 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java @@ -57,7 +57,7 @@ public interface BusSalesOrderMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); void modifyFlowState(@Param("businessSid") String businessSid, @Param("procDefId") String procDefId, @Param("nodeState") String nodeState, - @Param("procInstSid") String procInstSid, @Param("nodeSid") String nodeSid); + @Param("procInstSid") String procInstSid, @Param("nodeSid") String nodeSid,@Param("taskId")String taskId); @Update("update bus_sales_order set oneBillMoney = #{oneBillMoney} where sid = #{orderSid}") diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 7b921f341e..a84777f581 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -17,7 +17,8 @@ bd.depositAll, case bo.isInsurance when 0 then '否' - when 1 then '是' end as isInsurance + when 1 then '是' end as isInsurance, + bo.taskId FROM bus_sales_order bo left join bus_sales_order_model bm on bm.salesOrderSid = bo.sid left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid @@ -32,7 +33,8 @@ set procDefId=#{procDefId}, nodeState=#{nodeState}, procInstId=#{procInstSid}, - nodeId=#{nodeSid} + nodeId=#{nodeSid}, + taskId = #{taskId} where sid = #{businessSid} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 8bc37d3d6e..92ac97c688 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -686,7 +686,8 @@ public class BusSalesOrderService extends MybatisBaseService resultBean1 = basePostPriceFeign.selectPostPrice(baseOrderPostPriceQuery); if (resultBean1.getSuccess()) { String price = resultBean1.getData().getPrice(); - //ToDo:计算是否有权限：岗位权限（销售部经理权限、总经理权限）+总促销金额<总指导价-总成交价-优惠包总价值 + //ToDo:计算是否超权限：岗位权限（销售部经理权限、总经理权限）+总促销金额<总指导价-总成交价-优惠包总价值 //销售支持部经理的岗位权限价格 BigDecimal bigDecimal2 = new BigDecimal(price); bigDecimalTwo = bigDecimal2.add(initBigDecimal); @@ -822,12 +823,12 @@ public class BusSalesOrderService extends MybatisBaseService map = new HashMap<>(); map.put("businessSid", variables.get("businessSid").toString()); if (resultBean.getData() != null) { @@ -849,9 +851,12 @@ public class BusSalesOrderService extends MybatisBaseService map = new HashMap<>(); + //更新业务表中的流程状态 + modifyFlowState(dto.getBusinessSid(), + ProcDefEnum.SALESORDER.getProDefId(), + nodeState, + dto.getInstanceId(), + taskDefKey, + resultBean.getData().get(0).getId_()); + /* Map map = new HashMap<>(); map.put("businessSid", dto.getBusinessSid()); map.put("nodeState", nodeState); map.put("taskDefKey", taskDefKey); if (incomingSourceRef.contains("start")) { map.put("flowState", SysFormLinkFlowStateEnum.REJECT.getCode()); } - sysFormLinkFeign.updateFiled(map); + sysFormLinkFeign.updateFiled(map);*/ return new ResultBean().success(); } @@ -913,12 +926,19 @@ public class BusSalesOrderService extends MybatisBaseService map = new HashMap<>(); + //更新业务表中的流程状态 + modifyFlowState(dto.getBusinessSid(), + ProcDefEnum.SALESORDER.getProDefId(), + String.valueOf(resultBean.getData()), + dto.getInstanceId(), + "Event_end", + dto.getTaskId()); + /* Map map = new HashMap<>(); map.put("businessSid", dto.getBusinessSid()); map.put("nodeState", String.valueOf(resultBean.getData())); map.put("taskDefKey", "Event_end"); map.put("flowState", SysFormLinkFlowStateEnum.BREAK.getCode()); - sysFormLinkFeign.updateFiled(map); + sysFormLinkFeign.updateFiled(map);*/ return resultBean.success(); } @@ -932,7 +952,18 @@ public class BusSalesOrderService extends MybatisBaseService map = new HashMap<>(); + if (inComingSourceRef.contains("start")) { + nodeState = SysFormLinkFlowStateEnum.UNCOMMITTED.getState(); + } else { + nodeState = nodeState; + + } + modifyFlowState(dto.getBusinessSid(), + ProcDefEnum.SALESORDER.getProDefId(), + nodeState, + dto.getInstanceId(), + taskDefKey,resultBean.getData().get(0).getId_()); + /* Map map = new HashMap<>(); map.put("businessSid", dto.getBusinessSid()); if (inComingSourceRef.contains("start")) { map.put("nodeState", SysFormLinkFlowStateEnum.UNCOMMITTED.getState()); @@ -942,7 +973,7 @@ public class BusSalesOrderService extends MybatisBaseService