Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java

@@ -555,6 +555,9 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
     public ResultBean cancal(String sid,String cancalRemarks) {
         ResultBean rb = ResultBean.fireFail();
         BusVehicleOrder busVehicleOrder = fetchBySid(sid);
+        if(StringUtils.isBlank(cancalRemarks)){
+            return rb.setMsg("请填写作废说明");
+        }
         //查询采购订单是否已下线
         if(StringUtils.isNotBlank(busVehicleOrder.getOfflineDate())){
             return rb.setMsg("该采购订单已下线，不允许作废");

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

@@ -80,10 +80,6 @@ public interface BusMainDepositFeign {
     @PostMapping("/saveDepositVehicle")
     public ResultBean saveDepositVehicle(@Valid @RequestBody BusMainDepositVehicleDto dto);
 
-   /* @ApiOperation("修改虚拟订单（订金）信息")
-    @PostMapping("/updateDeposit/{sid}")
-    public ResultBean updateDeposit(@Valid @RequestBody BusDepositDto dto, @PathVariable("sid") String sid);*/
-
     @ApiOperation("修改虚拟订单（预定车辆）信息")
     @PostMapping("/updateDepositVehicle/{sid}")
     public ResultBean updateDepositVehicle(@Valid @RequestBody BusMainDepositVehicleDto dto, @PathVariable("sid") String sid);
@@ -116,16 +112,6 @@ public interface BusMainDepositFeign {
     @GetMapping("/selectDepositVehBySid/{sid}")
     ResultBean<BusMainDepositVehicleVo> selectDepositVehBySid(@PathVariable("sid") String sid);
 
-    /*************************************************PC虚拟订单审批流程***************************************************/
-
-    @ApiOperation("提交虚拟订单（订金）审批流程")
-    @PostMapping("/submitMainDespoitApprove")
-    public ResultBean submitMainDespoitApprove(@RequestBody @Valid BusDepositDto dto);
-
-    @ApiOperation("提交虚拟订单（预定车辆）审批流程")
-    @PostMapping("/submitMainDespoitVehicleApprove")
-    public ResultBean submitMainDespoitVehicleApprove(@RequestBody @Valid BusMainDepositVehicleDto dto);
-
 
     /*****************************************App端接口*********************************************/
 

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

@@ -76,11 +76,6 @@ public class BusMainDepositFeignFallback implements BusMainDepositFeign {
         return ResultBean.fireFail().setMsg("接口anrui-buscenter/busmaindeposit/saveDepositVehicle无法访问");
     }
 
-	/*@Override
-	public ResultBean updateDeposit(BusDepositDto dto, String sid){
-		return ResultBean.fireFail().setMsg("接口anrui-buscenter/busmaindeposit/updateDeposit无法访问");
-	}*/
-
     @Override
     public ResultBean updateDepositVehicle(BusMainDepositVehicleDto dto, String sid) {
         return ResultBean.fireFail().setMsg("接口anrui-buscenter/busmaindeposit/updateDepositVehicle无法访问");
@@ -125,78 +120,6 @@ public class BusMainDepositFeignFallback implements BusMainDepositFeign {
         return rb.setMsg("接口anrui-buscenter/busmaindeposit/selectDepositVehBySid无法访问");
     }
 
-    @Override
-    public ResultBean submitMainDespoitApprove(BusDepositDto dto) {
-        ResultBean rb = ResultBean.fireFail();
-        return rb.setMsg("接口anrui-buscenter/busmaindeposit/submitMainDespoitApprove无法访问");
-    }
-
-    @Override
-    public ResultBean submitMainDespoitVehicleApprove(BusMainDepositVehicleDto dto) {
-        ResultBean rb = ResultBean.fireFail();
-        return rb.setMsg("接口anrui-buscenter/busmaindeposit/submitMainDespoitVehicleApprove无法访问");
-    }
-//
-//    @Override
-//    public ResultBean submitAppMainDespoitApprove(AppBusDepositBuscenterDto dto) {
-//        return null;
-//    }
-//
-//    @Override
-//    public ResultBean reSubmitAppMainDespoitApprove(AppBusDepositBuscenterDto dto) {
-//        return null;
-//    }
-//
-//    @Override
-//    public ResultBean agreeDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
-//        return null;
-//    }
-//
-//    @Override
-//    public ResultBean recallDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
-//        return null;
-//    }
-//
-//    @Override
-//    public ResultBean rejectDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
-//        return null;
-//    }
-//
-//    @Override
-//    public ResultBean stopDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
-//        return null;
-//    }
-//
-//    @Override
-//    public ResultBean submitAppMainDespoitVehicleApprove(AppBusDepositVehicleDto dto) {
-//        return null;
-//    }
-//
-//    @Override
-//    public ResultBean reSubmitAppMainDespoitVehicleApprove(AppBusDepositVehicleDto dto) {
-//        return null;
-//    }
-//
-//    @Override
-//    public ResultBean agreeReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
-//        return null;
-//    }
-//
-//    @Override
-//    public ResultBean recallReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
-//        return null;
-//    }
-//
-//    @Override
-//    public ResultBean rejectReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
-//        return null;
-//    }
-//
-//    @Override
-//    public ResultBean stopReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
-//        return null;
-//    }
-
     @Override
     public ResultBean<PagerVo<AppBusMainDepositVo>> getVirtualOrders(PagerQuery<AppBusMainDepositQuery> pagerQuery) {
         return null;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -49,7 +49,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
 /**
- * Project: anrui-buscenter(业务管理) <br/>
+ * Project: anrui-buscenter(业务管理-销售订单) <br/>
  * File: BusSalesOrderFeign.java <br/>
  * Class: com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign <br/>
  * Description: 销售订单主表. <br/>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml

@@ -22,7 +22,9 @@
         transferStateValue
         FROM
         bus_discountpackage_handover
-        <where>${ew.sqlSegment}</where>
+        <where>${ew.sqlSegment}
+            ORDER BY transferStateKey ASC,createTime DESC
+        </where>
     </select>
 
     <select id="selectAppPageVo"

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

@@ -99,14 +99,6 @@ public class BusMainDepositRest implements BusMainDepositFeign {
         return busMainDepositService.saveDepositVehicle(dto);
     }
 
-    /*@Override
-    public ResultBean updateDeposit(BusDepositDto dto, String sid) {
-        if (dto.getPaymentProofList() != null && dto.getPaymentProofList().size() > 1) {
-            return new ResultBean().fail().setMsg("只可上传一张付款凭证");
-        }
-        return saveDeposit(dto);// busMainDepositService.updateDeposit(dto, sid);
-    }*/
-
     @Override
     public ResultBean updateDepositVehicle(BusMainDepositVehicleDto dto, String sid) {
         return busMainDepositService.updateDepositVehicle(dto, sid);
@@ -155,153 +147,11 @@ public class BusMainDepositRest implements BusMainDepositFeign {
         return busMainDepositService.selectDepositVehBySid(sid);
     }
 
-    /*************************************************虚拟订单审批流程***************************************************/
-
-    @Override
-    public ResultBean submitMainDespoitApprove(BusDepositDto dto) {
-        return busMainDepositService.submitMainDespoitApprove(dto);
-    }
-
-    @Override
-    public ResultBean submitMainDespoitVehicleApprove(BusMainDepositVehicleDto dto) {
-        return busMainDepositService.submitMainDespoitVehicleApprove(dto);
-    }
-
-    /*************************************************APP虚拟订单订金审批流程***************************************************/
-
-    /**
-     * 提交流程
-     *
-     * @param dto
-     * @return
-     */
-    /*@Override
-    public ResultBean submitAppMainDespoitApprove(AppBusDepositBuscenterDto dto) {
-        return busMainDepositService.submitAppMainDespoitApprove(dto);
-    }*/
-
-    /**
-     * 重新提交流程
-     *
-     * @param dto
-     * @return
-     */
-    /*@Override
-    public ResultBean reSubmitAppMainDespoitApprove(AppBusDepositBuscenterDto dto) {
-        return busMainDepositService.reSubmitAppMainDespoitApprove(dto);
-    }*/
 
-    /**
-     * 同意
-     *
-     * @param appBusMainDepositFlowTask
-     * @return
-     */
-   /* @Override
-    public ResultBean agreeDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
-        return busMainDepositService.agreeDeposit(appBusMainDepositFlowTask);
-    }*/
 
-    /**
-     * 撤回
-     *
-     * @param appBusMainDepositFlowTask
-     * @return
-     */
-    /*@Override
-    public ResultBean recallDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
-        return busMainDepositService.recallDeposit(appBusMainDepositFlowTask);
-    }*/
-
-    /**
-     * 驳回
-     *
-     * @param appBusMainDepositFlowTask
-     * @return
-     */
-    /*@Override
-    public ResultBean rejectDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
-        return busMainDepositService.rejectDeposit(appBusMainDepositFlowTask);
-    }*/
-
-    /**
-     * 驳回
-     *
-     * @param appBusMainDepositFlowTask
-     * @return
-     */
-    /*@Override
-    public ResultBean stopDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
-        return busMainDepositService.stopDeposit(appBusMainDepositFlowTask);
-    }*/
 
     /*************************************************APP虚拟订单预定车辆审批流程***************************************************/
-    /**
-     * 提交审批
-     *
-     * @param dto
-     * @return
-     */
-    /*@Override
-    public ResultBean submitAppMainDespoitVehicleApprove(AppBusDepositVehicleDto dto) {
-        return busMainDepositService.submitAppMainDespoitVehicleApprove(dto);
-    }*/
 
-    /**
-     * 从新提交审批
-     *
-     * @param dto
-     * @return
-     */
-    /*@Override
-    public ResultBean reSubmitAppMainDespoitVehicleApprove(AppBusDepositVehicleDto dto) {
-        return busMainDepositService.reSubmitAppMainDespoitVehicleApprove(dto);
-    }*/
-
-    /**
-     * 同意
-     *
-     * @param appBusMainDepositFlowTask
-     * @return
-     */
-    /*@Override
-    public ResultBean agreeReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
-        return busMainDepositService.agreeReserveCar(appBusMainDepositFlowTask);
-    }*/
-
-    /**
-     * 终止
-     *
-     * @param appBusMainDepositFlowTask
-     * @return
-     */
-   /* @Override
-    public ResultBean recallReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
-        return busMainDepositService.recallReserveCar(appBusMainDepositFlowTask);
-    }*/
-
-    /**
-     * 驳回
-     *
-     * @param appBusMainDepositFlowTask
-     * @return
-     */
-    /*@Override
-    public ResultBean rejectReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
-        return busMainDepositService.rejectReserveCar(appBusMainDepositFlowTask);
-    }*/
-
-    /**
-     * 撤回
-     *
-     * @param appBusMainDepositFlowTask
-     * @return
-     */
-    /*@Override
-    public ResultBean stopReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
-        return busMainDepositService.stopReserveCar(appBusMainDepositFlowTask);
-    }*/
-    /****************************************************************************************************/
     /**
      * 虚拟订单列表（新）
      *
@@ -319,9 +169,6 @@ public class BusMainDepositRest implements BusMainDepositFeign {
 
     @Override
     public ResultBean saveDepositInfo(AppBusDepositBuscenterDto dto) {
-//        if (dto.getPayImages() != null && dto.getPayImages().size() > 1) {
-//            return new ResultBean().fail().setMsg("只可上传一张付款凭证");
-//        }
         return busMainDepositService.saveDepositInfo(dto);
     }
 

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

@@ -171,9 +171,6 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
     @Autowired
     private BaseVehicleFeign baseVehicleFeign;
 
-    @Autowired
-    private FlowableService flowableService;
-
     @Autowired
     private FlowableFeign flowableFeign;
 
@@ -185,13 +182,9 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
     @Autowired
     BusDepositFictitiousService busDepositFictitiousService;
     @Autowired
-    private SysProUrlFeign sysProUrlFeign;
-    @Autowired
     private MessageFeign messageFeign;
     @Autowired
     private FinCollectionConfirmationFeign finCollectionConfirmationFeign;
-    @Autowired
-    private SysUserRoleFeign sysUserRoleFeign;
 
 
     public PagerVo<BusMainDeposit> listPage(PagerQuery<BusMainDepositQuery> pq) {
@@ -914,293 +907,6 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         return count;
     }
 
-    /**
-     * 提交虚拟订单审批（订金）流程
-     *
-     * @param dto
-     * @return
-     */
-    public ResultBean submitMainDespoitApprove(BusDepositDto dto) {
-//        String orgSid = checkUserOrg(dto.getUserSid());
-//        // String businessSid = dto.getSid();
-//        ResultBean resultBean1 = saveOrUpdateDeposit(dto);
-//        String businessSid = resultBean1.getData().toString();
-//        Map<String, Object> variables = new HashMap<>();
-//        variables.put("businessSid", businessSid);
-//        variables.put("isLoan", true);
-//        variables.put("orgSid", orgSid);//部门sid
-//        ResultBean resultBean = flowableService.businessStart(ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId(), dto.getUserSid(), variables);
-//        if (resultBean.getSuccess() && resultBean.getData() != null) {
-//            Map<String, String> map = (Map<String, String>) resultBean.getData();
-//            /*saveSysFormLink(map);*/
-//            //更新虚拟订单审批（订金）业务表中的流程状态
-//            modifiBusMainDepositFlowState(businessSid,
-//                    ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId(),//procDefId
-//                    map.get("nodeState"),//state
-//                    map.get("procInsId"),//procInstSid
-//                    map.get("taskDefKey")//nodeSid
-//            );
-//        }
-        return new ResultBean();
-    }
-
-//    private void modifiBusMainDepositFlowState(String businessSid,
-//                                               String proDefId,//procDefId
-//                                               String nodeState,//state
-//                                               String procInsId,//procInstSid
-//                                               String taskDefKey//nodeSid
-//    ) {
-//        baseMapper.modifiBusDepositFlowState(businessSid,
-//                proDefId,//procDefId
-//                nodeState,//state
-//                procInsId,//procInstSid
-//                taskDefKey);
-//    }
-    /*public ResultBean submitMainDespoitApprove(BusDepositDto dto) {
-        String orgSid = checkUserOrg(dto.getUserSid());
-        String businessSid = "";
-        if (StringUtils.isBlank(orgSid)) {
-            return new ResultBean().fail().setMsg("用户组织机构不能为空");
-        }
-        // 验证
-        if (StringUtils.isBlank(dto.getSid())) {
-            // 调用保存接口
-            ResultBean resultBean = saveDeposit(dto);
-            if (!resultBean.getSuccess()) {
-                return resultBean.setMsg("提交失败");
-            }
-            businessSid = resultBean.getData().toString();
-        } else {
-            // 调用更新接口
-            ResultBean resultBean = updateDeposit(dto, dto.getSid());
-            if (!resultBean.getSuccess()) {
-                return resultBean.setMsg("提交失败");
-            }
-            businessSid = dto.getSid();
-        }
-        // ???待完善(根据虚拟订单审批流程)
-        Map<String, Object> variables = new HashMap<>();
-        variables.put("businessSid", businessSid);
-        variables.put("isLoan", true);
-        variables.put("orgSid", orgSid);//部门sid
-        ResultBean resultBean = flowableService.businessStart(procDefEnum.ORDERDEPOSITAPPROVE.getProDefId(), dto.getUserSid(), variables);
-        if (resultBean.getSuccess() && resultBean.getData() != null) {
-            Map<String, String> map = (Map<String, String>) resultBean.getData();
-            saveSysFormLink(map);
-        }
-        return resultBean;
-    }*/
-
-    /**
-     * 保存流程业务关联表 数据
-     *
-     * @param map
-     */
-    private void saveSysFormLink(Map<String, String> map) {
-        String sid = map.get("sid");
-        ResultBean resultBean = sysFormLinkFeign.selectByBusinessSid(sid);
-        if (!resultBean.getSuccess()) { // 新增
-            SysFormLinkDto sysFormLinkDto = new SysFormLinkDto();
-            sysFormLinkDto.setBusinessSid(map.get("sid"));
-            sysFormLinkDto.setProcInsId(map.get("procInsId"));
-            sysFormLinkDto.setTaskDefKey(map.get("taskDefKey"));
-            sysFormLinkDto.setNodeState(map.get("nodeState"));
-            sysFormLinkDto.setFormType(SysFormLinkTypeEnum.ORDER_DEPOSIT_VEHICLE.getCode());
-//            sysFormLinkDto.setFlowState(Integer.parseInt(SysFormLinkFlowStateEnum.PROCESSING.getCode()));
-            sysFormLinkFeign.save(sysFormLinkDto);
-        } else { // 更新
-            Map<String, Object> updateMap = new HashMap<>();
-            updateMap.put("businessSid", sid);
-            updateMap.put("nodeState", map.get("nodeState"));
-            updateMap.put("taskDefKey", map.get("taskDefKey"));
-//            updateMap.put("flowState", SysFormLinkFlowStateEnum.PROCESSING.getCode());
-            sysFormLinkFeign.updateFiled(updateMap);
-        }
-
-    }
-
-    /**
-     * 检查用户是否设置部门
-     *
-     * @param userSid
-     * @return 返回部门sid
-     */
-    private String checkUserOrg(String userSid) {
-        String orgSid = "";
-        String staffSid = sysUserFeign.selectBySid(userSid).getData().getStaffSid();
-        ResultBean<String> resultBean = sysStaffOrgFeign.getSysStaffOrgSidListByStaffSid(staffSid);
-        if (resultBean.getSuccess()) {
-            orgSid = resultBean.getData();
-        }
-        return orgSid;
-    }
-
-    /**
-     * 提交虚拟订单审批（预定车辆）流程
-     *
-     * @param dto
-     * @return
-     */
-    public ResultBean submitMainDespoitVehicleApprove(BusMainDepositVehicleDto dto) {
-//        String orgSid = checkUserOrg(dto.getUserSid());
-//        String businessSid = "";
-//        if (StringUtils.isBlank(orgSid)) {
-//            return new ResultBean().fail().setMsg("用户组织机构不能为空");
-//        }
-//        // 验证
-//        if (StringUtils.isBlank(dto.getSid())) {
-//            // 调用保存接口
-//            ResultBean resultBean = saveDepositVehicle(dto);
-//            if (!resultBean.getSuccess()) {
-//                return resultBean.setMsg("提交失败");
-//            }
-//            businessSid = resultBean.getData().toString();
-//        } else {
-//            // 调用更新接口
-//            ResultBean resultBean = updateDepositVehicle(dto, dto.getSid());
-//            if (!resultBean.getSuccess()) {
-//                return resultBean.setMsg("提交失败");
-//            }
-//            businessSid = dto.getSid();
-//        }
-//        Map<String, Object> variables = new HashMap<>();
-//        variables.put("businessSid", businessSid);
-//        variables.put("isLoan", true);
-//        variables.put("orgSid", orgSid);
-//        ResultBean resultBean = flowableService.businessStart(ProcDefEnum.ORDERDEPOSITVEHICLEAPPROVE.getProDefId(), dto.getUserSid(), variables);
-//        if (resultBean.getSuccess() && resultBean.getData() != null) {
-//            Map<String, String> map = (Map<String, String>) resultBean.getData();
-//            saveSysFormLink(map);
-//        }
-        return new ResultBean();
-    }
-
-    /**
-     * APP提交虚拟订单审批（订金）流程
-     *
-     * @param dto
-     * @return
-     */
-    public ResultBean submitAppMainDespoitApprove(AppBusDepositBuscenterDto dto) {
-        String orgSid = checkUserOrg(dto.getUserSid());
-        String businessSid = "";
-        if (StringUtils.isBlank(orgSid)) {
-            return new ResultBean().fail().setMsg("用户组织机构不能为空");
-        }
-        // 验证
-        if (StringUtils.isBlank(dto.getVirtualOrderSid())) {
-            // 调用保存/修改接口
-            ResultBean resultBean = saveDepositInfo(dto);
-            if (!resultBean.getSuccess()) {
-                return resultBean.setMsg("提交失败");
-            }
-            businessSid = resultBean.getData().toString();
-        } else {
-            businessSid = dto.getVirtualOrderSid();
-        }
-        Map<String, Object> variables = new HashMap<>();
-        variables.put("businessSid", businessSid);
-        variables.put("isLoan", false);
-        variables.put("orgSid", orgSid);
-        ResultBean resultBean = flowableService.businessStart(ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId(), dto.getUserSid(), variables);
-        if (resultBean.getSuccess() && resultBean.getData() != null) {
-            Map<String, String> map = (Map<String, String>) resultBean.getData();
-            baseMapper.updateByNodeState(map.get("nodeState"), businessSid);
-            saveSysFormLink(map);
-        }
-        return new ResultBean().success();
-    }
-
-    /**
-     * APP重新提交虚拟订单审批（订金）流程
-     *
-     * @param dto
-     * @return
-     */
-    public ResultBean reSubmitAppMainDespoitApprove(AppBusDepositBuscenterDto dto) {
-
-        String businessSid = "";
-        if (StringUtils.isBlank(dto.getUserSid())) {
-            return new ResultBean().fail().setMsg("用户sid不能为空");
-        }
-        // 验证
-        if (StringUtils.isBlank(dto.getVirtualOrderSid())) {
-            // 调用保存/修改接口
-            ResultBean resultBean = saveDepositInfo(dto);
-            if (!resultBean.getSuccess()) {
-                return resultBean.setMsg("提交失败");
-            }
-            businessSid = resultBean.getData().toString();
-        } else {
-            businessSid = dto.getVirtualOrderSid();
-        }
-        Map<String, Object> variables = new HashMap<>();
-        variables.put("taskId", dto.getTaskId());
-        variables.put("procInsId", dto.getProcInsId());
-        variables.put("businessSid", businessSid);
-        variables.put("userSid", dto.getUserSid());
-        BusinessVariables bv = BusinessVariables.builder().build();
-        bv.setFormVariables(variables);
-        ResultBean<com.yxt.anrui.flowable.api.flowtask.FlowTask> resultBean = flowTaskFeign.businessComplete(bv);
-        if (!resultBean.getSuccess()) {
-            return resultBean;
-        }
-        String nodeState = "";
-        String taskDefKey = "";
-        Map<String, Object> paramMap = new HashMap<>();
-        paramMap.put("sid", variables.get("businessSid").toString());
-        if (resultBean.getData() != null) {
-            ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(resultBean.getData().getProcInsId());
-            if (listResultBean.getSuccess() && listResultBean.getData() != null && listResultBean.getData().size() != 0) {
-                nodeState = listResultBean.getData().get(0).getName_();
-                taskDefKey = listResultBean.getData().get(0).getTask_def_key_();
-            } else {
-                nodeState = ProcessStateEnum.FINISHED.getStateName();
-                taskDefKey = "Event_end";
-//                paramMap.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode());
-            }
-        }
-        paramMap.put("nodeState", nodeState);
-        paramMap.put("taskDefKey", taskDefKey);
-        updateFlowFiled(paramMap);
-        return resultBean;
-    }
-
-    /**
-     * APP提交虚拟订单审批（预定车辆）流程
-     *
-     * @param dto
-     * @return
-     */
-    public ResultBean submitAppMainDespoitVehicleApprove(AppBusDepositVehicleDto dto) {
-        String orgSid = checkUserOrg(dto.getUserSid());
-        String businessSid = "";
-        if (StringUtils.isBlank(orgSid)) {
-            return new ResultBean().fail().setMsg("用户组织机构不能为空");
-        }
-        // 验证
-        if (StringUtils.isBlank(dto.getVirtualOrderSid())) {
-            // 调用保存/修改接口
-            ResultBean resultBean = reserveCarInfo(dto);
-            if (!resultBean.getSuccess()) {
-                return resultBean.setMsg("提交失败");
-            }
-            businessSid = resultBean.getData().toString();
-        } else {
-            businessSid = dto.getVirtualOrderSid();
-        }
-        Map<String, Object> variables = new HashMap<>();
-        variables.put("businessSid", businessSid);
-        variables.put("isLoan", true);
-        variables.put("orgSid", orgSid);
-        ResultBean resultBean = flowableService.businessStart(ProcDefEnum.ORDERDEPOSITVEHICLEAPPROVE.getProDefId(), dto.getUserSid(), variables);
-        if (resultBean.getSuccess() && resultBean.getData() != null) {
-            Map<String, String> map = (Map<String, String>) resultBean.getData();
-            saveSysFormLink(map);
-        }
-        return new ResultBean().success();
-    }
-
     /**
      * 新增/修改虚拟订单（车辆预订）
      *
@@ -1295,140 +1001,6 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         return baseMapper.selBusMainDepositBySid(virtualOrderSid);
     }
 
-    /**
-     * 订金办理同意
-     *
-     * @param appBusMainDepositFlowTask
-     * @return
-     */
-    public ResultBean agreeDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
-        Map<String, Object> variables = new HashMap<>();
-        variables.put("taskId", appBusMainDepositFlowTask.getTaskId());
-        variables.put("procInsId", appBusMainDepositFlowTask.getProcInsId());
-        variables.put("comment", appBusMainDepositFlowTask.getComment());
-        variables.put("businessSid", appBusMainDepositFlowTask.getBusinessSid());
-        variables.put("userSid", appBusMainDepositFlowTask.getUserSid());
-        BusinessVariables bv = BusinessVariables.builder().build();
-        bv.setFormVariables(variables);
-        ResultBean<com.yxt.anrui.flowable.api.flowtask.FlowTask> resultBean = flowTaskFeign.businessComplete(bv);
-        if (!resultBean.getSuccess()) {
-            return resultBean;
-        }
-        String nodeState = "";
-        String taskDefKey = "";
-        Map<String, Object> paramMap = new HashMap<>();
-        paramMap.put("sid", variables.get("businessSid").toString());
-        if (resultBean.getData() != null) {
-            ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(resultBean.getData().getProcInsId());
-            if (listResultBean.getSuccess() && listResultBean.getData() != null && listResultBean.getData().size() != 0) {
-                nodeState = listResultBean.getData().get(0).getName_();
-                taskDefKey = listResultBean.getData().get(0).getTask_def_key_();
-            } else {
-                nodeState = ProcessStateEnum.FINISHED.getStateName();
-                taskDefKey = "Event_end";
-//                paramMap.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode());
-            }
-        }
-        paramMap.put("nodeState", nodeState);
-        paramMap.put("taskDefKey", taskDefKey);
-        updateFlowFiled(paramMap);
-        return resultBean;
-    }
-
-    /**
-     * 订金撤回
-     *
-     * @param appBusMainDepositFlowTask
-     * @return
-     */
-    public ResultBean recallDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
-        com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
-        String userSid = appBusMainDepositFlowTask.getUserSid();
-        String businessSid = appBusMainDepositFlowTask.getBusinessSid();
-        fl.setTaskId(appBusMainDepositFlowTask.getTaskId());
-        fl.setInstanceId(appBusMainDepositFlowTask.getProcInsId());
-        fl.setComment(appBusMainDepositFlowTask.getComment());
-        fl.setUserSid(userSid);
-        ResultBean<List<LatestTaskVo>> resultBean = flowTaskFeign.revokeProcess(fl);
-        if (!resultBean.getSuccess()) {
-            return resultBean;
-        }
-        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> paramMap = new HashMap<>();
-        paramMap.put("sid", businessSid);
-        if (incomingSourceRef.contains("start")) {
-//            paramMap.put("nodeState", SysFormLinkFlowStateEnum.UNCOMMITTED.getState());
-            paramMap.put("taskDefKey", taskDefKey);
-//            paramMap.put("flowState", SysFormLinkFlowStateEnum.UNCOMMITTED.getCode());
-        } else {
-            paramMap.put("nodeState", nodeState);
-            paramMap.put("taskDefKey", taskDefKey);
-        }
-        updateFlowFiled(paramMap);
-        return resultBean;
-    }
-
-    /**
-     * 订金驳回
-     *
-     * @param appBusMainDepositFlowTask
-     * @return
-     */
-    public ResultBean rejectDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
-        com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
-        String userSid = appBusMainDepositFlowTask.getUserSid();
-        String businessSid = appBusMainDepositFlowTask.getBusinessSid();
-        fl.setTaskId(appBusMainDepositFlowTask.getTaskId());
-        fl.setInstanceId(appBusMainDepositFlowTask.getProcInsId());
-        fl.setComment(appBusMainDepositFlowTask.getComment());
-        fl.setUserSid(userSid);
-        ResultBean<List<LatestTaskVo>> resultBean = flowTaskFeign.taskReject(fl);
-        if (!resultBean.getSuccess()) {
-            return resultBean;
-        }
-        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> paramMap = new HashMap<>();
-        paramMap.put("sid", businessSid);
-        paramMap.put("nodeState", nodeState);
-        paramMap.put("taskDefKey", taskDefKey);
-        if (incomingSourceRef.contains("start")) {
-//            paramMap.put("flowState", SysFormLinkFlowStateEnum.REJECT.getCode());
-        }
-        updateFlowFiled(paramMap);
-        return resultBean;
-    }
-
-    /**
-     * 订金终止流程
-     *
-     * @param appBusMainDepositFlowTask
-     * @return
-     */
-    public ResultBean stopDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
-        com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
-        String userSid = appBusMainDepositFlowTask.getUserSid();
-        String businessSid = appBusMainDepositFlowTask.getBusinessSid();
-        fl.setTaskId(appBusMainDepositFlowTask.getTaskId());
-        fl.setInstanceId(appBusMainDepositFlowTask.getProcInsId());
-        fl.setComment(appBusMainDepositFlowTask.getComment());
-        fl.setUserSid(userSid);
-        ResultBean resultBean = flowTaskFeign.breakProcess(fl);
-        if (!resultBean.getSuccess()) {
-            return resultBean;
-        }
-        Map<String, Object> paramMap = new HashMap<>();
-        paramMap.put("sid", businessSid);
-        paramMap.put("nodeState", String.valueOf(resultBean.getData()));
-        paramMap.put("taskDefKey", "Event_end");
-//        paramMap.put("flowState", SysFormLinkFlowStateEnum.BREAK.getCode());
-        updateFlowFiled(paramMap);
-        return resultBean;
-    }
-
     /**
      * 更新流程相关的状态
      *
@@ -1439,195 +1011,6 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         return baseMapper.updateFlowFiled(map);
     }
 
-    public ResultBean reSubmitAppMainDespoitVehicleApprove(AppBusDepositVehicleDto dto) {
-        String businessSid = "";
-        if (StringUtils.isBlank(dto.getUserSid())) {
-            return new ResultBean().fail().setMsg("用户sid");
-        }
-        // 验证
-        if (StringUtils.isBlank(dto.getVirtualOrderSid())) {
-            // 调用保存/修改接口
-            ResultBean resultBean = reserveCarInfo(dto);
-            if (!resultBean.getSuccess()) {
-                return resultBean.setMsg("提交失败");
-            }
-            businessSid = resultBean.getData().toString();
-        } else {
-            businessSid = dto.getVirtualOrderSid();
-        }
-        Map<String, Object> variables = new HashMap<>();
-        variables.put("taskId", dto.getTaskId());
-        variables.put("procInsId", dto.getProcInsId());
-        variables.put("businessSid", businessSid);
-        variables.put("userSid", dto.getUserSid());
-        BusinessVariables bv = BusinessVariables.builder().build();
-        bv.setFormVariables(variables);
-        ResultBean<com.yxt.anrui.flowable.api.flowtask.FlowTask> resultBean = flowTaskFeign.businessComplete(bv);
-        if (!resultBean.getSuccess()) {
-            return resultBean;
-        }
-        String nodeState = "";
-        String taskDefKey = "";
-        Map<String, Object> paramMap = new HashMap<>();
-        paramMap.put("sid", variables.get("businessSid").toString());
-        if (resultBean.getData() != null) {
-            ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(resultBean.getData().getProcInsId());
-            if (listResultBean.getSuccess() && listResultBean.getData() != null && listResultBean.getData().size() != 0) {
-                nodeState = listResultBean.getData().get(0).getName_();
-                taskDefKey = listResultBean.getData().get(0).getTask_def_key_();
-            } else {
-                nodeState = ProcessStateEnum.FINISHED.getStateName();
-                taskDefKey = "Event_end";
-//                paramMap.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode());
-            }
-        }
-        paramMap.put("nodeState", nodeState);
-        paramMap.put("taskDefKey", taskDefKey);
-        updateFlowFiled(paramMap);
-        return resultBean;
-    }
-
-    /**
-     * 预定车辆同意办理
-     *
-     * @param appBusMainDepositFlowTask
-     * @return
-     */
-    public ResultBean agreeReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
-
-        Map<String, Object> variables = new HashMap<>();
-        variables.put("taskId", appBusMainDepositFlowTask.getTaskId());
-        variables.put("procInsId", appBusMainDepositFlowTask.getProcInsId());
-        variables.put("comment", appBusMainDepositFlowTask.getComment());
-        variables.put("businessSid", appBusMainDepositFlowTask.getBusinessSid());
-        variables.put("userSid", appBusMainDepositFlowTask.getUserSid());
-        BusinessVariables bv = BusinessVariables.builder().build();
-        bv.setFormVariables(variables);
-        ResultBean<com.yxt.anrui.flowable.api.flowtask.FlowTask> resultBean = flowTaskFeign.businessComplete(bv);
-        if (!resultBean.getSuccess()) {
-            return resultBean;
-        }
-        String nodeState = "";
-        String taskDefKey = "";
-        Map<String, Object> paramMap = new HashMap<>();
-        paramMap.put("sid", variables.get("businessSid").toString());
-        if (resultBean.getData() != null) {
-            ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(resultBean.getData().getProcInsId());
-            if (listResultBean.getSuccess() && listResultBean.getData() != null && listResultBean.getData().size() != 0) {
-                nodeState = listResultBean.getData().get(0).getName_();
-                taskDefKey = listResultBean.getData().get(0).getTask_def_key_();
-            } else {
-                nodeState = ProcessStateEnum.FINISHED.getStateName();
-                taskDefKey = "Event_end";
-//                paramMap.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode());
-            }
-        }
-        paramMap.put("nodeState", nodeState);
-        paramMap.put("taskDefKey", taskDefKey);
-        updateFlowFiled(paramMap);
-        return resultBean;
-
-    }
-
-    /**
-     * 预定车辆撤回流程
-     *
-     * @param appBusMainDepositFlowTask
-     * @return
-     */
-    public ResultBean stopReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
-
-        com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
-        String userSid = appBusMainDepositFlowTask.getUserSid();
-        String businessSid = appBusMainDepositFlowTask.getBusinessSid();
-        fl.setTaskId(appBusMainDepositFlowTask.getTaskId());
-        fl.setInstanceId(appBusMainDepositFlowTask.getProcInsId());
-        fl.setComment(appBusMainDepositFlowTask.getComment());
-        fl.setUserSid(userSid);
-        ResultBean<List<LatestTaskVo>> resultBean = flowTaskFeign.revokeProcess(fl);
-        if (!resultBean.getSuccess()) {
-            return resultBean;
-        }
-        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> paramMap = new HashMap<>();
-        paramMap.put("sid", businessSid);
-        if (incomingSourceRef.contains("start")) {
-//            paramMap.put("nodeState", SysFormLinkFlowStateEnum.UNCOMMITTED.getState());
-            paramMap.put("taskDefKey", taskDefKey);
-//            paramMap.put("flowState", SysFormLinkFlowStateEnum.UNCOMMITTED.getCode());
-        } else {
-            paramMap.put("nodeState", nodeState);
-            paramMap.put("taskDefKey", taskDefKey);
-        }
-        updateFlowFiled(paramMap);
-        return resultBean;
-
-    }
-
-    /**
-     * 预定车辆驳回任务
-     *
-     * @param appBusMainDepositFlowTask
-     * @return
-     */
-    public ResultBean rejectReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
-
-        com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
-        String userSid = appBusMainDepositFlowTask.getUserSid();
-        String businessSid = appBusMainDepositFlowTask.getBusinessSid();
-        fl.setTaskId(appBusMainDepositFlowTask.getTaskId());
-        fl.setInstanceId(appBusMainDepositFlowTask.getProcInsId());
-        fl.setComment(appBusMainDepositFlowTask.getComment());
-        fl.setUserSid(userSid);
-        ResultBean<List<LatestTaskVo>> resultBean = flowTaskFeign.taskReject(fl);
-        if (!resultBean.getSuccess()) {
-            return resultBean;
-        }
-        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> paramMap = new HashMap<>();
-        paramMap.put("sid", businessSid);
-        paramMap.put("nodeState", nodeState);
-        paramMap.put("taskDefKey", taskDefKey);
-        if (incomingSourceRef.contains("start")) {
-//            paramMap.put("flowState", SysFormLinkFlowStateEnum.REJECT.getCode());
-        }
-        updateFlowFiled(paramMap);
-        return resultBean;
-
-    }
-
-    /**
-     * 预定车辆终止任务
-     *
-     * @param appBusMainDepositFlowTask
-     * @return
-     */
-    public ResultBean recallReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
-
-        com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
-        String userSid = appBusMainDepositFlowTask.getUserSid();
-        String businessSid = appBusMainDepositFlowTask.getBusinessSid();
-        fl.setTaskId(appBusMainDepositFlowTask.getTaskId());
-        fl.setInstanceId(appBusMainDepositFlowTask.getProcInsId());
-        fl.setComment(appBusMainDepositFlowTask.getComment());
-        fl.setUserSid(userSid);
-        ResultBean resultBean = flowTaskFeign.breakProcess(fl);
-        if (!resultBean.getSuccess()) {
-            return resultBean;
-        }
-        Map<String, Object> paramMap = new HashMap<>();
-        paramMap.put("sid", businessSid);
-        paramMap.put("nodeState", String.valueOf(resultBean.getData()));
-        paramMap.put("taskDefKey", "Event_end");
-//        paramMap.put("flowState", SysFormLinkFlowStateEnum.BREAK.getCode());
-        updateFlowFiled(paramMap);
-        return resultBean;
-
-    }
 
     /**
      * 销售订单-虚拟订单分页列表
@@ -1716,8 +1099,6 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             }
         }
         qw.eq("bd.staffSid", query.getStaffSid());
-//        qw.eq("bc.customerSid", query.getCustomerSid());
-//        qw.eq("bd.state", 1);
         qw.eq("bmd.depositBillTypeKey", "01");
         //查询已审核通过的款项确认
         ResultBean<List<String>> stringList = finCollectionConfirmationFeign.billeNoList();
@@ -1780,7 +1161,6 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         }
         qw.eq("bc.customerSid", query.getCustomerSid());
         qw.eq("bd.depositBillTypeKey", "02");
-//        qw.eq("bd.state", 1);
         qw.eq("bd.nodeState", FlowComment.SETTLE.getRemark());//已办结
         return qw;
     }
@@ -1843,30 +1223,6 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         variables.put("app", appMap);
         //流程定义id
         bv.setModelId(ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId());
-        //根据员工的sid查询员工的角色
-        /*String userSid = dto.getUserSid();
-        ResultBean<List<String>> userRoleList = sysUserRoleFeign.getUserRoleSidByUserSid(userSid);
-        UserRoleQuery userRoleQuery = new UserRoleQuery();
-        if (userRoleList.getData().size() > 0) {
-            userRoleQuery.setRoleSid(userRoleList.getData().get(0));
-        }
-        userRoleQuery.setOrgSid(staffOrgResultBean.getData().getOrgSid());
-        ResultBean<List<SysUserVo>> listResultBean = sysUserFeign.getUserByOrgRole(userRoleQuery);
-        if (!listResultBean.getSuccess()) {
-            return rb.setMsg(listResultBean.getMsg());
-        }
-        List<SysUserVo> sysUserVos = listResultBean.getData();
-        sysUserVos.removeAll(Collections.singleton(null));
-        if (sysUserVos.isEmpty()) {
-            return rb.setMsg("下一环节没有用户");
-        }
-        StringBuilder nextNodeUserSids = new StringBuilder();
-        for (SysUserVo su : sysUserVos) {
-            nextNodeUserSids.append(su.getSid()).append(",");
-        }
-        //符合条件的用户的sid,拼接的字符串
-        String nextNodeUserSids_ = nextNodeUserSids.toString();
-        bv.setNextNodeUserSids(nextNodeUserSids_);*/
         List<String> orgPathList = Arrays.asList(orgSidPath.split("/"));
         SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData();
         if (sysOrganization == null) {
@@ -2020,30 +1376,6 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         variables.put("app", appMap);
         //流程定义id
         bv.setModelId(ProcDefEnum.ORDERDEPOSITVEHICLEAPPROVE.getProDefId());
-        //根据员工的sid查询员工的角色
-        /*String userSid = dto.getUserSid();
-        ResultBean<List<String>> userRoleList = sysUserRoleFeign.getUserRoleSidByUserSid(userSid);
-        UserRoleQuery userRoleQuery = new UserRoleQuery();
-        if (userRoleList.getData().size() > 0) {
-            userRoleQuery.setRoleSid(userRoleList.getData().get(0));
-        }
-        userRoleQuery.setOrgSid(staffOrgResultBean.getData().getOrgSid());
-        ResultBean<List<SysUserVo>> listResultBean = sysUserFeign.getUserByOrgRole(userRoleQuery);
-        if (!listResultBean.getSuccess()) {
-            return rb.setMsg(listResultBean.getMsg());
-        }
-        List<SysUserVo> sysUserVos = listResultBean.getData();
-        sysUserVos.removeAll(Collections.singleton(null));
-        if (sysUserVos.isEmpty()) {
-            return rb.setMsg("下一环节没有用户");
-        }
-        StringBuilder nextNodeUserSids = new StringBuilder();
-        for (SysUserVo su : sysUserVos) {
-            nextNodeUserSids.append(su.getSid()).append(",");
-        }
-        //符合条件的用户的sid,拼接的字符串
-        String nextNodeUserSids_ = nextNodeUserSids.toString();
-        bv.setNextNodeUserSids(nextNodeUserSids_);*/
         List<String> orgPathList = Arrays.asList(orgSidPath.split("/"));
         SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData();
         if (sysOrganization == null) {
@@ -2344,7 +1676,6 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                         String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
                         String nextName = listResultBean.getData().get(0).getName_();
                         List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-//                        if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.get().getCreateBySid())) {
                         if ("销售专员申请".equals(nextName)) {
                             messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
                         } else {
@@ -2358,7 +1689,6 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                         String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
                         String nextName = listResultBean.getData().get(0).getName_();
                         List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-//                        if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.get().getCreateBySid())) {
                         if ("销售专员申请".equals(nextName)) {
                             //更新已选择的车架号的状态为未锁定
                             AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(query.getBusinessSid()).getData();
@@ -2404,7 +1734,6 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                 String nextName = listResultBean.getData().get(0).getName_();
                 List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
                 if (DictCommonEnum.DepositBillType.JYDD_DC.getCode().equals(busMainDeposit.getDepositBillTypeKey())) {
-//                    if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.getCreateBySid())) {
                     if ("销售专员申请".equals(nextName)) {
                         //更新已选择的车架号的状态为未锁定
                         AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(query.getBusinessSid()).getData();

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java

@@ -42,7 +42,7 @@ import javax.validation.Valid;
 import java.util.List;
 
 /**
- * Project: anrui-fin(销售相关) <br/>
+ * Project: anrui-fin(款项申请) <br/>
  * File: FinCollectionConfirmationFeign.java <br/>
  * Class: com.yxt.anrui.fin.api.fincollectionconfirmation.finCollectionConfirmationFeign <br/>
  * Description: 收款确认表. <br/>

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java

@@ -36,7 +36,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 /**
- * Project: anrui-fin(销售相关) <br/>
+ * Project: anrui-fin(应收未收款项明细表) <br/>
  * File: FinUncollectedReceivablesDetailedFeign.java <br/>
  * Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign <br/>
  * Description: 应收未收款项明细表. <br/>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@@ -196,8 +196,6 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
             String createBySid = query.getCreateBySid();
             useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(createBySid).getData();
         }
-//        BigDecimal bigDecimal = new BigDecimal("0");
-//        qw.ne("currentReceivableMoney", bigDecimal);
         qw.eq("furd.useOrgSid",useOrgSid);
         qw.eq("furd.createBySid", query.getCreateBySid());
         String[] sids = query.getSids();
@@ -226,8 +224,6 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         if (StringUtils.isNotBlank(query.getSubscriptionState())) {
             qw.eq("furd.subscriptionState", query.getSubscriptionState());
         }
-  /*      //当前应收金额
-        qw.gt("currentReceivableMoney", new BigDecimal("0"));*/
         String createStartTime = query.getCreateStartTime();
         String createEndTime = query.getCreateEndTime();
         qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (furd.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
@@ -238,43 +234,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         } else {
             qw.eq("furd.purchaseSystemSid", "0");
         }
-//        QueryWrapper<FinUncollectedReceivablesDetailed> qw = createQueryWrapper(query);
         List<DetailsOfReceivablesAndUncollectedItemsVo> list = baseMapper.selectListAllVo(qw);
-        /*list.removeAll(Collections.singleton(null));
-        if (!list.isEmpty()) {
-            for (DetailsOfReceivablesAndUncollectedItemsVo v : list) {
-                v.setSubscribedOf(0);
-                String busVinSid = v.getBusVinSid();
-                ResultBean<BusSalesOrderVehicle> resultBean = busSalesOrderVehicleFeign.details(busVinSid);
-                if (resultBean.getData() != null) {
-                    v.setReceivablesSid(v.getSid());
-                    String vinNo = resultBean.getData().getLinkNo();
-                    String vinSid = resultBean.getData().getLinkSid();
-                    String temporaryNo = resultBean.getData().getTemporaryNo();
-                    v.setVIN(vinNo);
-                    if (StringUtils.isNotBlank(vinNo)) {
-                        v.setVIN(vinNo.substring(vinNo.length() - 8));
-                    } else {
-                        if ("2".equals(v.getPayTypeKey())) {
-                            v.setVIN(temporaryNo.substring(temporaryNo.length() - 2));
-                        } else {
-                            v.setVIN(temporaryNo);
-                        }
-                    }
-                }
-                //查询当前应收:应收金额-所有认款的余额=剩余应收金额
-                String receivablesSid = v.getReceivablesSid();
-                String balanceSum = finSelectedReceivablesDetailedService.selectBalanceByReceivedSid(receivablesSid);
-                String reveivableMoney = v.getReveivableMoney();
-                String currentReceivableMoney = new BigDecimal(reveivableMoney).subtract(new BigDecimal(balanceSum)).toString();
-                v.setCurrentReceivableMoney(currentReceivableMoney);
-
-            }
-        }
-        if (StringUtils.isNotBlank(query.getVinNo())) {
-            list = list.stream().filter(v -> v.getVIN().contains(query.getVinNo())).collect(Collectors.toList());
-        }
-        list = list.stream().sorted(Comparator.comparing(DetailsOfReceivablesAndUncollectedItemsVo::getContractNo).reversed()).collect(Collectors.toList());*/
         return list;
     }