修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java

@@ -28,6 +28,7 @@ package com.yxt.anrui.base.api.basevehicletempstate;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import feign.Param;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -99,4 +100,9 @@ public interface BaseVehicleTempstateFeign {
     @GetMapping("/getList")
     @ResponseBody
     ResultBean<List<BaseVehicleTempstate>> getList(@RequestParam("tempStateKey")String tempStateKey);
+
+    @ApiOperation("查询状态")
+    @GetMapping("/selectByVinSidAndType")
+    @ResponseBody
+    ResultBean<BaseVehicleTempstate> selectByVinSidAndType(@RequestParam("carSid") String carSid, @Param("tempstateKey") String tempstateKey);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeignFallback.java

@@ -90,6 +90,11 @@ public class BaseVehicleTempstateFeignFallback implements BaseVehicleTempstateFe
 		return null;
 	}
 
+	@Override
+	public ResultBean<BaseVehicleTempstate> selectByVinSidAndType(String carSid, String tempstateKey) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<Integer> selectByVin(String vin) {
 		return null;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.java

@@ -75,4 +75,7 @@ public interface BaseVehicleTempstateMapper extends BaseMapper<BaseVehicleTempst
     Integer selectByVin(@Param("vin") String vin);
 
     List<BaseVehicleTempstate> getList(String tempStateKey);
+
+    @Select("select * from base_vehicle_tempstate where vehSid = #{carSid} and tempStateKey = #{key} limit 1")
+    BaseVehicleTempstate selectByVinSidAndType(@Param("carSid") String carSid, @Param("key") String tempstateKey);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateRest.java

@@ -122,6 +122,13 @@ public class BaseVehicleTempstateRest implements BaseVehicleTempstateFeign {
         return rb.success().setData(baseVehicleTempstates);
     }
 
+    @Override
+    public ResultBean<BaseVehicleTempstate> selectByVinSidAndType(String carSid, String tempstateKey) {
+        ResultBean<BaseVehicleTempstate> rb = ResultBean.fireFail();
+        BaseVehicleTempstate count = baseVehicleTempstateService.selectByVinSidAndType(carSid,tempstateKey);
+        return rb.setData(count);
+    }
+
     @Override
     public ResultBean<Integer> selectByVin(String vin) {
         ResultBean<Integer> rb = ResultBean.fireFail();

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateService.java

@@ -129,4 +129,8 @@ public class BaseVehicleTempstateService extends MybatisBaseService<BaseVehicleT
     public Integer selectByVin(String vin) {
         return baseMapper.selectByVin(vin);
     }
+
+    public BaseVehicleTempstate selectByVinSidAndType(String carSid, String tempstateKey) {
+        return baseMapper.selectByVinSidAndType(carSid,tempstateKey);
+    }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java

@@ -1,15 +1,11 @@
 package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
 
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceDto;
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceInfoVo;
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceVinDto;
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppCompleteAdvanceInvoiceDto;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
@@ -87,10 +83,10 @@ public interface BusArrearsCarryVehicleApplyFeign {
     @ResponseBody
     public ResultBean<AppArrearsCarryInfoVo> initArrearsApply(@SpringQueryMap AppAdvanceArrearsInfoQuery query);
 
-    @ApiOperation("移动端-新增欠款提车申请")
+ /*   @ApiOperation("移动端-新增欠款提车申请")
     @PostMapping("/addArrearsApply")
     @ResponseBody
-    public ResultBean addArrearsApply(@Valid @RequestBody AppArrearsCarryVinDto dto);
+    public ResultBean addArrearsApply(@Valid @RequestBody AppArrearsCarryVinDto dto);*/
 
     @ApiOperation("移动端-保存欠款提车申请")
     @PostMapping("/saveArrearsApply")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java

@@ -1,6 +1,5 @@
 package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
 
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppCompleteAdvanceInvoiceDto;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -82,10 +81,10 @@ public class BusArrearsCarryVehicleApplyFeignFallback implements BusArrearsCarry
 		return null;
 	}
 
-	@Override
+	/*@Override
 	public ResultBean addArrearsApply(AppArrearsCarryVinDto dto) {
 		return null;
-	}
+	}*/
 
 	@Override
 	public ResultBean saveArrearsApply(AppArrearsCarryDto dto) {

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyPageVo.java

@@ -25,11 +25,11 @@ public class BusArrearsCarryVehicleApplyPageVo implements Vo {
     @ApiModelProperty("车型名称")
     private String modelName;
 
-//    @ApiModelProperty("欠款金额")
-//    private BigDecimal arrearsMoney;
+    @ApiModelProperty("欠款金额")
+    private String arrearsMoney;
 
-    @ApiModelProperty("累计欠款金额")
-    private BigDecimal cumulativeArrearsMoney;
+/*    @ApiModelProperty("累计欠款金额")
+    private BigDecimal cumulativeArrearsMoney;*/
 
     @ApiModelProperty("承诺回款日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppCompleteAdvanceArrearsDto.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 public class AppCompleteAdvanceArrearsDto implements Dto {
@@ -14,7 +15,7 @@ public class AppCompleteAdvanceArrearsDto implements Dto {
     @NotBlank(message = "参数错误：userSid")
     private String userSid;
     @ApiModelProperty(value = "用户全路径sid")
-    @NotBlank(message = "参数错误：orgSidPath")
+//    @NotBlank(message = "参数错误：orgSidPath")
     private String orgSidPath;
     @ApiModelProperty(value = "节点id")
     @NotBlank(message = "参数错误：taskDefKey")
@@ -30,6 +31,4 @@ public class AppCompleteAdvanceArrearsDto implements Dto {
     @ApiModelProperty(value = "业务sid")
     @NotBlank(message = "参数错误：businessSid")
     private String businessSid;
-//    @ApiModelProperty(value = "暂不确定是不是需要前端传的：还是有分支的时候传？？")
-//    private Map<String, Object> formVariables;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppSubmitAdvanceArrearsDto.java

@@ -8,8 +8,6 @@ import lombok.Data;
 public class AppSubmitAdvanceArrearsDto extends AppArrearsCarryDto {
     private static final long serialVersionUID = 9148028768206972924L;
     
-    @ApiModelProperty("意见")
-    private String comment;
     @ApiModelProperty("流程实例id")
     private String instanceId;
     @ApiModelProperty("任务id")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/GetNodeQuery.java

@@ -14,6 +14,8 @@ public class GetNodeQuery implements Query {
     @NotBlank(message = "参数错误：taskDefKey")
     private String taskDefKey;
 
+    private String businessSid;
+
 //    @ApiModelProperty(value = "分支字段及业务字段")
 //    private Map<String, Object> formVariables;
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml

@@ -9,18 +9,19 @@
             resultType="com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyPageVo">
         SELECT
         bacva.sid,
+        if(length(bacva.nodeState)>0,bacva.nodeState,'待提交') as nodeState,
         <!-- 合同编号 -->
         bacva.contractNo,
         <!-- 客户名称 -->
         bacva.customerName,
         <!-- 车型名称 -->
         bacva.modelName,
-        <!-- 累计欠款金额 -->
-        bacva.cumulativeArrearsMoney,
+        <!-- 欠款金额 -->
+        bacva.arrearsMoney,
         <!-- 承诺回款日期 -->
         bacva.commitmentMoneyDate,
         <!-- 申请日期 -->
-        bacva.applyDate,
+        DATE_FORMAT(bacva.createTime,'%Y-%m-%d') AS applyDate,
         <!-- 申请人 -->
         bacva.applyName
         FROM bus_arrears_carry_vehicle_apply bacva

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java

@@ -165,10 +165,10 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp
         return busArrearsCarryVehicleApplyService.initArrearsApply(query);
     }
 
-    @Override
+/*    @Override
     public ResultBean addArrearsApply(AppArrearsCarryVinDto dto) {
         return busArrearsCarryVehicleApplyService.addArrearsApply(dto);
-    }
+    }*/
 
     @Override
     public ResultBean saveArrearsApply(AppArrearsCarryDto dto) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@@ -12,6 +12,8 @@ import com.yxt.anrui.base.api.basetrailer.TrailerVo;
 import com.yxt.anrui.base.api.basetrailer.TraliveredVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
+import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstate;
+import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
@@ -59,7 +61,6 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
-import com.yxt.anrui.portal.api.sysuser.UserQuery;
 import com.yxt.anrui.portal.api.sysuser.UserRoleQuery;
 import com.yxt.common.base.config.component.DocPdfComponent;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -69,7 +70,9 @@ import com.yxt.common.base.utils.WordConvertUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.messagecenter.api.message.*;
+import com.yxt.messagecenter.api.message.MessageFeign;
+import com.yxt.messagecenter.api.message.MessageFlowVo;
+import com.yxt.messagecenter.api.message.MessageFlowableQuery;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -1049,14 +1052,14 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
             busArrearsCarryVehicleApply.setUseOrgSid(useOrgSid);
             SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
-            if(sysOrganizationVo != null){
+            if (sysOrganizationVo != null) {
                 busArrearsCarryVehicleApply.setUseOrgName(sysOrganizationVo.getName());
             }
             BigDecimal arearsMoney = BigDecimal.ZERO;
-            if(StringUtils.isNotBlank(dto.getContractMoney())){
+            if (StringUtils.isNotBlank(dto.getContractMoney())) {
                 arearsMoney = new BigDecimal(dto.getContractMoney());
             }
-            if(StringUtils.isNotBlank(dto.getContractCollectionMoney())){
+            if (StringUtils.isNotBlank(dto.getContractCollectionMoney())) {
                 arearsMoney = arearsMoney.subtract(new BigDecimal(dto.getContractCollectionMoney()));
             }
             busArrearsCarryVehicleApply.setArrearsMoney(arearsMoney);
@@ -1229,20 +1232,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
 
     public ResultBean submitAdvanceArrearsInfo(AppSubmitAdvanceArrearsDto dto) {
         ResultBean rb = ResultBean.fireFail();
-       /* //根据用户sid获取staffSid
-        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
-        if (!userVoResultBean.getSuccess()) {
-            return rb.setMsg(userVoResultBean.getMsg());
-        }
-        //根据staffSid获取用户的组织全路径
-        ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
-        if (!staffOrgResultBean.getSuccess()) {
-            return rb.setMsg(staffOrgResultBean.getMsg());
-        }
         //用户的组织全路径
-        String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
-        dto.setOrgSidPath(orgSidPath);
-        BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(dto.getContractSid());
+        String orgSidPath = dto.getOrgPath();
+        BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(dto.getSid());
         int r = submitBusinessData(dto, busArrearsCarryVehicleApply);
         if (r == 3) {
             return rb.setMsg("该申请不存在");
@@ -1251,25 +1243,30 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             return rb.setMsg("操作失败!提交的数据不一致");
         }
         //查询该申请中的车架号是否被锁定
-        List<AdCarListDto> carList = dto.getCarList();
-        for (AdCarListDto adCarListDto : carList) {
-            Integer count = baseVehicleTempstateFeign.selectByVin(adCarListDto.getVin()).getData();
-            if (count > 0) {
-                return rb.setMsg("该申请车架号中存在审核中，请重新选择！");
+        List<AdCarListVo> carList = dto.getVinList();
+        List<String> vinSidi = new ArrayList<>();
+        boolean isT = false;
+        for (AdCarListVo adCarListDto : carList) {
+            BaseVehicleTempstate count = baseVehicleTempstateFeign.selectByVinSidAndType(adCarListDto.getCarSid(), VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()).getData();
+            if (count != null) {
+                vinSidi.add(count.getVinNo());
+                isT = true;
             }
         }
+        if (isT) {
+            return rb.setMsg(String.join(",", vinSidi) + "已存在提交的申请");
+        }
         //新增修改保存
         ResultBean<String> resultBean = saveArrearsApply(dto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }
         String businessSid = resultBean.getData();
-
         BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
         baseVehicleTempstateDto.setBusSid(businessSid);
         baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode());
         baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getRemarks());
-        baseVehicleTempstateDto.setTempKey("1");
+        baseVehicleTempstateDto.setTempKey("0");
         baseVehicleTempstateDto.setTempValue("待审核");
         List<BusArrearsCarryVehicleDetailsVo> busArrearsCarryVehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid());
         for (BusArrearsCarryVehicleDetailsVo busArrearsCarryVehicleDetailsVo : busArrearsCarryVehicleDetailsVos) {
@@ -1292,12 +1289,20 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         //若app移动端有此功能，则传递appMap参数
         Map<String, Object> appMap = new HashMap<>();
         //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
-        appMap.put("contractSid", businessSid);
+        appMap.put("sid", businessSid);
         variables.put("app", appMap);
+        if (StringUtils.isNotBlank(dto.getIsFinance())) {
+            variables.put("jinrong", "1".equals(dto.getIsFinance()));
+        } else {
+            variables.put("jinrong", false);
+        }
         //流程定义id
         bv.setModelId(ProcDefEnum.ARREARSCARRYVEHICLE.getProDefId());
         if (r == 1) {
             ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+            if (!voResultBean.getSuccess()) {
+                return rb.setMsg(voResultBean.getMsg());
+            }
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
             //极光推送
@@ -1321,10 +1326,10 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             }
             bv.setTaskId(busArrearsCarryVehicleApply.getTaskId());
             bv.setTaskDefKey(busArrearsCarryVehicleApply.getTaskDefKey());
-            bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
+            bv.setComment("重新提交");
             bv.setInstanceId(dto.getInstanceId());
             return complete(bv);
-        }*/
+        }
         return rb;
     }
 
@@ -1336,7 +1341,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
      */
     private synchronized int submitBusinessData(AppSubmitAdvanceArrearsDto dto, BusArrearsCarryVehicleApply busArrearsCarryVehicleApply) {
         int r = 0;
-        /*if (StringUtils.isBlank(dto.getContractSid())) {
+        if (StringUtils.isBlank(dto.getSid())) {
             r = 1;
         } else {
             if (busArrearsCarryVehicleApply != null) {
@@ -1352,7 +1357,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 r = 3;
             }
 
-        }*/
+        }
         return r;
     }
 
@@ -1368,17 +1373,30 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
 
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
-        SysUserVo sysUserVo = sysUserFeign.fetchBySid(bv.getUserSid()).getData();
         BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(bv.getBusinessSid());
         Map<String, Object> variables = new HashMap<>();
         Map<String, Object> appMap = new HashMap<>();
-        appMap.put("contractSid", bv.getBusinessSid());
+        appMap.put("sid", bv.getBusinessSid());
         variables.put("app", appMap);
-        bv.setFormVariables(variables);
-        if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getOrgSidPath())) {
-            bv.setOrgSidPath(busArrearsCarryVehicleApply.getOrgSidPath());
+        if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getIsFinance())) {
+            variables.put("jinrong", "1".equals(busArrearsCarryVehicleApply.getIsFinance()));
         } else {
-            return rb.setMsg("orgSidPath 为空！");
+            variables.put("jinrong", false);
+        }
+        bv.setFormVariables(variables);
+        bv.setOrgSidPath(busArrearsCarryVehicleApply.getOrgSidPath());
+        bv.setModelId(busArrearsCarryVehicleApply.getProcDefId());
+        if ("Activity_0tieuz3".equals(bv.getTaskDefKey())) {
+            //销售内勤审批
+
+        }
+        if ("Activity_0ynxtyz".equals(bv.getTaskDefKey())) {
+            //销售部经理审批上传信审
+
+        }
+        if ("Activity_03na1gk".equals(bv.getTaskDefKey())) {
+            //金融部经理审批
+            bv.setNextNodeUserSids(busArrearsCarryVehicleApply.getFinanceUserSid());
         }
         if (bv.getTaskId().equals(busArrearsCarryVehicleApply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
@@ -1403,14 +1421,24 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 messageFlowableQuery.setMsgTitle("欠款提车申请");
                 ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
             } else {
-                AppScmMessageFlowableQuery query = new AppScmMessageFlowableQuery();
-                Map<String, Object> appMaps = new HashMap<>();
-                appMaps.put("contractSid", busArrearsCarryVehicleApply.getSid());
-                List<String> recipientSidList = new ArrayList<>();
-
+                List<BusArrearsCarryVehicleDetails> carList = busArrearsCarryVehicleDetailsService.selectDetailsByApplySid(bv.getBusinessSid());
+                for (BusArrearsCarryVehicleDetails adCarListDto : carList) {
+                    BaseVehicleTempstate count = baseVehicleTempstateFeign.selectByVinSidAndType(adCarListDto.getVinSid(), VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()).getData();
+                    if (count != null) {
+                        BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
+                        baseVehicleTempstateDto.setSid(count.getSid());
+                        baseVehicleTempstateDto.setBusSid(bv.getBusinessSid());
+                        baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode());
+                        baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getRemarks());
+                        baseVehicleTempstateDto.setTempKey("1");
+                        baseVehicleTempstateDto.setTempValue("审核通过");
+                        baseVehicleTempstateDto.setVehSid(adCarListDto.getVinSid());
+                        baseVehicleTempstateDto.setVinNo(adCarListDto.getVinNo());
+                        baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
+                    }
+                }
                 //修改状态
                 baseMapper.updateType(bv.getBusinessSid());
-
                 //推送出库申请
                 List<BusArrearsCarryVehicleDetailsVo> vehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid());
                 if (vehicleDetailsVos.size() > 0) {
@@ -1437,7 +1465,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                     }
                 }
 
-                // 风控中心风控经理
+               /* // 风控中心风控经理
                 UserRoleQuery userRoleQuery1 = new UserRoleQuery();
                 userRoleQuery1.setRoleSid("967e63b0-3b7a-49ed-b42a-d4f904ab84f4");
                 List<SysUserVo> list4 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery1).getData();
@@ -1483,7 +1511,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 query.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028");
                 query.setName("业务");
                 // 消息推送
-                messageFeign.sendAutoserviceMessage(query);
+                messageFeign.sendAutoserviceMessage(query);*/
             }
             return rb.success().setData(resultBean.getData());
         } else {
@@ -1493,18 +1521,13 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
 
     public ResultBean InitiatorToAnswerInfo(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
-        SysUserVo userVos = sysUserFeign.fetchBySid(bv.getUserSid()).getData();
         BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(bv.getBusinessSid());
         Map<String, Object> variables = new HashMap<>();
         Map<String, Object> appMap = new HashMap<>();
-        appMap.put("contractSid", bv.getBusinessSid());
+        appMap.put("sid", bv.getBusinessSid());
         variables.put("app", appMap);
         bv.setFormVariables(variables);
-        if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getOrgSidPath())) {
-            bv.setOrgSidPath(busArrearsCarryVehicleApply.getOrgSidPath());
-        } else {
-            return rb.setMsg("orgSidPath 为空！");
-        }
+        bv.setOrgSidPath(busArrearsCarryVehicleApply.getOrgSidPath());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
         List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
@@ -1531,7 +1554,6 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             }
             UpdateFlowFieldVo ufVos = resultBean1.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean1.getData()));
-
             if (!"Event_end".equals(ufVos.getTaskDefKey())) {
                 //极光推送
                 busArrearsCarryVehicleApply = fetchBySid(bv.getBusinessSid());
@@ -1548,14 +1570,24 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 messageFlowableQuery.setMsgTitle("欠款提车申请");
                 ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
             } else {
-                AppScmMessageFlowableQuery query = new AppScmMessageFlowableQuery();
-                Map<String, Object> appMaps = new HashMap<>();
-                appMaps.put("contractSid", busArrearsCarryVehicleApply.getSid());
-                List<String> recipientSidList = new ArrayList<>();
-
+                List<BusArrearsCarryVehicleDetails> carList = busArrearsCarryVehicleDetailsService.selectDetailsByApplySid(bv.getBusinessSid());
+                for (BusArrearsCarryVehicleDetails adCarListDto : carList) {
+                    BaseVehicleTempstate count = baseVehicleTempstateFeign.selectByVinSidAndType(adCarListDto.getVinSid(), VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()).getData();
+                    if (count != null) {
+                        BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
+                        baseVehicleTempstateDto.setSid(count.getSid());
+                        baseVehicleTempstateDto.setBusSid(bv.getBusinessSid());
+                        baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode());
+                        baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getRemarks());
+                        baseVehicleTempstateDto.setTempKey("1");
+                        baseVehicleTempstateDto.setTempValue("审核通过");
+                        baseVehicleTempstateDto.setVehSid(adCarListDto.getVinSid());
+                        baseVehicleTempstateDto.setVinNo(adCarListDto.getVinNo());
+                        baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
+                    }
+                }
                 //修改状态
                 baseMapper.updateType(bv.getBusinessSid());
-
                 //推送出库申请
                 List<BusArrearsCarryVehicleDetailsVo> vehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid());
                 if (vehicleDetailsVos.size() > 0) {
@@ -1579,7 +1611,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                         busDeliveredService.addRetrievalApply(addRetrievalApplyDto);
                     }
                 }
-
+/*
                 // 风控中心风控经理
                 UserRoleQuery userRoleQuery1 = new UserRoleQuery();
                 userRoleQuery1.setRoleSid("242d52de-7df9-4fab-91ff-d6f07dc98341");
@@ -1626,7 +1658,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 query.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028");
                 query.setName("业务");
                 // 消息推送
-                messageFeign.sendAutoserviceMessage(query);
+                messageFeign.sendAutoserviceMessage(query);*/
             }
 
             return rb.success().setData(resultBean1.getData());
@@ -1639,13 +1671,19 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         ResultBean<List<GetNodeVo>> rb = new ResultBean<>();
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(query, bv);
-//        Map<String, Object> formVariables = query.getFormVariables();
-        //判断流程分支
-//        Map<String, Object> map = IsTrue(formVariables.get("businessSid"));
-//        bv.setFormVariables(map);
-        bv.setModelId(ProcDefEnum.ARREARSCARRYVEHICLE.getProDefId());
+        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> appMap = new HashMap<>();
+        BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(query.getBusinessSid());
+        if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getIsFinance())) {
+            map.put("jinrong", "1".equals(busArrearsCarryVehicleApply.getIsFinance()));
+        } else {
+            map.put("jinrong", false);
+        }
+        appMap.put("sid", bv.getBusinessSid());
+        map.put("app", appMap);
+        bv.setFormVariables(map);
+        bv.setModelId(busArrearsCarryVehicleApply.getProcDefId());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
-        //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
         List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
         return rb.success().setData(voList);
     }
@@ -1654,13 +1692,19 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(query, bv);
-//        Map<String, Object> formVariables = query.getFormVariables();
-        //判断流程分支
-//        Map<String, Object> map = IsTrue(formVariables.get("businessSid"));
-//        bv.setFormVariables(map);
-        bv.setModelId(ProcDefEnum.ARREARSCARRYVEHICLE.getProDefId());
+        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> appMap = new HashMap<>();
+        BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(query.getBusinessSid());
+        if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getIsFinance())) {
+            map.put("jinrong", "1".equals(busArrearsCarryVehicleApply.getIsFinance()));
+        } else {
+            map.put("jinrong", false);
+        }
+        appMap.put("sid", bv.getBusinessSid());
+        map.put("app", appMap);
+        bv.setFormVariables(map);
+        bv.setModelId(busArrearsCarryVehicleApply.getProcDefId());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
-        //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
         List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
         return rb.success().setData(voList);
     }
@@ -1681,7 +1725,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 BeanUtil.copyProperties(query, flowTaskVo);
                 Map<String, Object> variables = new HashMap<>();
                 Map<String, Object> appMap = new HashMap<>();
-                appMap.put("contractSid", query.getBusinessSid());
+                appMap.put("sid", query.getBusinessSid());
                 variables.put("app", appMap);
                 flowTaskVo.setValues(variables);
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
@@ -1701,17 +1745,18 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 messageFlowableQuery.setUfVo(messageFlowVo);
                 messageFlowableQuery.setAppMap(appMap);
                 messageFlowableQuery.setBusinessSid(query.getBusinessSid());
-                messageFlowableQuery.setModuleName("提前开票申请");
+                messageFlowableQuery.setModuleName("欠款提车申请");
                 ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
                 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(busArrearsCarryVehicleApply.getCreateBySid())) {
+                if ("发起申请".equals(nextName)) {
                     messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
                     baseVehicleTempstateFeign.delByBusSid(busArrearsCarryVehicleApply.getSid());
                 } else {
                     messageFlowableQuery.setMsgContent(busArrearsCarryVehicleApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
                 }
-                messageFlowableQuery.setMsgTitle("提前开票申请");
+                messageFlowableQuery.setMsgTitle("欠款提车申请");
                 ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
                 return rb.success();
             }
@@ -1724,7 +1769,6 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         if (StringUtils.isBlank(query.getUserSid())) {
             return rb.setMsg("参数错误：userSid");
         }
-        //根据业务sid查询移库申请
         BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(query.getBusinessSid());
         String businessTaskId = busArrearsCarryVehicleApply.getTaskId();
         if (StringUtils.isNotBlank(businessTaskId)) {
@@ -1737,7 +1781,10 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 }
                 String nextNodeUserSids = resultBean.getData().getNextNodeUserSids();
                 List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busArrearsCarryVehicleApply.getCreateBySid())) {
+                busArrearsCarryVehicleApply = fetchBySid(query.getBusinessSid());
+                ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(busArrearsCarryVehicleApply.getProcInstId());
+                String nextName = listResultBean.getData().get(0).getName_();
+                if ("发起申请".equals(nextName)) {
                     baseVehicleTempstateFeign.delByBusSid(busArrearsCarryVehicleApply.getSid());
                 }
                 updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
@@ -1798,7 +1845,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                     downloadUrlVo.setGdLetterDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + pdfVo.getDownUrl());
                 }
                 if (BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getAttachType().equals(pdfVo.getType())) {
-                    downloadUrlVo.setZjlLetterDownloadUrl(docPdfComponent.getPrefixTemplateUrl()+ pdfVo.getDownUrl());
+                    downloadUrlVo.setZjlLetterDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + pdfVo.getDownUrl());
                 }
             }
             if (resultBean.getData().isChange() || resultBean.getData().isDateChange()) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -3439,27 +3439,14 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             //挂车
             if (StringUtils.isNotBlank(solutionsDetailsVo.getTrailerAmount())) {
                 if (priceInfo != null) {
-                    priceInfo.setGcPrice(solutionsDetailsVo.getTrailerAmount());
+//                    priceInfo.setGcPrice(solutionsDetailsVo.getTrailerAmount());
                     BigDecimal finalPriceAll = BigDecimal.ZERO;
                     if (StringUtils.isNotBlank(priceInfo.getSingleFinalPrice())) {
                         finalPriceAll = finalPriceAll.add(new BigDecimal(priceInfo.getSingleFinalPrice()));
                     }
-                    /*if(StringUtils.isNotBlank(priceInfo.getGcPrice())){
-                        finalPriceAll = finalPriceAll.add(new BigDecimal(priceInfo.getGcPrice()));
-                    }
-                    priceInfo.setSingleFinalPrice(finalPriceAll.toString());*/
-                }
-            }
-
-        }/*else{
-            BigDecimal finalPriceAll = BigDecimal.ZERO;
-            if(priceInfo != null){
-                if(StringUtils.isNotBlank(priceInfo.getSingleFinalPrice())){
-                    finalPriceAll = finalPriceAll.add(new BigDecimal(priceInfo.getSingleFinalPrice()));
                 }
-                priceInfo.setSingleFinalPrice(finalPriceAll.toString());
             }
-        }*/
+        }
 
         if (priceInfo != null) {
             if (StringUtils.isNotBlank(topPriice)) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -36,6 +36,9 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
+import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstate;
+import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
+import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.AdCarListVo;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.GCarListVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppNowCarListVo;
@@ -56,6 +59,7 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -83,6 +87,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
     private FinSelectedReceivablesDetailedFeign finSelectedReceivablesDetailedFeign;
     @Autowired
     private BaseVehicleCertificateFeign baseVehicleCertificateFeign;
+    @Autowired
+    private BaseVehicleTempstateFeign baseVehicleTempstateFeign;
 
     public void saveVehicle(List<BusSalesOrderVehicleDto> list, String sid) {
         if (list.size() > 0) {
@@ -267,7 +273,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         List<BusVehicleQKKPTrailerVo> busVehicleQKKPTrailerVos = new ArrayList<>();
         List<BusVehicleQKKPVo> busVehicleQKKPVosNew = new ArrayList<>();
         for (BusVehicleQKKPVo busVehicleQKKPVo : busVehicleQKKPVos) {
-            if (StringUtils.isNotBlank(busVehicleQKKPVo.getVehSid())){
+            if (StringUtils.isNotBlank(busVehicleQKKPVo.getVehSid())) {
                 BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(busVehicleQKKPVo.getVehSid()).getData();
                 busVehicleQKKPVo.setCertificateState(baseVehicleCertificateVo.getCertificateState());
                 busVehicleQKKPVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue());
@@ -300,8 +306,18 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         if (StringUtils.isNotBlank(query.getContractNo())) {
             qw.eq("bo.contractNo", query.getContractNo());
         }
-        if(StringUtils.isNotBlank(query.getVinNo())){
-            qw.like("bv.linkNo",query.getVinNo());
+        if (StringUtils.isNotBlank(query.getVinNo())) {
+            qw.like("bv.linkNo", query.getVinNo());
+        }
+        //查询已提交申请的欠款提车车辆
+        ResultBean<List<BaseVehicleTempstate>> resultBean = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode());
+        if (!resultBean.getData().isEmpty()) {
+            resultBean.getData().removeAll(Collections.singleton(null));
+            List<String> vinSidList = resultBean.getData().stream().map(v -> v.getVehSid()).collect(Collectors.toList());
+            vinSidList.removeAll(Collections.singleton(null));
+            if (!vinSidList.isEmpty()) {
+                qw.notIn("bv.linkSid", vinSidList);
+            }
         }
         List<QCarVo> list = baseMapper.getCanUseCars(qw);
         list.removeAll(Collections.singleton(null));
@@ -318,7 +334,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
                 qCarVo.setVinDto(adCarListVo);
                 List<GCarListVo> gcList = new ArrayList<>();
                 ResultBean<TraliveredVo> voResultBean = baseTrailerFeign.trailerList(qCarVo.getCarSid(), query.getContractNo());
-                if(voResultBean.getData() != null){
+                if (voResultBean.getData() != null) {
                     TraliveredVo traliveredVo = baseTrailerFeign.trailerList(qCarVo.getCarSid(), query.getContractNo()).getData();
                     List<TrailerVo> trailerVos = traliveredVo.getList();
                     if (!trailerVos.isEmpty()) {
@@ -349,12 +365,12 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         if (StringUtils.isNotBlank(params.getContractNo())) {
             qw.eq("bo.contractNo", params.getContractNo());
         }
-        if(StringUtils.isNotBlank(params.getVinNo())){
-            qw.like("bv.linkNo",params.getVinNo());
+        if (StringUtils.isNotBlank(params.getVinNo())) {
+            qw.like("bv.linkNo", params.getVinNo());
         }
-        IPage<QCarVo> pagging = baseMapper.selectPageVo(page,qw);
+        IPage<QCarVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<QCarVo> p = PagerUtil.pageToVo(pagging, null);
-        List<QCarVo> list =pagging.getRecords();
+        List<QCarVo> list = pagging.getRecords();
         list.removeAll(Collections.singleton(null));
         if (!list.isEmpty()) {
             for (int i = 0; i < list.size(); i++) {
@@ -368,7 +384,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
                 }
                 List<GCarListVo> gcList = new ArrayList<>();
                 ResultBean<TraliveredVo> voResultBean = baseTrailerFeign.trailerList(qCarVo.getCarSid(), qCarVo.getContractNo());
-                if(voResultBean.getData() != null){
+                if (voResultBean.getData() != null) {
                     TraliveredVo traliveredVo = baseTrailerFeign.trailerList(qCarVo.getCarSid(), qCarVo.getContractNo()).getData();
                     List<TrailerVo> trailerVos = traliveredVo.getList();
                     if (!trailerVos.isEmpty()) {

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

@@ -15,7 +15,8 @@ public enum ProcDefEnum {
     FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:1:1180004"),
     QKFINBILLAPPLICATION("欠款开票申请流程", "process_x9r8epty:1:1202504"),
     BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
-    ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),
+    //    ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),
+    ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:1:1285006"),
     VEHICLEAPPLY("排产申请流程", "process_9egcg169:13:1250004"),
     SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:725008"),
     BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"),
@@ -77,8 +78,7 @@ public enum ProcDefEnum {
     SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:1:630004"),
     SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:1:630008"),
     CONTRACTAPPLY("合同审核", "process_gd8c9xd5:2:932504"),
-    BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),*/
-    ;
+    BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),*/;
 
 
     ProcDefEnum(String proDefName, String proDefId) {

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeign.java

@@ -42,10 +42,10 @@ public interface AppBusArrearsCarryVehicleApplyFeign {
     @ResponseBody
     ResultBean<PagerVo<ArrearsCarryVehiclePageVo>> getArrearsTakeCarList(@RequestBody PagerQuery<ArrearsCarryVehicleQuery> pagerQuery);
 
-    @ApiOperation("移动端-新增欠款提车申请")
+/*    @ApiOperation("移动端-新增欠款提车申请")
     @PostMapping("/addArrearsApply")
     @ResponseBody
-    public ResultBean addArrearsApply(@Valid @RequestBody AdvanceArrearsVinDto dto);
+    public ResultBean addArrearsApply(@Valid @RequestBody AdvanceArrearsVinDto dto);*/
 
     @ApiOperation("手机端-初始化欠款提车申请")
     @GetMapping("/initArrearsApply")
@@ -54,8 +54,7 @@ public interface AppBusArrearsCarryVehicleApplyFeign {
 
     /**
      * 选择车辆列表
-     * @param contractNo 合同编号
-     * @param vinSids 已选择的车辆sid集合
+     *
      * @return
      */
     @ApiOperation("选择车辆列表")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java

@@ -32,10 +32,10 @@ public class AppBusArrearsCarryVehicleApplyFeignFallback implements AppBusArrear
         return null;
     }
 
-    @Override
+ /*   @Override
     public ResultBean addArrearsApply(AdvanceArrearsVinDto dto) {
         return null;
-    }
+    }*/
 
     @Override
     public ResultBean<AdvanceArrearsInfoVo> initArrearsApply(AdvanceArrearsInfoQuery query) {

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyRest.java

@@ -47,10 +47,10 @@ public class AppBusArrearsCarryVehicleApplyRest implements AppBusArrearsCarryVeh
         return appBusArrearsCarryVehicleApplyService.getArrearsTakeCarList(pagerQuery);
     }
 
-    @Override
+/*    @Override
     public ResultBean addArrearsApply(AdvanceArrearsVinDto dto) {
         return appBusArrearsCarryVehicleApplyService.addArrearsApply(dto);
-    }
+    }*/
 
     @Override
     public ResultBean<AdvanceArrearsInfoVo> initArrearsApply(AdvanceArrearsInfoQuery query) {

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java

@@ -69,12 +69,12 @@ public class AppBusArrearsCarryVehicleApplyService {
         return rb.success().setData(v);
     }
 
-    public ResultBean addArrearsApply(AdvanceArrearsVinDto dto) {
+/*    public ResultBean addArrearsApply(AdvanceArrearsVinDto dto) {
         AppArrearsCarryVinDto advanceArrearsVinDto = new AppArrearsCarryVinDto();
         BeanUtil.copyProperties(dto, advanceArrearsVinDto);
         ResultBean resultBean = busArrearsCarryVehicleApplyFeign.addArrearsApply(advanceArrearsVinDto);
         return resultBean;
-    }
+    }*/
 
     public ResultBean<AdvanceArrearsInfoVo> initArrearsApply(AdvanceArrearsInfoQuery query) {
         ResultBean<AdvanceArrearsInfoVo> rb = ResultBean.fireFail();