diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/flowable/ScmVirtualOrderDepositVehicleCompleteDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/flowable/ScmVirtualOrderDepositVehicleCompleteDto.java index 9a1e571d4c..f918b9dcde 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/flowable/ScmVirtualOrderDepositVehicleCompleteDto.java +++ b/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") diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java index 48b938628e..8f8cbe4917 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java +++ b/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 list = new ArrayList<>(); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml index 64c55eeab8..9dbf860264 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml @@ -5,21 +5,21 @@ - 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 ${ew.sqlSegment} and bmd.billNo LIKE concat('%' - , #{name} - , '%') + , #{name} + , '%') 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 ${ew.sqlSegment} and bdvc.customerName LIKE concat('%' - , #{name} - , '%') + , #{name} + , '%') 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 ${ew.sqlSegment} and bd.draweeName LIKE concat('%' - , #{name} - , '%') + , #{name} + , '%') + order by bmd.id desc @@ -183,7 +184,7 @@ UPDATE bus_main_deposit SET nodeState=#{nodeState} - , taskDefKey=#{taskDefKey} + , taskDefKey=#{taskDefKey} , procDefId=#{procDefId} @@ -288,21 +289,21 @@ --> diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index a6aed18f30..90b93d361f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/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