完善及修复销售订单流程相关代码

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;
 }

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;
+
 }

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<BusSalesOrder> {
     IPage<BusSalesOrderVo> selectPageVo(IPage<BusSalesOrder> page, @Param(Constants.WRAPPER) Wrapper<BusSalesOrder> 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}")

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}
     </update>
     <!--app查询销售订单列表-->

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<BusSalesOrderMapper
                         ProcDefEnum.SALESORDER.getProDefId(),
                         map.get("nodeState"),
                         map.get("procInsId"),
-                        map.get("taskDefKey")
+                        map.get("taskDefKey"),
+                        map.get("taskId")
                 );
             } else {
                 return rb.setMsg(businessResultBean.getMsg());
@@ -760,7 +761,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         ResultBean<BaseOrderPostPriceVo> 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<BusSalesOrderMapper
 
     private void modifyFlowState(String businessSid, String proDefId, String nodeState,
                                  String procInsId,
-                                 String taskDefKey) {
+                                 String taskDefKey,String taskId) {
         baseMapper.modifyFlowState(businessSid,
                 proDefId,
                 nodeState,
                 procInsId,
-                taskDefKey);
+                taskDefKey,taskId);
     }
 
     public ResultBean complete(BusSalesOrderFlowQuery busSalesOrderFlowQuery) {
@@ -842,6 +843,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }
         String nodeState = "";
         String taskDefKey = "";
+        String taskId = "";
         Map<String, Object> map = new HashMap<>();
         map.put("businessSid", variables.get("businessSid").toString());
         if (resultBean.getData() != null) {
@@ -849,9 +851,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             if (listResultBean.getSuccess() && listResultBean.getData().size() != 0) {
                 nodeState = listResultBean.getData().get(0).getName_();
                 taskDefKey = listResultBean.getData().get(0).getTask_def_key_();
+                taskId = listResultBean.getData().get(0).getId_();
+
             } else {
                 nodeState = ProcessStateEnum.FINISHED.getStateName();
                 taskDefKey = "Event_end";
+                taskId = variables.get("taskId").toString();
                 map.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode());
                 //更新销售订单的状态为已通过的状态:审批通过2
                 //ToDo:
@@ -866,7 +871,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 ProcDefEnum.SALESORDER.getProDefId(),
                 nodeState,
                 variables.get("instanceId").toString(),
-                taskDefKey);
+                taskDefKey,
+                taskId);
        /* map.put("nodeState", nodeState);
         map.put("taskDefKey", taskDefKey);
         sysFormLinkFeign.updateFiled(map);*/
@@ -893,14 +899,21 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         String nodeState = resultBean.getData().get(0).getName_();
         String taskDefKey = resultBean.getData().get(0).getTask_def_key_();
         String incomingSourceRef = resultBean.getData().get(0).getIncomingSourceRef();
-        Map<String, Object> map = new HashMap<>();
+        //更新业务表中的流程状态
+        modifyFlowState(dto.getBusinessSid(),
+                ProcDefEnum.SALESORDER.getProDefId(),
+                nodeState,
+                dto.getInstanceId(),
+                taskDefKey,
+                resultBean.getData().get(0).getId_());
+       /* Map<String, Object> 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<BusSalesOrderMapper
         if (!resultBean.getSuccess()) {
             return resultBean;
         }
-        Map<String, Object> map = new HashMap<>();
+        //更新业务表中的流程状态
+        modifyFlowState(dto.getBusinessSid(),
+                ProcDefEnum.SALESORDER.getProDefId(),
+                String.valueOf(resultBean.getData()),
+                dto.getInstanceId(),
+                "Event_end",
+                dto.getTaskId());
+       /* Map<String, Object> 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<BusSalesOrderMapper
         String nodeState = resultBean.getData().get(0).getName_();
         String taskDefKey = resultBean.getData().get(0).getTask_def_key_();
         String inComingSourceRef = resultBean.getData().get(0).getIncomingSourceRef();
-        Map<String, Object> 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<String, Object> 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<BusSalesOrderMapper
             map.put("nodeState", nodeState);
             map.put("taskDefKey", taskDefKey);
         }
-        sysFormLinkFeign.updateFiled(map);
+        sysFormLinkFeign.updateFiled(map);*/
         return new ResultBean().success();
     }
 

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java

@@ -59,6 +59,7 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
         map.put("nodeState", nodeState);
         map.put("procInsId", rb.getData().getProcInsId());
         map.put("taskDefKey", task_def_key_);
+        map.put("taskId",list.get(0).getId_());
         return new ResultBean().success().setData(map);
     }