Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java

@@ -33,6 +33,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderVehicle.java <br/>
@@ -85,9 +87,11 @@ public class BusSalesOrderVehicle extends BaseEntity {
     private String reaRepaymentPhone;
     @ApiModelProperty("回购状态")
     private Integer repoState;
-    @ApiModelProperty("结清状态")
+    @ApiModelProperty("结清状态(默认0，结清申请提交2，终止或不通过重新设置0，客户确认结清设置3，认款所有应收=0设置1)")
     private Integer settleState;
     @ApiModelProperty("车牌号")
     private String vehMark;
+    @ApiModelProperty("结清申请提交时间")
+    private Date settleApplyDate;
 
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java

@@ -91,9 +91,9 @@ public interface FinSelectedReceivablesDetailedFeign {
 
     @ApiOperation("保存推送的实收")
     @PostMapping("/saveAll")
-    ResultBean saveAll(List<FinSelectedReceivablesDetailed> list);
+    ResultBean saveAll(@RequestBody List<FinSelectedReceivablesDetailed> list);
 
     @ApiOperation("根据维修工单sid查询待审核和已审核的认款金额之和")
     @GetMapping("/selRkByBillSid")
     ResultBean<BigDecimal> selRkByBillSid(@RequestParam("billSid") String billSid);
-}
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeign.java

@@ -74,7 +74,7 @@ public interface FinUncollectedReceivablesDetailedJRFeign {
 
     @ApiOperation("应收添加")
     @PostMapping("/saveAll")
-    public ResultBean saveAll(List<FinUncollectedReceivablesDetailedJR> list);
+    public ResultBean saveAll(@RequestBody List<FinUncollectedReceivablesDetailedJR> list);
 
     @ApiOperation("导入数据批量添加")
     @PostMapping("/saveList")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentSchedule.java

@@ -102,4 +102,6 @@ public class LoanRepaymentSchedule extends BaseEntity {
     private String bankSid;
     @ApiModelProperty("其他融资方sid")
     private String otherBankSid;
+    @ApiModelProperty("贷款保证金")
+    private BigDecimal bondAmounts;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyFeign.java

@@ -76,6 +76,12 @@ public interface LoanSettleApplyFeign {
     @PostMapping(value = "/delegate")
     public ResultBean delegate(@RequestBody LoanSettleApplyDelegateQuery query);
 
+    @ApiOperation(value = "转办")
+    @PutMapping(value = "/assignTask")
+    @ResponseBody
+    public ResultBean assignTask(@RequestBody LoanSettleApplyDelegateQuery query);
+
+
     @ApiOperation(value = "移动端详情")
     @PostMapping(value = "/getAppDetails")
     ResultBean<SettleApplyAppVo> getAppDetails(@RequestParam("sid") String sid);

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyListQuery.java

@@ -19,6 +19,8 @@ public class SettleApplyListQuery implements Query {
     private String borrowerName;
     @ApiModelProperty("车牌号")
     private String vehMark;
+    @ApiModelProperty("车架号")
+    private String vinNo;
     @ApiModelProperty("机构全路径")
     private String orgPath;
     private String type;//1代表查询回购

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.xml

@@ -6,7 +6,7 @@
         vehCount,vinNo,loanContractSid,loanContractNo,bankContractNo,bankName,policyName,mainPeriod,mainRepayDate,
         mainLastDate,mainFirstRepay,mainMidRepay,mainLastRepay,otherPeriod,otherBankNo,otherRepayDate,otherFirstRepay,
         otherMidRepay,otherLastRepay,isOtherPolicy,sameBank,cwDeptNo,isDifferent,importTiredMoney,importPaymentMoney,
-        importInterest,importFund,orgSidPath,bankSid,otherBankSid)
+        importInterest,importFund,orgSidPath,bankSid,otherBankSid,bondAmounts)
         values
         <foreach collection="list" item="item" index="index" separator=",">
             (#{item.createBySid},#{item.sid},#{item.createTime},#{item.isEnable},#{item.salesOrderSid},#{item.borrowerSid},#{item.borrowerName},
@@ -14,7 +14,7 @@
             #{item.policyName},#{item.mainPeriod},#{item.mainRepayDate},#{item.mainLastDate},#{item.mainFirstRepay},#{item.mainMidRepay},
             #{item.mainLastRepay},#{item.otherPeriod},#{item.otherBankNo},#{item.otherRepayDate},#{item.otherFirstRepay},#{item.otherMidRepay},
             #{item.otherLastRepay},#{item.isOtherPolicy},#{item.sameBank},#{item.cwDeptNo},#{item.isDifferent},#{item.importTiredMoney},
-            #{item.importPaymentMoney},#{item.importInterest},#{item.importFund},#{item.orgSidPath},#{item.bankSid},#{item.otherBankSid}
+            #{item.importPaymentMoney},#{item.importInterest},#{item.importFund},#{item.orgSidPath},#{item.bankSid},#{item.otherBankSid},#{item.bondAmounts}
              )
         </foreach>
     </insert>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@@ -4933,6 +4933,12 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
         List<LoanRepaymentSchedule> returnList = new ArrayList<>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         for (HistoryDataImportVo v : list) {
+            String depositMoney = ""; //贷款保证金
+            if (StringUtils.isNotBlank(v.getDepositMoney())) {
+                depositMoney = v.getDepositMoney();
+            } else {
+                depositMoney = "";
+            }
             String Q = "";
             if (StringUtils.isNotBlank(v.getTiredMoney())) {
                 Q = v.getTiredMoney(); //累欠本金
@@ -5300,6 +5306,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                 scheduleDetails.setMainFirstRepay(new BigDecimal(mF));
                 scheduleDetails.setMainMidRepay(new BigDecimal(mM));
                 scheduleDetails.setMainLastRepay(new BigDecimal(mL));
+                scheduleDetails.setBondAmounts(new BigDecimal(depositMoney));
                 if (isOther.equals("1")) {
                     scheduleDetails.setOtherPeriod(oPeriod);
                     scheduleDetails.setOtherBankNo(otherBankNo);
@@ -5501,6 +5508,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                 schedule.setMainFirstRepay(new BigDecimal(mF));
                 schedule.setMainMidRepay(new BigDecimal(mM));
                 schedule.setMainLastRepay(new BigDecimal(mL));
+                schedule.setBondAmounts(new BigDecimal(depositMoney));
                 if (isOther.equals("1")) {
                     schedule.setOtherPeriod(oPeriod);
                     schedule.setOtherBankNo(otherBankNo);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.java

@@ -46,11 +46,13 @@ public interface LoanSettleApplyMapper extends BaseMapper<LoanSettleApply> {
 
     String selectDk(@Param("busVinSid") String busVinSid, @Param("settingDate") String settingDate);
 
-    int updateBus(String busVinSid);
+    int updateBus(@Param("busVinSid")String busVinSid,@Param("state")String state);
 
     LoanRepaymentPlanDetails selectByBusVinSidAndDesc(String busVinSid);
 
     BusSalesOrder selectByOrderSid(String saleOrderSid);
 
     FinUncollectedReceivablesDetailedJR selectByType(@Param("busSid") String sid, @Param("type") String type);
+
+    int updateBusAndSettleApplyDate(@Param("busVinSid")String busVinSid, @Param("state")String state, @Param("date")String date);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml

@@ -61,21 +61,24 @@
     </select>
 
     <select id="getListPage" resultType="com.yxt.anrui.riskcenter.api.loansettleapply.SettleApplyListVo">
-        select ld.borrowerName,
+        SELECT
-               ld.vehMark,
+        br.borrowerName borrowName,
-               ld.customer,
+        bv.vehMark,
-               ld.loanContractNo,
+        bs.customerName customer,
-               ld.vinNo,
+        ld.loanContractNo,
-               ld.bankName,
+        SUBSTRING( bv.linkNo,- 8 ) vinNo,
-               ld.bankContractNo,
+        ld.bankName,
-               ld.busVinSid
+        ld.bankContractNo,
-        from loan_repayment_plan_details ld
+        bv.sid busVinSid,
-                 left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = ld.busVinSid
+        ld.sid
+        FROM
+        anrui_buscenter.bus_sales_order_loancontract ld
+        LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bv ON bv.salesOrderSid = ld.salesOrderSid
+        LEFT JOIN anrui_buscenter.bus_sales_order_borrower as br ON br.sid = bv.borrowerSid
+        LEFT JOIN anrui_buscenter.bus_sales_order as bs ON bs.sid = ld.salesOrderSid
         <where>
             ${ew.sqlSegment}
         </where>
-        group by ld.busVinSid
-        order by ld.loanContractNo desc, ld.vinNo desc
     </select>
 
     <select id="selectByBusVinSid"
@@ -90,7 +93,9 @@
     <select id="selectDzfyqlx" resultType="java.lang.String">
         SELECT IFNULL(SUM(lbpv.`bankBeInter`), 0)
         FROM loan_be_padsincere_veh lbpv
+        LEFT JOIN loan_be_padsincere_apply as ba ON lbpv.mainSid = ba.sid
         WHERE lbpv.saleVehSid = #{busVinSid}
+          AND ba.nodeState = '已办结'
     </select>
 
     <select id="selectZjzyf" resultType="java.lang.String">
@@ -162,7 +167,12 @@
 
     <update id="updateBus">
         update anrui_buscenter.bus_sales_order_vehicle
-        set settleState = 1
+        set settleState = #{state}
+        where sid = #{busVinSid}
+    </update>
+    <update id="updateBusAndSettleApplyDate">
+        update anrui_buscenter.bus_sales_order_vehicle
+        set settleState = #{state},settleApplyDate =#{date}
         where sid = #{busVinSid}
     </update>
 
@@ -179,4 +189,4 @@
             resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR">
         select * from anrui_fin.fin_uncollected_receivables_detailed_jr where busSid = #{busSid} and payCostTitleValue = #{type} order by id desc limit 1
     </select>
-</mapper>
+</mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyRest.java

@@ -99,6 +99,11 @@ public class LoanSettleApplyRest implements LoanSettleApplyFeign {
         return loanSettleApplyService.delegate(query);
     }
 
+    @Override
+    public ResultBean assignTask(LoanSettleApplyDelegateQuery query) {
+        return loanSettleApplyService.assignTask(query);
+    }
+
     @Override
     public ResultBean<SettleApplyAppVo> getAppDetails(String sid) {
         return loanSettleApplyService.getAppDetails(sid);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
+import com.yxt.anrui.buscenter.api.bussalesorder.flowable.BusSalesOrderDelegateQuery;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR;
@@ -29,6 +30,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
+import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule;
 import com.yxt.anrui.riskcenter.api.loansettleapply.*;
 import com.yxt.anrui.riskcenter.api.loansettleapply.flowable.*;
 import com.yxt.anrui.riskcenter.api.loansettlebankcost.LoanSettleBankCost;
@@ -40,6 +42,7 @@ import com.yxt.anrui.riskcenter.api.loansettlecompanyreduction.LoanSettleCompany
 import com.yxt.anrui.riskcenter.api.loansettlevehicle.LoanSettleVehicleDto;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail;
+import com.yxt.anrui.riskcenter.biz.loanrepaymentschedule.LoanRepaymentScheduleService;
 import com.yxt.anrui.riskcenter.biz.loansettlebankcost.LoanSettleBankCostMapper;
 import com.yxt.anrui.riskcenter.biz.loansettlebankcost.LoanSettleBankCostService;
 import com.yxt.anrui.riskcenter.biz.loansettlecompanycost.LoanSettleCompanyCostMapper;
@@ -105,7 +108,8 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
     private LoanSolutionsDetailService loanSolutionsDetailService;
     @Autowired
     private FileUploadComponent fileUploadComponent;
-
+    @Autowired
+    private LoanRepaymentScheduleService loanRepaymentScheduleService;
     @Autowired
     private SysParameterFeign sysParameterFeign;
     @Autowired
@@ -245,6 +249,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
             sid = loanSettleApply.getSid();
             loanSettleApply.setCreateBySid(dto.getUserSid());
             loanSettleApply.setOrgSidPath(dto.getOrgPath());
+            loanSettleApply.setState(0);
             LoanSettleBankCostVo loanSettleBankCostVo = dto.getLoanSettleBankCostVo();
             if (loanSettleBankCostVo != null) {
                 loanSettleBankCostService.saveCost(sid, loanSettleBankCostVo);
@@ -394,9 +399,16 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                     BeanUtil.copyProperties(loanSettleCompanyReduction, loanSettleCompanyReductionVo);
                 }
                 loanSettleApplyDetailsVo.setLoanSettleCompanyReductionVo(loanSettleCompanyReductionVo);
-                if (loanSettleCompanyReduction.getAmountTo().compareTo(BigDecimal.ZERO) > 0) {
+                if (StringUtils.isNotBlank(loanSettleApply.getNodeState())) {
-                    loanSettleApplyDetailsVo.setConfirmAtn(true);
+                    if (loanSettleApply.getNodeState().equals("已办结")) {
+                        if (loanSettleApply.getState().intValue() == 0) {
+                            if (loanSettleCompanyReduction.getAmountTo().compareTo(BigDecimal.ZERO) > 0) {
+                                loanSettleApplyDetailsVo.setConfirmAtn(true);
+                            }
+                        }
+                    }
                 }
+
             }
             if (StringUtils.isNotBlank(loanSettleApply.getBusSid())) {
                 loanSettleApplyDetailsVo.setShowHg(true);
@@ -449,6 +461,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         SettleApplyCommonVo settleApplyCommonVo = new SettleApplyCommonVo();
         //根据busVinSid查询还款计划表中数据
         LoanRepaymentPlanDetails loanRepaymentPlanDetails = baseMapper.selectByBusVinSid(busVinSid);
+        String scheduleSid = "";
         if (loanRepaymentPlanDetails != null) {
             settleApplyCommonVo.setVinNo(loanRepaymentPlanDetails.getVinNo());
             settleApplyCommonVo.setVehMark(loanRepaymentPlanDetails.getVehMark());
@@ -460,6 +473,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
             settleApplyCommonVo.setBankName(loanRepaymentPlanDetails.getBankName());
             settleApplyCommonVo.setBankContractNo(loanRepaymentPlanDetails.getBankContractNo());
             settleApplyCommonVo.setSaleOrderSid(loanRepaymentPlanDetails.getSalesOrderSid());
+            scheduleSid = loanRepaymentPlanDetails.getScheduleSid();
         }
         String putBankInterest = baseMapper.selectDzfyqlx(busVinSid);
         settleApplyCommonVo.setPutBankInterest(putBankInterest);
@@ -467,6 +481,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         String funfCost = baseMapper.selectZjzyf(busVinSid, settingDate);
         String dk = baseMapper.selectDk(busVinSid, settingDate);
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        //计算当日资金占用费根据垫款总额
         try {
             Date d1 = format.parse(settingDate);//毫秒ms
             Date d2 = format.parse(DateUtil.today());//毫秒ms
@@ -492,13 +507,14 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         String notDuePrice = baseMapper.selectGsWdq(busVinSid, settingDate);
         settleApplyCommonVo.setNotDuePrice(notDuePrice);
         //贷款保证金
-        //根据销售订单查询金额方案
+        //根据销售订单查询还款计划主表
-        LoanSolutions loanSolutions = loanSolutionsMapper.selectBySaleOrderSid(settleApplyCommonVo.getSaleOrderSid());
+        LoanRepaymentSchedule schedule = loanRepaymentScheduleService.fetchBySid(scheduleSid);
-        if (loanSolutions != null) {
+        if (null != schedule) {
-            LoanSolutionsDetail loanSolutionsDetail = loanSolutionsDetailService.selectLoanSid(loanSolutions.getSid());
+            BigDecimal bondAmounts = BigDecimal.ZERO;
-            if (loanSolutionsDetail != null) {
+            if (null != schedule.getBondAmounts()) {
-                settleApplyCommonVo.setLoanDeposit(loanSolutionsDetail.getBondAmounts().toString());
+                bondAmounts = schedule.getBondAmounts();
-            }
+            }
+            settleApplyCommonVo.setLoanDeposit(bondAmounts.toString());
             //贷款保证金扣罚金额
             String fc_dkbzjkcgz = sysParameterFeign.fetchByParNo("FC_DKBZJKCGZ").getData();
             if (StringUtils.isNotBlank(fc_dkbzjkcgz)) {
@@ -516,7 +532,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 int overDueCount = baseMapper.selvehOverdueCount(busVinSid);
                 if (overDueCount > i) {
                     //大于规定次数扣除全部保证金 deductionAmount
-                    settleApplyCommonVo.setDeductionAmount(loanSolutionsDetail.getBondAmounts().toString());
+                    settleApplyCommonVo.setDeductionAmount(bondAmounts.toString());
                 } else {
                     BigDecimal sum = new BigDecimal(0);
                     for (int j = 0; j < overDueCount; j++) {
@@ -566,6 +582,9 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         }
         String businessSid = resultBean.getData();
         loanSettleApply = fetchBySid(businessSid);
+        //更新车辆表结清状态
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        baseMapper.updateBusAndSettleApplyDate(loanSettleApply.getBusVinSid(), "2", sdf.format(new Date()));
         //创建BusinessVariables实体对象
         BusinessVariables bv = new BusinessVariables();
         //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
@@ -577,8 +596,19 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         bv.setOrgSidPath(loanSettleApply.getOrgSidPath());
         bv.setBusinessSid(businessSid);
         bv.setUserSid(dto.getUserSid());
+        String vinNo = "";
+        String vehMark = "";
+        if (StringUtils.isNotBlank(loanSettleApply.getVinNo())) {
+            vinNo = loanSettleApply.getVinNo();
+        }
+        if (StringUtils.isNotBlank(loanSettleApply.getVehMark())) {
+            vehMark = loanSettleApply.getVehMark();
+        }
+        String append = "车架号" + "<" + vinNo + "/" + vehMark + ">";
         if (StringUtils.isNotBlank(loanSettleApply.getBusSid())) {
-            variables.put("orderNames", "提前结清申请");
+            variables.put("orderNames", append + "提前结清申请");
+        } else {
+            variables.put("orderNames", append + "结清申请");
         }
         bv.setFormVariables(variables);
         List<String> orgPathList = Arrays.asList(dto.getOrgPath().split("/"));
@@ -690,12 +720,22 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 loanSettleApply.setCloseDate(DateUtil.today());
                 loanSettleApply.setSettingDate(DateUtil.today());
                 baseMapper.updateById(loanSettleApply);
-                //更新车辆表结清状态
+//                //更新车辆表结清状态
-                baseMapper.updateBus(loanSettleApply.getBusVinSid());
+//                baseMapper.updateBus(loanSettleApply.getBusVinSid(),"1");
                 //推送到结清车辆台账
-                pushSettlevehicle(businessSid);
+//                pushSettlevehicle(businessSid);
-                //推送应收、结转、减免。
+                LoanSettleCompanyReduction reduction = loanSettleCompanyReductionService.selectByMainSid(businessSid);
-                pushUnColl(businessSid);
+                if (null != reduction) {
+                    //获取公司减免情况
+                    BigDecimal amountTo = BigDecimal.ZERO;
+                    if (null != reduction.getAmountTo()) {
+                        amountTo = reduction.getAmountTo();
+                    }
+                    if (amountTo.compareTo(BigDecimal.ZERO) <= 0) {
+                        //推送应收、结转、减免。
+                        pushUnColl(businessSid);
+                    }
+                }
             } else {
                 //极光推送
                 loanSettleApply = fetchBySid(businessSid);
@@ -1410,6 +1450,11 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 }
                 Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                 updateFlowFiled(map);
+                loanSettleApply = fetchBySid(query.getBusinessSid());
+                if (loanSettleApply.getNodeState().equals("终止")) {
+                 //修改车辆结算状态为0
+                 baseMapper.updateBus(loanSettleApply.getBusVinSid(),"0");
+                }
                 return rb.success().setData(resultBean.getData());
             } else {
                 if (businessTaskId.equals(query.getTaskId())) {
@@ -1421,6 +1466,11 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                     }
                     Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                     updateFlowFiled(map);
+                    loanSettleApply = fetchBySid(query.getBusinessSid());
+                    if (loanSettleApply.getNodeState().equals("终止")) {
+                        //修改车辆结算状态为0
+                        baseMapper.updateBus(loanSettleApply.getBusVinSid(),"0");
+                    }
                     return rb.success().setData(resultBean.getData());
                 }
             }
@@ -1436,6 +1486,15 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         return rb.success();
     }
 
+    public ResultBean assignTask(LoanSettleApplyDelegateQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        FlowDelegateQuery delegateQuery = new
+                FlowDelegateQuery();
+        BeanUtil.copyProperties(query, delegateQuery);
+        flowFeign.assignTask(delegateQuery);
+        return rb.success();
+    }
+
     public ResultBean<SettleApplyAppVo> getAppDetails(String sid) {
         ResultBean<SettleApplyAppVo> rb = ResultBean.fireFail();
         SettleApplyAppVo settleApplyAppVo = new SettleApplyAppVo();
@@ -1541,28 +1600,33 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         if (query != null) {
             //客户名称
             if (StringUtils.isNotBlank(query.getCustomer())) {
-                qw.like("ld.customer", query.getCustomer());
+                qw.like("bs.customerName", query.getCustomer());
             }
             //贷款人
             if (StringUtils.isNotBlank(query.getBorrowerName())) {
-                qw.like("ld.borrowName", query.getBorrowerName());
+                qw.like("br.borrowerName", query.getBorrowerName());
             }
             //车牌号
             if (StringUtils.isNotBlank(query.getVehMark())) {
-                qw.like("ld.vehMark", query.getVehMark());
+                qw.like("bv.vehMark", query.getVehMark());
+            }
+            //车架号
+            if (StringUtils.isNotBlank(query.getVinNo())) {
+                qw.like("bv.linkNo", query.getVinNo());
             }
             //机构全路径
             if (StringUtils.isNotBlank(query.getOrgPath())) {
                 String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
-                qw.eq("ld.useOrgSid", useOrgSid);
+                qw.eq("bs.useOrgSid", useOrgSid);
             }
-            qw.eq("bv.settleState", 0);
+            qw.apply("bv.settleState = '0'OR (bv.settleState = '2' AND date_format (bv.settleApplyDate,'%Y-%m-%d') < CURDATE())");
             //回购状态，回购申请
             if (StringUtils.isNotBlank(query.getType())) {
                 if (query.getType().equals("1")) {
                     qw.eq("bv.repoState", 0);
                 }
             }
+            qw.orderBy(true, true, "ld.loanContractNo", "bv.linkNo");
         }
         IPage<LoanSettleApply> page = PagerUtil.queryToPage(pagerQuery);
         IPage<SettleApplyListVo> pagging = baseMapper.getListPage(page, qw);
@@ -1572,7 +1636,16 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
 
     public ResultBean confirmAtn(String sid) {
         ResultBean rb = ResultBean.fireFail();
-        pushConfirm(sid);
+        LoanSettleApply loanSettleApply = fetchBySid(sid);
+        String settingDate = loanSettleApply.getSettingDate();
+        String formatDate = DateUtil.formatDate(new Date());
+        if (formatDate.compareTo(settingDate) > 0) {
+            return rb.setMsg("只能在结清申请发起当日确认客户结清，若需结清，请重新发起结清申请！");
+        } else {
+            pushConfirm(sid);
+            loanSettleApply.setState(1);
+            baseMapper.updateById(loanSettleApply);
+        }
         return rb.success();
     }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/settleapply/SettleApplyFeign.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.risk.settleapply;
 
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.AppOrderDelegateQuery;
 import com.yxt.anrui.terminal.api.risk.settleapply.flowable.SettleApplyDelegateQuery;
 import com.yxt.anrui.terminal.api.risk.settleapply.flowable.SettleApplyDto;
 import com.yxt.anrui.terminal.api.risk.settleapply.flowable.SettleApplyQuery;
@@ -57,4 +58,10 @@ public interface SettleApplyFeign {
     @PutMapping(value = "/delegate")
     @ResponseBody
     public ResultBean delegate(@RequestBody SettleApplyDelegateQuery delegateQuery);
+
+    @ApiOperation(value = "转办")
+    @PutMapping(value = "/assignTask")
+    @ResponseBody
+    public ResultBean assignTask(@RequestBody SettleApplyDelegateQuery delegateQuery);
+
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/settleapply/SettleApplyRest.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.biz.risk.settleapply;
 
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.AppOrderDelegateQuery;
 import com.yxt.anrui.terminal.api.risk.settleapply.SettleApplyAppVos;
 import com.yxt.anrui.terminal.api.risk.settleapply.SettleApplyFeign;
 import com.yxt.anrui.terminal.api.risk.settleapply.flowable.SettleApplyDelegateQuery;
@@ -59,4 +60,9 @@ public class SettleApplyRest implements SettleApplyFeign {
     public ResultBean delegate(SettleApplyDelegateQuery delegateQuery) {
         return settleApplyService.delegate(delegateQuery);
     }
+
+    @Override
+    public ResultBean assignTask(SettleApplyDelegateQuery delegateQuery) {
+        return settleApplyService.assignTask(delegateQuery);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/settleapply/SettleApplyService.java

@@ -1,12 +1,14 @@
 package com.yxt.anrui.terminal.biz.risk.settleapply;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.buscenter.api.bussalesorder.flowable.BusSalesOrderDelegateQuery;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.SecondarySalesAppVo;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.flowable.*;
 import com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApply;
 import com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApplyFeign;
 import com.yxt.anrui.riskcenter.api.loansettleapply.SettleApplyAppVo;
 import com.yxt.anrui.riskcenter.api.loansettleapply.flowable.*;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.AppOrderDelegateQuery;
 import com.yxt.anrui.terminal.api.base.common.CarModelVo;
 import com.yxt.anrui.terminal.api.risk.secondarysales.SecondarySalesAppVos;
 import com.yxt.anrui.terminal.api.risk.secondarysales.SecondarySalesCostAppVo;
@@ -138,4 +140,13 @@ public class SettleApplyService {
         ResultBean delegate = loanSettleApplyFeign.delegate(delegateQuery1);
         return rb.success();
     }
+
+    public ResultBean assignTask(SettleApplyDelegateQuery delegateQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanSettleApplyDelegateQuery delegateQuery1 = new
+                LoanSettleApplyDelegateQuery();
+        BeanUtil.copyProperties(delegateQuery, delegateQuery1);
+        ResultBean delegate = loanSettleApplyFeign.assignTask(delegateQuery1);
+        return rb.success();
+    }
 }