Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/flowable/ScmVirtualOrderDepositVehicleCompleteDto.java

@@ -15,7 +15,6 @@ public class ScmVirtualOrderDepositVehicleCompleteDto implements Dto {
     @NotBlank(message = "参数错误：userSid")
     private String userSid;
     @ApiModelProperty(value = "用户全路径sid")
-    @NotBlank(message = "参数错误：orgSidPath")
     private String orgSidPath;
     @ApiModelProperty(value = "节点id")
     @NotBlank(message = "参数错误：taskDefKey")

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java

@@ -80,6 +80,9 @@ public class BusDepositService extends MybatisBaseService<BusDepositMapper, BusD
     public AppBusDepositBusDetailsVo depositDetail(String virtualOrderSid, String userSid) {
         String staffSid = sysUserFeign.getUserOrgInfoByUserSid(userSid).getData().getStaffSid();
         AppBusDepositBusDetailsVo vo = baseMapper.depositDetail(virtualOrderSid, staffSid);
+        BusMainDeposit busMainDeposit = busMainDepositService.fetchBySid(virtualOrderSid);
+        vo.setTaskId(busMainDeposit.getTaskId());
+        vo.setProcInsId(busMainDeposit.getProcInsId());
         vo.setVirtualOrderSid(virtualOrderSid);
         vo.setUserSid(userSid);
         List<String> list = new ArrayList<>();

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml

@@ -5,21 +5,21 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDepositListVo">
         SELECT bmd.id,
-               bmd.sid,
-               bmd.billNo,
-               bmd.depositBillTypeKey,
-               bmd.depositBillType,
-               bmd.createDate,
-               bmd.staffName,
-               bd.deposit,
-               bd.usedDeposit,
-               IF(bd.id IS NOT NULL, bd.draweeName, bdvc.customerName)     name,
-               IF(bd.id IS NOT NULL, bd.draweeMobile, bdvc.customerMobile) mobile,
-               IF(COUNT(bdv.id) = 0, '', COUNT(bdv.id))                    depositVehicle
+        bmd.sid,
+        bmd.billNo,
+        bmd.depositBillTypeKey,
+        bmd.depositBillType,
+        bmd.createDate,
+        bmd.staffName,
+        bd.deposit,
+        bd.usedDeposit,
+        IF(bd.id IS NOT NULL, bd.draweeName, bdvc.customerName) name,
+        IF(bd.id IS NOT NULL, bd.draweeMobile, bdvc.customerMobile) mobile,
+        IF(COUNT(bdv.id) = 0, '', COUNT(bdv.id)) depositVehicle
         FROM bus_main_deposit bmd
-                 LEFT JOIN bus_deposit bd on bmd.sid = bd.billSid
-                 LEFT JOIN bus_deposit_vehicle_customer bdvc on bmd.sid = bdvc.billSid
-                 LEFT JOIN bus_deposit_vehicle bdv on bmd.sid = bdv.billSid
+        LEFT JOIN bus_deposit bd on bmd.sid = bd.billSid
+        LEFT JOIN bus_deposit_vehicle_customer bdvc on bmd.sid = bdvc.billSid
+        LEFT JOIN bus_deposit_vehicle bdv on bmd.sid = bdv.billSid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -35,64 +35,65 @@
 
     <!--虚拟订单列表-->
     <select id="getVirtualOrders" resultType="com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositVo">
-        SELECT bmd.sid                AS virtualOrderSid,
-               bmd.billNo             AS virtualOrderId,
-               bmd.createDate         AS virtualOrderDate,
-               bmd.depositBillTypeKey as virtualOrderType,
-               bmd.staffName          AS sellerName,
-               bmd.nodeState          AS virtualOrderState,
-               bmd.remarks
+        SELECT bmd.sid AS virtualOrderSid,
+        bmd.billNo AS virtualOrderId,
+        bmd.createDate AS virtualOrderDate,
+        bmd.depositBillTypeKey as virtualOrderType,
+        bmd.staffName AS sellerName,
+        bmd.nodeState AS virtualOrderState,
+        bmd.remarks
         FROM bus_main_deposit bmd
-                 LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid
-                 LEFT JOIN bus_deposit bd ON bmd.sid = bd.billSid
+        LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid
+        LEFT JOIN bus_deposit bd ON bmd.sid = bd.billSid
         <where>
             ${ew.sqlSegment}
             <if test="name != '' and name != null">
                 and bmd.billNo LIKE concat('%'
-                  , #{name}
-                  , '%')
+                , #{name}
+                , '%')
             </if>
         </where>
         <if test="name != '' and name != null">
             UNION ALL
-            SELECT bmd.sid                AS virtualOrderSid,
-                   bmd.billNo             AS virtualOrderId,
-                   bmd.createDate         AS virtualOrderDate,
-                   bmd.depositBillTypeKey as virtualOrderType,
-                   bmd.staffName          AS sellerName,
-                   bmd.nodeState          AS virtualOrderState,
-                   bmd.remarks
+            SELECT bmd.sid AS virtualOrderSid,
+            bmd.billNo AS virtualOrderId,
+            bmd.createDate AS virtualOrderDate,
+            bmd.depositBillTypeKey as virtualOrderType,
+            bmd.staffName AS sellerName,
+            bmd.nodeState AS virtualOrderState,
+            bmd.remarks
             FROM bus_main_deposit bmd
-                     LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid
-                     LEFT JOIN bus_deposit bd ON bmd.sid = bd.billSid
+            LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid
+            LEFT JOIN bus_deposit bd ON bmd.sid = bd.billSid
             <where>
                 ${ew.sqlSegment}
                 <if test="name != '' and name != null">
                     and bdvc.customerName LIKE concat('%'
-                      , #{name}
-                      , '%')
+                    , #{name}
+                    , '%')
                 </if>
             </where>
             UNION ALL
-            SELECT bmd.sid                AS virtualOrderSid,
-                   bmd.billNo             AS virtualOrderId,
-                   bmd.createDate         AS virtualOrderDate,
-                   bmd.depositBillTypeKey as virtualOrderType,
-                   bmd.staffName          AS sellerName,
-                   bmd.nodeState          AS virtualOrderState,
-                   bmd.remarks
+            SELECT bmd.sid AS virtualOrderSid,
+            bmd.billNo AS virtualOrderId,
+            bmd.createDate AS virtualOrderDate,
+            bmd.depositBillTypeKey as virtualOrderType,
+            bmd.staffName AS sellerName,
+            bmd.nodeState AS virtualOrderState,
+            bmd.remarks
             FROM bus_main_deposit bmd
-                     LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid
-                     LEFT JOIN bus_deposit bd ON bmd.sid = bd.billSid
+            LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid
+            LEFT JOIN bus_deposit bd ON bmd.sid = bd.billSid
             <where>
                 ${ew.sqlSegment}
                 <if test="name != '' and name != null">
                     and bd.draweeName LIKE concat('%'
-                      , #{name}
-                      , '%')
+                    , #{name}
+                    , '%')
                 </if>
             </where>
         </if>
+        order by bmd.id desc
     </select>
 
     <delete id="deleteVirtualOrder">
@@ -183,7 +184,7 @@
     <update id="updateFlowFiled" parameterType="java.util.Map">
         UPDATE bus_main_deposit
         SET nodeState=#{nodeState}
-          , taskDefKey=#{taskDefKey}
+        , taskDefKey=#{taskDefKey}
         <if test="procDefId != null and procDefId != ''">
             , procDefId=#{procDefId}
         </if>
@@ -288,21 +289,21 @@
      </select>-->
 
     <select id="pageAppList" resultMap="pageAppMap">
-        select bd.sid            as virtualSid,
-               bd.billNo         as virtualId,
-               bc.customerName,
-               bc.customerMobile as mobile,
-               bd.staffSid
+        select bd.sid as virtualSid,
+        bd.billNo as virtualId,
+        bc.customerName,
+        bc.customerMobile as mobile,
+        bd.staffSid
         from bus_main_deposit bd
-                 left join bus_deposit_vehicle_customer bc on bd.sid = bc.billSid
+        left join bus_deposit_vehicle_customer bc on bd.sid = bc.billSid
         <where>
             ${ew.sqlSegment}
             <if test="name != null and name != ''">
                 and concat(bd.billNo
-                  , bc.customerName
-                  , bc.customerMobile) LIKE concat('%'
-                  , #{name}
-                  , '%')
+                , bc.customerName
+                , bc.customerMobile) LIKE concat('%'
+                , #{name}
+                , '%')
             </if>
         </where>
     </select>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -1731,7 +1731,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         }
         if (r == 2) {
             // ToDo:驳回到发起人后再次提交
-            if (com.yxt.common.base.utils.StringUtils.isBlank(dto.getInstanceId())) {
+            if (StringUtils.isBlank(dto.getInstanceId())) {
                 return rb.setMsg("参数错误：instanceId");
             }
             bv.setTaskId(busMainDeposit.getTaskId());
@@ -1752,15 +1752,15 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
      */
     private synchronized int submitBusinessDepositData(SubmitVirtualOrderDepositDto dto, BusMainDeposit busMainDeposit) {
         int r = 0;
-        if (com.yxt.common.base.utils.StringUtils.isBlank(dto.getSid())) {
+        if (StringUtils.isBlank(dto.getVirtualOrderSid())) {
             r = 1;
         } else {
             if (busMainDeposit != null) {
                 String businessTaskId = busMainDeposit.getTaskId();
-                if (com.yxt.common.base.utils.StringUtils.isBlank(businessTaskId) && com.yxt.common.base.utils.StringUtils.isBlank(dto.getTaskId())) {
+                if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) {
                     //新提交
                     r = 1;
-                } else if (com.yxt.common.base.utils.StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) {
+                } else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) {
                     //二次提交//只有数据一致的时候才能进行下一步
                     r = 2;
                 }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -20,7 +20,7 @@ public enum ProcDefEnum {
     SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064" ),
     BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:6:457504"),//ToDo
     SALESORDER("销售订单审批流程", "process_p5ils2rn:4:490008"),
-    BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:3:365004"),//TODO
+    BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:4:495004"),//TODO
     BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:5:280004"),
     BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:1:400004"),
     SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:5:382504"), //TODO

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/SubmitDepositDto.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.virtualOrders.deposit;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -11,6 +12,7 @@ public class SubmitDepositDto extends DepositBuscenterDto{
     @ApiModelProperty("意见")
     private String comment;
     @ApiModelProperty("流程实例id")
+    @JsonProperty("procInsId")
     private String instanceId;
     @ApiModelProperty("任务id")
     private String taskId;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/VehicleCompleteDto.java

@@ -15,7 +15,6 @@ public class VehicleCompleteDto implements Dto {
     @NotBlank(message = "参数错误：userSid")
     private String userSid;
     @ApiModelProperty(value = "用户全路径sid")
-    @NotBlank(message = "参数错误：orgSidPath")
     private String orgSidPath;
     @ApiModelProperty(value = "节点id")
     @NotBlank(message = "参数错误：taskDefKey")