Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApply.java

@@ -76,5 +76,6 @@ public class LoanBeCollectionApply extends BaseEntity {
     private String nodeState; // 流程状态
 	@ApiModelProperty("任务id")
     private String taskId; // 任务id
-
+    @ApiModelProperty("远程控制提醒")
+    private String lockCarRemarks;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyDetailsVo.java

@@ -94,4 +94,6 @@ public class LoanBeCollectionApplyDetailsVo implements Vo {
     private List<LoanBeCollectionFileVo> files = new ArrayList<>();
     @ApiModelProperty("逾期车辆列表")
     private List<LoanBeCollectionVehDetailsVo> loanBeCollectionVehDetails;
+    @ApiModelProperty("远程控制提醒")
+    private String lockCarRemarks;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyDto.java

@@ -89,6 +89,8 @@ public class LoanBeCollectionApplyDto implements Dto {
     private String nodeState; // 流程状态
     @ApiModelProperty("任务id")
     private String taskId; // 任务id
+    @ApiModelProperty("远程控制提醒")
+    private String lockCarRemarks;
     @ApiModelProperty("附件")
     private List<LoanBeCollectionFileVo> files = new ArrayList<>();
     @ApiModelProperty("逾期车辆列表")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyFeign.java

@@ -26,8 +26,6 @@
 package com.yxt.anrui.riskcenter.api.loanbecollectionapply;
 
 import com.yxt.anrui.riskcenter.api.loanbecollectionapply.flowable.*;
-import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordInit;
-import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.flowable.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyFeignFallback.java

@@ -26,7 +26,7 @@
 package com.yxt.anrui.riskcenter.api.loanbecollectionapply;
 
 import com.yxt.anrui.riskcenter.api.loanbecollectionapply.flowable.*;
-import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.flowable.LoanBePadsincereNodeVo;
+import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceLockCarVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceapply/LoanVehClearanceApplyDetailsVo.java

@@ -59,6 +59,8 @@ public class LoanVehClearanceApplyDetailsVo implements Vo {
 
     @ApiModelProperty("申请日期")
     private String createTime;
+    @ApiModelProperty("创建人sid")
+    private String createBySid;
 	@ApiModelProperty("创建人")
     private String createByName; // 创建人
 	@ApiModelProperty("申请编号")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceapply/LoanVehClearanceApplyFeign.java

@@ -25,6 +25,10 @@
  *********************************************************/
 package com.yxt.anrui.riskcenter.api.loanvehclearanceapply;
 
+import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceLockCarQuery;
+import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceLockCarVo;
+import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehDetailsVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
@@ -33,8 +37,6 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * Project: anrui-riskcenter(车辆远程解控申请) <br/>
  * File: LoanVehClearanceApplyFeign.java <br/>
@@ -61,6 +63,11 @@ public interface LoanVehClearanceApplyFeign {
     @ResponseBody
     public ResultBean<PagerVo<LoanVehClearanceApplyVo>> listPage(@RequestBody PagerQuery<LoanVehClearanceApplyQuery> pq);
 
+    @ApiOperation("远程控制成功车辆列表")
+    @PostMapping("/lockCarList")
+    @ResponseBody
+    public ResultBean<PagerVo<LoanVehClearanceLockCarVo>> lockCarList(@RequestBody PagerQuery<LoanVehClearanceLockCarQuery> pq);
+
     @ApiOperation("新增或修改")
     @PostMapping("/save")
     @ResponseBody
@@ -71,6 +78,11 @@ public interface LoanVehClearanceApplyFeign {
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
 
+    @ApiOperation("初始化")
+    @PostMapping("/init")
+    @ResponseBody
+    public ResultBean<LoanVehClearanceApplyDetailsVo> init(@RequestBody LoanVehClearanceInitQuery loanVehClearanceInitQuery);
+      
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceapply/LoanVehClearanceApplyFeignFallback.java

@@ -25,6 +25,8 @@
  *********************************************************/
 package com.yxt.anrui.riskcenter.api.loanvehclearanceapply;
 
+import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceLockCarQuery;
+import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceLockCarVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -54,6 +56,11 @@ public class LoanVehClearanceApplyFeignFallback implements LoanVehClearanceApply
 		return rb.setMsg("接口anrui-riskcenter/loanvehclearanceapply/listPage无法访问");
 	}
 
+	@Override
+	public ResultBean<PagerVo<LoanVehClearanceLockCarVo>> lockCarList(PagerQuery<LoanVehClearanceLockCarQuery> pq) {
+		return null;
+	}
+
 	@Override
 	public ResultBean save(LoanVehClearanceApplyDto dto){
 		return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanvehclearanceapply/save无法访问");
@@ -64,6 +71,11 @@ public class LoanVehClearanceApplyFeignFallback implements LoanVehClearanceApply
 		return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanvehclearanceapply/delBySids无法访问");
 	}
 
+	@Override
+	public ResultBean<LoanVehClearanceApplyDetailsVo> init(LoanVehClearanceInitQuery loanVehClearanceInitQuery) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<LoanVehClearanceApplyDetailsVo> fetchDetailsBySid(String sid){
 		ResultBean rb = ResultBean.fireFail();

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceapply/LoanVehClearanceInitQuery.java

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanvehclearanceapply;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-riskcenter(车辆远程解控申请) <br/>
+ * File: LoanVehClearanceApplyQuery.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanvehclearanceapply.LoanVehClearanceApplyQuery <br/>
+ * Description: 车辆远程解控申请 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-12-29 10:25:56 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "车辆远程解控申请 查询条件", description = "车辆远程解控申请 查询条件")
+public class LoanVehClearanceInitQuery implements Query {
+
+    @ApiModelProperty("销售订单车辆sid")
+    private List<String> saleVehSids;
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
+	@ApiModelProperty("用户sid")
+    private String userSid;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceveh/LoanVehClearanceLockCarQuery.java

@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanvehclearanceveh;
+
+
+import com.yxt.common.core.query.Query;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-riskcenter(催收措施申请) <br/>
+ * File: LoanBeCollectionVehVo.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehVo <br/>
+ * Description: 逾期催收车辆 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-12-12 16:06:20 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "逾期催收车辆 视图数据详情", description = "逾期催收车辆 视图数据详情")
+public class LoanVehClearanceLockCarQuery implements Query {
+
+    @ApiModelProperty("客户名称")
+    private String custName;
+    @ApiModelProperty("贷款人姓名")
+    private String borrowerName;
+    @ApiModelProperty("车牌号")
+    private String carNum;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+    @ApiModelProperty
+    private List<String> saleVehSids;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceveh/LoanVehClearanceLockCarVo.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanvehclearanceveh;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionFileVo;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Project: anrui-riskcenter(催收措施申请) <br/>
+ * File: LoanBeCollectionVehVo.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehVo <br/>
+ * Description: 逾期催收车辆 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-12-12 16:06:20 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "逾期催收车辆 视图数据详情", description = "逾期催收车辆 视图数据详情")
+public class LoanVehClearanceLockCarVo implements Vo {
+
+    @ApiModelProperty("销售订单车辆sid")
+    private String saleVehSid;
+    @ApiModelProperty("贷款合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车牌号")
+    private String carNum;
+    @ApiModelProperty("资方")
+    private String bankName;
+    @ApiModelProperty("资方合同号")
+    private String bankContractNo;
+    @ApiModelProperty("客户名称")
+    private String custName;
+    @ApiModelProperty("贷款人姓名")
+    private String borrowerName;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceveh/LoanVehClearanceVehInit.java

@@ -0,0 +1,46 @@
+package com.yxt.anrui.riskcenter.api.loanvehclearanceveh;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFile;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class LoanVehClearanceVehInit {
+
+    @ApiModelProperty("贷款合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车牌号")
+    private String carNum;
+    @ApiModelProperty("资方")
+    private String bankName;
+    @ApiModelProperty("资方合同编号")
+    private String bankContractNo;
+    @ApiModelProperty("客户名称")
+    private String custName;
+    @ApiModelProperty("贷款人")
+    private String loanName;
+    @ApiModelProperty("首次逾期日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date firstBeDate;
+    @ApiModelProperty("逾期期数")
+    private String beOverduePeriod;
+    @ApiModelProperty("逾期金额")
+    private String beOverdueMoney;
+    @ApiModelProperty("逾期金额换算期数")
+    private String beOverdueMoneyAndPeriod;
+    @ApiModelProperty("销售订单sid")
+    private String salesOrderSid;
+    @ApiModelProperty("销售订单车辆sid")
+    private String saleVehSid;
+    @ApiModelProperty("远程控制费用")
+    private String lockCarMoney;
+
+    @ApiModelProperty
+    private List<LoanBeCollectionVehFile> sids;
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyMapper.java

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceLockCarVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyMapper.xml

@@ -1,14 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.riskcenter.biz.loanbecollectionapply.LoanBeCollectionApplyMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyVo">
-		SELECT * FROM loan_be_collection_apply <where> ${ew.sqlSegment} </where>
+        SELECT * FROM loan_be_collection_apply
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
-	<select id="selectListAllVo" resultType="com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyVo">
-		SELECT * FROM loan_be_collection_apply <where> ${ew.sqlSegment} </where>
+    <select id="selectListAllVo"
+            resultType="com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyVo">
+        SELECT * FROM loan_be_collection_apply
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
     <select id="selectNum" resultType="java.lang.String">

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyRest.java

@@ -29,7 +29,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.riskcenter.api.loanbecollectionapply.flowable.*;
-import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.flowable.LoanBePadsincereNodeVo;
+import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceLockCarVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -39,7 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApply;
+
 import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyQuery;
 import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyVo;
 import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyDetailsVo;

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java

@@ -50,6 +50,7 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysparameter.SysParameterFeign;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
@@ -57,10 +58,10 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loanbecollectionapply.*;
 import com.yxt.anrui.riskcenter.api.loanbecollectionapply.flowable.*;
 import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordVehInit;
+import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceLockCarVo;
 import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDto;
 import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFile;
-import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.LoanBePadsincereApplyVo;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
@@ -134,6 +135,8 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
     private FlowTaskFeign flowTaskFeign;
     @Autowired
     private FlowFeign flowFeign;
+    @Autowired
+    private SysParameterFeign sysParameterFeign;
 
     private QueryWrapper<LoanBeCollectionApply> createQueryWrapper(LoanBeCollectionApplyQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -250,6 +253,10 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
                 }
             }
             for (LoanBeCollectionVehDto loanBeCollectionVehDetail : loanBeCollectionVehDetails) {
+                List<String> collMeasures = dto.getCollMeasures();
+                if (!collMeasures.contains("远程控制")){
+                    loanBeCollectionVehDetail.setLockCarMoney("0");
+                }
                 loanBeCollectionVehDetail.setMainSid(sid);
                 String vehSid = loanBeCollectionVehService.saveOrUpdateDto(loanBeCollectionVehDetail);
                 List<LoanBeCollectionFileVo> hkxyFiles = loanBeCollectionVehDetail.getHkxyFiles();
@@ -432,10 +439,21 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
         BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(saleVehSid).getData();
         List<LoanBeCollectionRecordVehInit> loanBeCollectionRecordVehInits = loanBeOverdueVehService.initVehListByBorrSid(busSalesOrderVehicle.getBorrowerSid());
         List<LoanBeCollectionVehDetailsVo> loanBeCollectionVehDetailsVos = new ArrayList<>();
+        String yckzVinNo = "";
         for (LoanBeCollectionRecordVehInit loanBeCollectionRecordVehInit : loanBeCollectionRecordVehInits) {
-            List<LoanBeCollectionVehFile> loanBeCollectionVehFiles = new ArrayList<>();
             LoanBeCollectionVehDetailsVo loanBeCollectionVehDetailsVo = new LoanBeCollectionVehDetailsVo();
             BeanUtil.copyProperties(loanBeCollectionRecordVehInit, loanBeCollectionVehDetailsVo);
+            //远程控制费用获取
+            int i = loanBeCollectionVehService.selBjBySaleVehSid(loanBeCollectionRecordVehInit.getSaleVehSid());
+            String parameterValue = sysParameterFeign.fetchByParNo("FK_YCKZSFGZ").getData();
+            String[] parameterValues = parameterValue.split(",");
+            if (i < 3){
+                loanBeCollectionVehDetailsVo.setLockCarMoney(parameterValues[i]);
+            }else {
+                loanBeCollectionVehDetailsVo.setLockCarMoney(parameterValues[2]);
+                yckzVinNo = yckzVinNo + loanBeCollectionVehDetailsVo.getVinNo() + ',';
+            }
+            List<LoanBeCollectionVehFile> loanBeCollectionVehFiles = new ArrayList<>();
             BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanBeCollectionRecordVehInit.getSalesOrderSid()).getData();
             BusSalesOrderVehicle busSalesOrderVehicle1 = busSalesOrderVehicleFeign.details(loanBeCollectionRecordVehInit.getSaleVehSid()).getData();
             //催收记录sid
@@ -473,6 +491,9 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
             loanBeCollectionVehDetailsVo.setSids(loanBeCollectionVehFiles);
             loanBeCollectionVehDetailsVos.add(loanBeCollectionVehDetailsVo);
         }
+        if (StringUtils.isNotBlank(yckzVinNo)){
+            loanBeCollectionApplyDetailsVo.setLockCarRemarks("注：车架号" + yckzVinNo.substring(0,yckzVinNo.lastIndexOf(",")) + "已超过制度规定的远程控制次数，应要求客户全部结清车款。");
+        }
         loanBeCollectionApplyDetailsVo.setLoanBeCollectionVehDetails(loanBeCollectionVehDetailsVos);
         return loanBeCollectionApplyDetailsVo;
     }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.java

@@ -70,4 +70,6 @@ public interface LoanBeCollectionVehMapper extends BaseMapper<LoanBeCollectionVe
 
 	@Update("update loan_be_collection_veh set lockCarState = '待控制' where mainSid = #{businessSid}")
     void updateByMainSid(String businessSid);
+
+    int selBjBySaleVehSid(String saleVehSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.xml

@@ -1,13 +1,29 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.riskcenter.biz.loanbecollectionveh.LoanBeCollectionVehMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehVo">
-		SELECT * FROM loan_be_collection_veh <where> ${ew.sqlSegment} </where>
+        SELECT * FROM loan_be_collection_veh
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
     <select id="selectListAllVo" resultType="com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehVo">
-		SELECT * FROM loan_be_collection_veh <where> ${ew.sqlSegment} </where>
+        SELECT * FROM loan_be_collection_veh
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selBjBySaleVehSid" resultType="int">
+        SELECT COUNT(*)
+        FROM loan_be_collection_veh lv
+                     LEFT JOIN loan_be_collection_apply la
+                ON lv.`mainSid` = la.`sid`
+        WHERE lv.`saleVehSid` = #{saleVehSid}
+          AND la.`nodeState` = '已办结'
+          AND la.`collMeasure` LIKE CONCAT('%远程控制%')
     </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java

@@ -254,4 +254,8 @@ public class LoanBeCollectionVehService extends MybatisBaseService<LoanBeCollect
     public void updateByMainSid(String businessSid) {
         baseMapper.updateByMainSid(businessSid);
     }
+
+    public int selBjBySaleVehSid(String saleVehSid) {
+        return baseMapper.selBjBySaleVehSid(saleVehSid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyMapper.java

@@ -26,9 +26,12 @@
 package com.yxt.anrui.riskcenter.biz.loanvehclearanceapply;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceLockCarVo;
+import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehInit;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -64,4 +67,8 @@ public interface LoanVehClearanceApplyMapper extends BaseMapper<LoanVehClearance
 	List<LoanVehClearanceApplyVo> selectListVo();
 
 	String selectNum(String billNo);
+
+    IPage<LoanVehClearanceLockCarVo> lockCarList(IPage<LoanVehClearanceApply> page, @Param(Constants.WRAPPER) QueryWrapper<LoanVehClearanceApply> qw);
+
+	LoanVehClearanceVehInit initVehListBySaleVehSid(String saleVehSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyMapper.xml

@@ -1,14 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.riskcenter.biz.loanvehclearanceapply.LoanVehClearanceApplyMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanvehclearanceapply.LoanVehClearanceApplyVo">
-		SELECT * FROM loan_veh_clearance_apply <where> ${ew.sqlSegment} </where>
+        SELECT * FROM loan_veh_clearance_apply
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
-	<select id="selectListAllVo" resultType="com.yxt.anrui.riskcenter.api.loanvehclearanceapply.LoanVehClearanceApplyVo">
-		SELECT * FROM loan_veh_clearance_apply <where> ${ew.sqlSegment} </where>
+    <select id="selectListAllVo"
+            resultType="com.yxt.anrui.riskcenter.api.loanvehclearanceapply.LoanVehClearanceApplyVo">
+        SELECT * FROM loan_veh_clearance_apply
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
     <select id="selectNum" resultType="java.lang.String">
@@ -18,4 +25,89 @@
         order by billNo desc
                 limit 1
     </select>
+
+    <select id="lockCarList" resultType="com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceLockCarVo">
+        SELECT lv.saleVehSid,
+        lv.loanContractNo,
+        lv.vinNo,
+        lv.carNum,
+        lv.bankName,
+        lv.bankContractNo,
+        lv.customerName AS custName,
+        lv.borrowerName
+        FROM loan_be_collection_veh lv
+        LEFT JOIN loan_be_collection_apply la
+        ON lv.`mainSid` = la.`sid`
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="initVehListBySaleVehSid"
+            resultType="com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehInit">
+        SELECT
+                a1.`loanContractNo`,
+                RIGHT (a1.vinNo, 8) AS vinNo,
+                a1.vehMark AS carNum,
+                a1.`bankName`,
+                a1.bankContractNo,
+                a1.customer AS custName,
+                a1.borrowerName AS loanName,
+                a1.dueDate AS firstBeDate,
+                COUNT(a1.sid) AS beOverduePeriod,
+                SUM(a1.yq_total) AS beOverdueMoney,
+                ROUND(SUM(a1.yq_hsqs), 1) AS beOverdueMoneyAndPeriod,
+                a1.busVinSid AS saleVehSid,
+                a1.salesOrderSid,
+                a1.lockCarMoney
+        FROM
+                (SELECT
+                lrpd.sid,
+                lrpd.busVinSid,
+                lrpd.`loanContractNo`,
+                lrpd.bankContractNo,
+                lrpd.`vinNo`,
+                lrpd.`bankName`,
+                lrpd.borrowerName,
+                lrpd.dueDate,
+                lrpd.vehMark,
+                (
+                lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0))
+                ) AS yq_total,
+                (
+                lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0))
+                ) / lrpd.`dueMoney` AS yq_hsqs,
+                lrpd.customer,
+                ct.mobile,
+                lr.createTime,
+                lrpd.borrowerSid,
+                lrpd.salesOrderSid,
+                lv.lockCarMoney
+                FROM
+                `loan_repayment_plan_details` lrpd
+                LEFT JOIN `loan_repayment_history` lrh
+                ON lrh.planDetailSid = lrpd.`sid`
+                LEFT JOIN anrui_buscenter.`bus_sales_order_vehicle` bv
+                ON lrpd.busVinSid = bv.sid
+                LEFT JOIN
+                (SELECT
+                saleVehSid,
+                createTime
+                FROM
+                loan_be_collection_record
+                ORDER BY createTime DESC
+                LIMIT 100) lr
+                ON lrpd.busVinSid = lr.saleVehSid
+                LEFT JOIN anrui_crm.`crm_customer_temp` ct
+                ON lrpd.customerSid = ct.sid
+                LEFT JOIN loan_be_collection_veh lv
+                ON lrpd.busVinSid = lv.saleVehSid
+                WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; CURDATE()
+                GROUP BY lrpd.`sid`
+                HAVING (yq_total > 0)) a1
+        WHERE a1.busVinSid = #{saleVehSid}
+        GROUP BY a1.loanContractNo,
+                a1.vinNo,
+                a1.busVinSid
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyRest.java

@@ -25,6 +25,10 @@
  *********************************************************/
 package com.yxt.anrui.riskcenter.biz.loanvehclearanceapply;
 
+import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.*;
+import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceLockCarQuery;
+import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceLockCarVo;
+import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehDetailsVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -33,14 +37,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.LoanVehClearanceApply;
-import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.LoanVehClearanceApplyQuery;
-import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.LoanVehClearanceApplyVo;
-import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.LoanVehClearanceApplyDetailsVo;
-import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.LoanVehClearanceApplyDto;
-import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.LoanVehClearanceApplyFeign;
-
 /**
  * Project: anrui-riskcenter(车辆远程解控申请) <br/>
  * File: LoanVehClearanceApplyFeignFallback.java <br/>
@@ -71,6 +67,13 @@ public class LoanVehClearanceApplyRest implements LoanVehClearanceApplyFeign {
 		return rb.success().setData(pv);
 	}
 
+	@Override
+	public ResultBean<PagerVo<LoanVehClearanceLockCarVo>> lockCarList(PagerQuery<LoanVehClearanceLockCarQuery> pq) {
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<LoanVehClearanceLockCarVo> pv = loanVehClearanceApplyService.lockCarList(pq);
+		return rb.success().setData(pv);
+	}
+
 	@Override
 	@ApiOperation("新增或修改")
 	@PostMapping("/save")
@@ -89,6 +92,13 @@ public class LoanVehClearanceApplyRest implements LoanVehClearanceApplyFeign {
 		return rb.success();
 	}
 
+	@Override
+	public ResultBean<LoanVehClearanceApplyDetailsVo> init(LoanVehClearanceInitQuery loanVehClearanceInitQuery) {
+		ResultBean rb = ResultBean.fireFail();
+		LoanVehClearanceApplyDetailsVo loanVehClearanceApplyDetailsVo = loanVehClearanceApplyService.init(loanVehClearanceInitQuery);
+		return rb.success().setData(loanVehClearanceApplyDetailsVo);
+	}
+
 	@Override
 	@ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
@@ -97,4 +107,5 @@ public class LoanVehClearanceApplyRest implements LoanVehClearanceApplyFeign {
 		LoanVehClearanceApplyDetailsVo vo = loanVehClearanceApplyService.fetchDetailsVoBySid(sid);
 		return rb.success().setData(vo);
 	}
+
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyService.java

@@ -38,22 +38,19 @@ import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice;
 import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
-import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApply;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyDetailsVo;
-import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyVo;
-import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionFileVo;
+import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordVehInit;
 import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDetailsVo;
-import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDto;
 import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.*;
-import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehDetailsVo;
-import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehDto;
-import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehFile;
+import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.*;
 import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
 import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigate.LoanHomevisitInvestigateService;
 import com.yxt.anrui.riskcenter.biz.loansolutions.LoanSolutionsService;
@@ -71,7 +68,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -110,6 +107,8 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
     private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
     @Autowired
     private LoanHomevisitInvestigateService loanHomevisitInvestigateService;
+    @Autowired
+    SysStaffOrgFeign sysStaffOrgFeign;
 
     public PagerVo<LoanVehClearanceApplyVo> listPageVo(PagerQuery<LoanVehClearanceApplyQuery> pq) {
         LoanVehClearanceApplyQuery query = pq.getParams();
@@ -176,7 +175,31 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
         return p;
     }
 
-	public String saveOrUpdateDto(LoanVehClearanceApplyDto dto){
+    public PagerVo<LoanVehClearanceLockCarVo> lockCarList(PagerQuery<LoanVehClearanceLockCarQuery> pq) {
+        LoanVehClearanceLockCarQuery query = pq.getParams();
+        QueryWrapper<LoanVehClearanceApply> qw = new QueryWrapper<>();
+        qw.eq("la.useOrgSid", query.getUseOrgSid());
+        qw.eq("lv.lockCarState","1");
+        if (StringUtils.isNotBlank(query.getCustName())) {
+            qw.like("lv.customerName", query.getCustName());
+        }
+        if (StringUtils.isNotBlank(query.getBorrowerName())) {
+            qw.like("lv.borrowerName", query.getBorrowerName());
+        }
+        if (StringUtils.isNotBlank(query.getCarNum())) {
+            qw.like("lv.carNum", query.getCarNum());
+        }
+        if (query.getSaleVehSids().size() != 0) {
+            qw.notIn("lv.saleVehSid", query.getSaleVehSids());
+        }
+        qw.groupBy("lv.saleVehSid");
+        IPage<LoanVehClearanceApply> page = PagerUtil.queryToPage(pq);
+        IPage<LoanVehClearanceLockCarVo> pagging = baseMapper.lockCarList(page, qw);
+        PagerVo<LoanVehClearanceLockCarVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public String saveOrUpdateDto(LoanVehClearanceApplyDto dto) {
         String dtoSid = dto.getSid();
         List<LoanVehClearanceVehDto> loanVehClearanceVehDtoList = dto.getLoanVehClearanceVehDtoList();
         List<LoanVehClearanceFileVo> files = dto.getFiles();
@@ -194,7 +217,7 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
             }
             dto.setBillNo(billNo);
             String sid = this.insertByDto(dto);
-			if (files != null && files.size() > 0){
+            if (files != null && files.size() > 0) {
                 for (LoanVehClearanceFileVo file : files) {
                     LoanFile loanFile = new LoanFile();
                     loanFile.setLinkSid(sid);
@@ -214,8 +237,8 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
             return sid;
         }
         this.updateByDto(dto);
-		loanFileService.delByLinkSidOrType(dtoSid,LoanFileEnum.VEHCLEARANCE.getAttachType());
-		if (files != null && files.size() > 0){
+        loanFileService.delByLinkSidOrType(dtoSid, LoanFileEnum.VEHCLEARANCE.getAttachType());
+        if (files != null && files.size() > 0) {
             for (LoanVehClearanceFileVo file : files) {
                 LoanFile loanFile = new LoanFile();
                 loanFile.setLinkSid(dtoSid);
@@ -237,7 +260,7 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
         return dtoSid;
     }
 
-	public String insertByDto(LoanVehClearanceApplyDto dto){
+    public String insertByDto(LoanVehClearanceApplyDto dto) {
         LoanVehClearanceApply entity = new LoanVehClearanceApply();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         entity.setNodeState("待提交");
@@ -245,7 +268,7 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
         return entity.getSid();
     }
 
-	public void updateByDto(LoanVehClearanceApplyDto dto){
+    public void updateByDto(LoanVehClearanceApplyDto dto) {
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
@@ -255,14 +278,14 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
         baseMapper.updateById(entity);
     }
 
-	public LoanVehClearanceApplyDetailsVo fetchDetailsVoBySid(String sid){
+    public LoanVehClearanceApplyDetailsVo fetchDetailsVoBySid(String sid) {
         LoanVehClearanceApply entity = fetchBySid(sid);
         LoanVehClearanceApplyDetailsVo vo = new LoanVehClearanceApplyDetailsVo();
         BeanUtil.copyProperties(entity, vo);
         vo.setCreateTime(DateUtil.formatDate(entity.getCreateTime()));
         List<LoanFile> loanFiles = loanFileService.selectByLinkSid(sid, LoanFileEnum.VEHCLEARANCE.getAttachType());
         List<LoanVehClearanceFileVo> loanVehClearanceFileVos = new ArrayList<>();
-		if (loanFiles != null && loanFiles.size() > 0){
+        if (loanFiles != null && loanFiles.size() > 0) {
             for (LoanFile loanFile : loanFiles) {
                 LoanVehClearanceFileVo loanVehClearanceFileVo = new LoanVehClearanceFileVo();
                 String filePath = loanFile.getFilePath();
@@ -316,4 +339,69 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
         vo.setLoanVehClearanceVehDetailsVoList(loanVehClearanceVehDetailsVoList);
         return vo;
     }
+
+
+    public LoanVehClearanceApplyDetailsVo init(LoanVehClearanceInitQuery query) {
+        List<String> saleVehSids = query.getSaleVehSids();
+        LoanVehClearanceApplyDetailsVo loanVehClearanceApplyDetailsVo = new LoanVehClearanceApplyDetailsVo();
+        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(query.getOrgPath()).getData();
+        loanVehClearanceApplyDetailsVo.setDeptSid(sysOrganizationVo.getSid());
+        loanVehClearanceApplyDetailsVo.setDeptName(sysOrganizationVo.getName());
+        SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData();
+        loanVehClearanceApplyDetailsVo.setCreateBySid(query.getUserSid());
+        loanVehClearanceApplyDetailsVo.setCreateByName(sysUserVo.getName());
+        loanVehClearanceApplyDetailsVo.setCreateTime(DateUtil.formatDate(new Date()));
+        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+        SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
+        loanVehClearanceApplyDetailsVo.setUseOrgSid(useOrgSid);
+        loanVehClearanceApplyDetailsVo.setUseOrgName(sysOrganizationVo1.getName());
+        loanVehClearanceApplyDetailsVo.setOrgPath(query.getOrgPath());
+        List<LoanVehClearanceVehDetailsVo> loanVehClearanceVehDetailsVoList = new ArrayList<>();
+        for (String saleVehSid : saleVehSids) {
+            LoanVehClearanceVehInit loanVehClearanceVehInit = baseMapper.initVehListBySaleVehSid(saleVehSid);
+            LoanVehClearanceVehDetailsVo loanVehClearanceVehDetailsVo = new LoanVehClearanceVehDetailsVo();
+            BeanUtil.copyProperties(loanVehClearanceVehInit, loanVehClearanceVehDetailsVo);
+            loanVehClearanceVehDetailsVo.setCustomerName(loanVehClearanceVehInit.getCustName());
+            loanVehClearanceVehDetailsVo.setBorrowerName(loanVehClearanceVehInit.getLoanName());
+            List<LoanVehClearanceVehFile> loanVehClearanceVehFiles = new ArrayList<>();
+            BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanVehClearanceVehInit.getSalesOrderSid()).getData();
+            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(loanVehClearanceVehInit.getSaleVehSid()).getData();
+            //催收记录sid
+            LoanVehClearanceVehFile LoanVehClearanceVehFile1 = new LoanVehClearanceVehFile();
+            LoanVehClearanceVehFile1.setName("催收记录");
+            LoanVehClearanceVehFile1.setSid(loanVehClearanceVehInit.getSaleVehSid());
+            loanVehClearanceVehFiles.add(LoanVehClearanceVehFile1);
+            //开票管理sid
+            FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceFeign.selectByVinAndContractNo(busSalesOrderVehicle.getLinkSid(), busSalesOrder.getContractNo()).getData();
+            LoanVehClearanceVehFile LoanVehClearanceVehFile2 = new LoanVehClearanceVehFile();
+            LoanVehClearanceVehFile2.setName("开票信息");
+            LoanVehClearanceVehFile2.setSid(finVehicleInvoice.getSid());
+            loanVehClearanceVehFiles.add(LoanVehClearanceVehFile2);
+            //月还明细sid
+            LoanVehClearanceVehFile LoanVehClearanceVehFile3 = new LoanVehClearanceVehFile();
+            LoanVehClearanceVehFile3.setName("月还明细");
+            LoanVehClearanceVehFile3.setSid(saleVehSid);
+            loanVehClearanceVehFiles.add(LoanVehClearanceVehFile3);
+            //金融方案sid
+            LoanVehClearanceVehFile LoanVehClearanceVehFile4 = new LoanVehClearanceVehFile();
+            LoanVehClearanceVehFile4.setName("金融方案");
+            LoanVehClearanceVehFile4.setSid(loanVehClearanceVehInit.getSalesOrderSid());
+            loanVehClearanceVehFiles.add(LoanVehClearanceVehFile4);
+            //家访考察报告sid
+            String sid = loanHomevisitInvestigateService.selectByBorrSid(busSalesOrderVehicle.getBorrowerSid());
+            LoanVehClearanceVehFile LoanVehClearanceVehFile5 = new LoanVehClearanceVehFile();
+            LoanVehClearanceVehFile5.setName("家访考察报告");
+            LoanVehClearanceVehFile5.setSid(sid);
+            loanVehClearanceVehFiles.add(LoanVehClearanceVehFile5);
+            //家访考察资料sid
+            LoanVehClearanceVehFile LoanVehClearanceVehFile6 = new LoanVehClearanceVehFile();
+            LoanVehClearanceVehFile6.setName("家访考察资料");
+            LoanVehClearanceVehFile6.setSid(sid);
+            loanVehClearanceVehFiles.add(LoanVehClearanceVehFile6);
+            loanVehClearanceVehDetailsVo.setSids(loanVehClearanceVehFiles);
+            loanVehClearanceVehDetailsVoList.add(loanVehClearanceVehDetailsVo);
+        }
+        loanVehClearanceApplyDetailsVo.setLoanVehClearanceVehDetailsVoList(loanVehClearanceVehDetailsVoList);
+        return loanVehClearanceApplyDetailsVo;
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CarModelVo.java

@@ -43,4 +43,6 @@ public class CarModelVo implements Vo {
     private List<String> aRouterParamType;
 
     private List<String> aRouterParamValue;
+
+    private String btnName;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitVo.java

@@ -42,4 +42,6 @@ public class AppLoanHomeVisitVo implements Vo {
     private List<String> aRouterParamType;
 
     private List<String> aRouterParamValue;
+
+    private String btnName;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java

@@ -114,6 +114,7 @@ public class CommonService {
         aRouterParamValue.add(saleOrderSid);
         carModelVo.setARouterParamType(aRouterParamType);
         carModelVo.setARouterParamValue(aRouterParamValue);
+        carModelVo.setBtnName("销售订单");
         return rb.success().setData(carModelVo);
     }
 
@@ -143,6 +144,7 @@ public class CommonService {
         aRouterParamValue.add("true");
         carModelVo.setARouterParamType(aRouterParamType);
         carModelVo.setARouterParamValue(aRouterParamValue);
+        carModelVo.setBtnName("金融方案");
         return rb.success().setData(carModelVo);
     }
 

doc/databases/报表中心.sql

@@ -12,12 +12,15 @@ UPDATE daily_report r
                    and bo.sid not in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo)
                  group by bo.createOrgSid
                  union all
-                 select ifnull(sum(bo.platformNo), 0) as scount, bo.useOrgSid, bd.vehicleSid, bd.configSid modelConfigSid
+                 select ifnull(sum(bo.platformNo), 0) as scount,
+                        bo.useOrgSid,
+                        bd.vehicleSid,
+                        bd.configSid                     modelConfigSid
                  from anrui_base.bus_vehicle_order bo
                           left join anrui_base.bus_vehicle_apply_detail bd on bd.sid = bo.purchaseApplyMediumModelSid
-                 where
-                    bo.isDelete <> 1
-                   and LENGTH(offlineDate) = 0 and bo.orderStatus != '已作废'
+                 where bo.isDelete <> 1
+                   and LENGTH(offlineDate) = 0
+                   and bo.orderStatus != '已作废'
                    and bo.sid not in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo)
                  group by bo.createOrgSid
              ) as v
@@ -36,7 +39,7 @@ UPDATE daily_report r
     INNER JOIN (
         select sum(v.scount) as scount, v.useOrgSid, v.modelSid, v.modelConfigSid
         from (
-                 select ifnull(sum(si.num), 0) as scount, si.useOrgSid, si.modelSid, si.configSid modelConfigSid
+                 /* select ifnull(sum(si.num), 0) as scount, si.useOrgSid, si.modelSid, si.configSid modelConfigSid
                   from anrui_base.bus_vehicle_order bo
                            left join anrui_scm.scm_apply_inbound si on bo.purchaseRequisitionSid = si.vehicleOrderSid
                   where (si.nodeState != '已办结' and si.nodeState != '终止')
@@ -45,13 +48,33 @@ UPDATE daily_report r
                     and bo.sid in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo)
                   group by bo.createOrgSid
                   union all
-                 select ifnull(sum(bo.id), 0) as scount, bo.useOrgSid, bd.vehicleSid, bd.configSid modelConfigSid
+                  select ifnull(sum(bo.platformNo), 0) as scount, bo.useOrgSid, bd.vehicleSid, bd.configSid modelConfigSid
                   from anrui_base.bus_vehicle_order bo
                            left join anrui_base.bus_vehicle_apply_detail bd on bd.sid = bo.purchaseApplyMediumModelSid
                   where
                           bo.isDelete <> 1
                     and LENGTH(offlineDate) >0
                     and bo.sid in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo)
+                  group by bo.createOrgSid*/
+                 SELECT si.useOrgSid,
+                        si.modelSid,
+                        si.configSid            modelConfigSid,
+                        bo.sid,
+                        ifnull(ab.counts, 0) as scount
+                 FROM anrui_base.bus_vehicle_order bo
+                          LEFT JOIN anrui_scm.scm_apply_inbound si ON bo.purchaseRequisitionSid = si.vehicleOrderSid
+                          LEFT JOIN (
+                     SELECT bbbbo.linkSid,
+                            ifnull(count(bbbbo.linkSid), 0) as counts
+                     FROM anrui_buscenter.bus_sales_vehicle_order bbbbo
+                              LEFT JOIN anrui_buscenter.bus_sales_order bb ON bb.sid = bbbbo.salesOrderSid
+                     WHERE LENGTH(bb.nodeState) > 0
+                       AND bb.nodeState != '终止'
+                     group by bbbbo.linkSid
+                 ) ab ON ab.linkSid = bo.sid
+                 WHERE (si.nodeState != '已办结' AND si.nodeState != '终止')
+                   AND bo.isDelete <> 1
+                   AND LENGTH(offlineDate) > 0
                  group by bo.createOrgSid
              ) as v
         GROUP BY v.`useOrgSid`,
@@ -253,7 +276,9 @@ UPDATE daily_report r
                                left join anrui_base.base_vehicle_out bvo on bv.sid = bvo.vinSid
                                left join anrui_base.base_vehicle_out_apply bvoa on bvoa.sid = bvo.mainSid
                       where bv.salesDate like concat('%', CURDATE(), '%')
-                        and bvoa.saleTypeKey = '001' and (bvo.materialTypeKey = '001' or bvo.materialTypeValue is null or length(bvo.materialTypeValue) = 0)
+                        and bvoa.saleTypeKey = '001'
+                        and (bvo.materialTypeKey = '001' or bvo.materialTypeValue is null or
+                             length(bvo.materialTypeValue) = 0)
                       group by bv.useOrgSid, bv.modelSid, bv.modelConfigSid) ss
                 group by ss.useOrgSid, ss.modelSid, ss.modelConfigSid
     ) AS s ON r.useOrgSid = s.useOrgSid
@@ -269,7 +294,9 @@ UPDATE daily_report r
                                left join anrui_base.base_vehicle_out bvo on bv.sid = bvo.vinSid
                                left join anrui_base.base_vehicle_out_apply bvoa on bvoa.sid = bvo.mainSid
                       where bv.salesDate like concat('%', CURDATE(), '%')
-                        and bvoa.saleTypeKey = '002' and (bvo.materialTypeKey = '001' or bvo.materialTypeValue is null or length(bvo.materialTypeValue) = 0)
+                        and bvoa.saleTypeKey = '002'
+                        and (bvo.materialTypeKey = '001' or bvo.materialTypeValue is null or
+                             length(bvo.materialTypeValue) = 0)
                       group by bv.useOrgSid, bv.modelSid, bv.modelConfigSid) ss
                 group by ss.useOrgSid, ss.modelSid, ss.modelConfigSid
     ) AS s ON r.useOrgSid = s.useOrgSid
@@ -302,7 +329,9 @@ UPDATE daily_report r
                                left join anrui_base.base_vehicle_out bvo on bv.sid = bvo.vinSid
                                left join anrui_base.base_vehicle_out_apply bvoa on bvoa.sid = bvo.mainSid
                       where bv.salesDate like concat('%', DATE_FORMAT(CURDATE(), '%Y-%m'), '%')
-                        and bvoa.saleTypeKey = '001' and (bvo.materialTypeKey = '001' or bvo.materialTypeValue is null or length(bvo.materialTypeValue) = 0)
+                        and bvoa.saleTypeKey = '001'
+                        and (bvo.materialTypeKey = '001' or bvo.materialTypeValue is null or
+                             length(bvo.materialTypeValue) = 0)
                       group by bv.useOrgSid, bv.modelSid, bv.modelConfigSid) ss
                 group by ss.useOrgSid, ss.modelSid, ss.modelConfigSid
     ) AS s ON r.useOrgSid = s.useOrgSid
@@ -318,7 +347,9 @@ UPDATE daily_report r
                                left join anrui_base.base_vehicle_out bvo on bv.sid = bvo.vinSid
                                left join anrui_base.base_vehicle_out_apply bvoa on bvoa.sid = bvo.mainSid
                       where bv.salesDate like concat('%', DATE_FORMAT(CURDATE(), '%Y-%m'), '%')
-                        and bvoa.saleTypeKey = '002' and (bvo.materialTypeKey = '001' or bvo.materialTypeValue is null or length(bvo.materialTypeValue) = 0)
+                        and bvoa.saleTypeKey = '002'
+                        and (bvo.materialTypeKey = '001' or bvo.materialTypeValue is null or
+                             length(bvo.materialTypeValue) = 0)
                       group by bv.useOrgSid, bv.modelSid, bv.modelConfigSid) ss
                 group by ss.useOrgSid, ss.modelSid, ss.modelConfigSid
     ) AS s ON r.useOrgSid = s.useOrgSid
@@ -351,7 +382,9 @@ UPDATE daily_report r
                                left join anrui_base.base_vehicle_out bvo on bv.sid = bvo.vinSid
                                left join anrui_base.base_vehicle_out_apply bvoa on bvoa.sid = bvo.mainSid
                       where bv.salesDate like concat('%', DATE_FORMAT(CURDATE(), '%Y'), '%')
-                        and bvoa.saleTypeKey = '001' and (bvo.materialTypeKey = '001' or bvo.materialTypeValue is null or length(bvo.materialTypeValue) = 0)
+                        and bvoa.saleTypeKey = '001'
+                        and (bvo.materialTypeKey = '001' or bvo.materialTypeValue is null or
+                             length(bvo.materialTypeValue) = 0)
                       group by bv.useOrgSid, bv.modelSid, bv.modelConfigSid) ss
                 group by ss.useOrgSid, ss.modelSid, ss.modelConfigSid
     ) AS s ON r.useOrgSid = s.useOrgSid
@@ -367,7 +400,9 @@ UPDATE daily_report r
                                left join anrui_base.base_vehicle_out bvo on bv.sid = bvo.vinSid
                                left join anrui_base.base_vehicle_out_apply bvoa on bvoa.sid = bvo.mainSid
                       where bv.salesDate like concat('%', DATE_FORMAT(CURDATE(), '%Y'), '%')
-                        and bvoa.saleTypeKey = '002' and (bvo.materialTypeKey = '001' or bvo.materialTypeValue is null or length(bvo.materialTypeValue) = 0)
+                        and bvoa.saleTypeKey = '002'
+                        and (bvo.materialTypeKey = '001' or bvo.materialTypeValue is null or
+                             length(bvo.materialTypeValue) = 0)
                       group by bv.useOrgSid, bv.modelSid, bv.modelConfigSid) ss
                 group by ss.useOrgSid, ss.modelSid, ss.modelConfigSid
     ) AS s ON r.useOrgSid = s.useOrgSid
@@ -635,46 +670,98 @@ where DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
 --  ==============================================
 -- 欠款出库数量、欠款出库金额万元、金融未放款数量、金融未放款金额（万元）
 -- 欠款出库数量--截止当日欠款出库申请通过且未回清款的台数
-update daily_report r inner join (select sum(cc.scount) as scount, cc.useOrgSid, cc.vehMConfigSid, cc.vehModelSid
-                                  from (
-                                           select count(bdad.id)    as scount,
+update daily_report r inner join (SELECT SUM(cc.scount) AS scount,
+                                         cc.useOrgSid,
+                                         cc.vehMConfigSid,
+                                         cc.vehModelSid
+                                  FROM (
+                                           SELECT COUNT(a.id) AS scount,
+                                                  a.useOrgSid,
+                                                  a.NAME,
+                                                  a.contractNo,
+                                                  a.vehMConfigSid,
+                                                  a.vehModelSid
+                                           FROM (
+                                                    SELECT bdad.id,
                                                            ba.useOrgSid,
-                                                  bm.modelConfigSid as vehMConfigSid,
-                                                  bm.modelSid       as vehModelSid
-                                           from anrui_buscenter.bus_delivered_apply_details bdad
-                                                    left join anrui_buscenter.bus_delivered_apply ba on ba.sid = bdad.applySid
-                                                    left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = bdad.busVinSid
-                                                    left join anrui_buscenter.bus_sales_order bo on bo.sid = bv.salesOrderSid
-                                                    left join anrui_buscenter.bus_sales_order_model bm on bm.salesOrderSid = bo.sid
-                                                    left join anrui_fin.fin_uncollected_receivables_detailed fd
-                                                              on fd.busVinSid = bdad.busVinSid
-                                                    left join anrui_fin.fin_selected_receivables_detailed fs
-                                                              on fs.receivablesSid = fd.sid
-                                           where ba.nodeState = '已办结'
-                                             and ba.typeState = 1
-                                           group by bdad.busVinSid, ba.useOrgSid, bm.modelSid, bm.modelConfigSid
-                                           having sum(fd.reveivableMoney) > ifnull(sum(fs.subscriptionMoney), 0)
-                                           union all
-                                           select count(bdad.id)    as scount,
+                                                           bm.modelConfigSid AS vehMConfigSid,
+                                                           bm.modelSid       AS vehModelSid,
+                                                           so.NAME,
+                                                           SUM(s.reveivableMoney),
+                                                           SUM(s.subscriptionMoney),
+                                                           bo.contractNo
+                                                    FROM anrui_buscenter.bus_delivered_apply_details bdad
+                                                             LEFT JOIN anrui_buscenter.bus_delivered_apply ba ON ba.sid = bdad.applySid
+                                                             LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bv ON bv.sid = bdad.busVinSid
+                                                             LEFT JOIN anrui_buscenter.bus_sales_order bo ON bo.sid = bv.salesOrderSid
+                                                             LEFT JOIN anrui_buscenter.bus_sales_order_model bm ON bm.salesOrderSid = bo.sid
+                                                             LEFT JOIN (
+                                                        SELECT fd.reveivableMoney,
+                                                               fd.busVinSid,
+                                                               IFNULL(SUM(fs.subscriptionMoney), 0) AS subscriptionMoney
+                                                        FROM anrui_fin.fin_uncollected_receivables_detailed fd
+                                                                 LEFT JOIN anrui_fin.fin_selected_receivables_detailed fs
+                                                                           ON fs.receivablesSid = fd.sid
+                                                        WHERE fd.kxState = '01'
+                                                          AND fs.auditState = 3
+                                                        GROUP BY fd.sid
+                                                    ) s ON s.busVinSid = bv.sid
+                                                             LEFT JOIN anrui_portal.sys_organization so ON so.sid = ba.useOrgSid
+                                                    WHERE ba.nodeState = '已办结'
+                                                      AND ba.typeState = 1
+                                                    GROUP BY bv.sid,
                                                              ba.useOrgSid,
-                                                  bm.modelConfigSid as vehMConfigSid,
-                                                  bm.modelSid       as vehModelSid
-                                           from anrui_buscenter.bus_arrears_carry_vehicle_details bdad
-                                                    left join anrui_buscenter.bus_arrears_carry_vehicle_apply ba
-                                                              on ba.sid = bdad.applySid
-                                                    left join anrui_buscenter.bus_sales_order_vehicle bv on bv.linkSid = bdad.vinSid
-                                                    left join anrui_buscenter.bus_sales_order bo on bo.sid = bv.salesOrderSid
-                                                    left join anrui_buscenter.bus_sales_order_model bm on bm.salesOrderSid = bo.sid
-                                                    left join anrui_fin.fin_uncollected_receivables_detailed fd
-                                                              on fd.busVinSid = bv.sid
-                                                    left join anrui_fin.fin_selected_receivables_detailed fs
-                                                              on fs.receivablesSid = fd.sid
-                                                    left join anrui_base.base_vehicle bbv on bbv.sid = bv.linkSid
-                                           where ba.nodeState = '已办结'
-                                             and ba.paymentMethodKey = 1
-                                             and bbv.vehicleState = '0002'
-                                           group by bv.sid, ba.useOrgSid, bm.modelSid, bm.modelConfigSid
-                                           having sum(fd.reveivableMoney) > ifnull(sum(fs.subscriptionMoney), 0)) cc
+                                                             bm.modelSid,
+                                                             bm.modelConfigSid
+                                                    HAVING SUM(s.reveivableMoney) > SUM(s.subscriptionMoney)) a
+                                           GROUP BY a.useOrgSid,
+                                                    a.vehMConfigSid,
+                                                    a.vehModelSid
+                                           UNION ALL
+                                           SELECT COUNT(a.id) AS scount,
+                                                  a.useOrgSid,
+                                                  a.name,
+                                                  a.contractNo,
+                                                  a.vehMConfigSid,
+                                                  a.vehModelSid
+                                           FROM (SELECT bdad.id,
+                                                        ba.useOrgSid,
+                                                        bm.modelConfigSid AS vehMConfigSid,
+                                                        bm.modelSid       AS vehModelSid,
+                                                        so.name,
+                                                        SUM(s.reveivableMoney),
+                                                        SUM(s.subscriptionMoney),
+                                                        bo.contractNo
+                                                 FROM anrui_buscenter.bus_arrears_carry_vehicle_details bdad
+                                                          LEFT JOIN anrui_buscenter.bus_arrears_carry_vehicle_apply ba
+                                                                    ON ba.sid = bdad.applySid
+                                                          LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bv ON bv.linkSid = bdad.vinSid
+                                                          LEFT JOIN anrui_buscenter.bus_sales_order bo ON bo.sid = bv.salesOrderSid
+                                                          LEFT JOIN anrui_buscenter.bus_sales_order_model bm ON bm.salesOrderSid = bo.sid
+                                                          LEFT JOIN anrui_base.base_vehicle bbv ON bbv.sid = bv.linkSid
+                                                          LEFT JOIN (SELECT fd.reveivableMoney,
+                                                                            fd.busVinSid,
+                                                                            IFNULL(SUM(fs.subscriptionMoney), 0) AS subscriptionMoney
+                                                                     FROM anrui_fin.fin_uncollected_receivables_detailed fd
+                                                                              LEFT JOIN anrui_fin.fin_selected_receivables_detailed fs
+                                                                                        ON fs.receivablesSid = fd.sid
+                                                                     WHERE fd.kxState = '01'
+                                                                       AND fs.auditState = 3
+                                                                     GROUP BY fd.sid) s ON s.busVinSid = bv.sid
+                                                          LEFT JOIN anrui_portal.sys_organization so ON so.sid = ba.useOrgSid
+                                                 WHERE ba.nodeState = '已办结'
+                                                   AND ba.paymentMethodKey = 1
+                                                   AND bbv.vehicleState = '0002'
+                                                 GROUP BY bv.sid,
+                                                          ba.useOrgSid,
+                                                          bm.modelSid,
+                                                          bm.modelConfigSid
+                                                 HAVING SUM(s.reveivableMoney) > SUM(s.subscriptionMoney)) a
+                                           GROUP BY a.useOrgSid,
+                                                    a.vehMConfigSid, a.vehModelSid) cc
+                                  GROUP BY cc.useOrgSid,
+                                           cc.vehMConfigSid,
+                                           cc.vehModelSid
 ) s
     on r.useOrgSid = s.useOrgSid
         and r.vehModelSid = s.vehModelSid
@@ -684,46 +771,130 @@ where DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
 
 
 -- 欠款出库金融--截止当日欠款出库申请通过且未回清款的台数欠款总额
-update daily_report r inner join (select sum(cc.scount) as scount, cc.useOrgSid, cc.vehMConfigSid, cc.vehModelSid
-                                  from (
-                                           select (sum(fd.reveivableMoney) - sum(fs.subscriptionMoney)) as scount,
+update daily_report r inner join (SELECT
+                                      sum( cc.scount ) AS scount,
+                                      cc.useOrgSid,
+                                      cc.vehMConfigSid,
+                                      cc.vehModelSid
+                                  FROM
+                                      (
+                                          SELECT
+                                              SUM( a.scount ) AS scount,
+                                              a.useOrgSid,
+                                              a.NAME,
+                                              a.contractNo,
+                                              a.vehMConfigSid,
+                                              a.vehModelSid
+                                          FROM
+                                              (
+                                                  SELECT
+                                                      bdad.id,
                                                       ba.useOrgSid,
-                                                  bm.modelConfigSid                                     as vehMConfigSid,
-                                                  bm.modelSid                                           as vehModelSid
-                                           from anrui_buscenter.bus_delivered_apply_details bdad
-                                                    left join anrui_buscenter.bus_delivered_apply ba on ba.sid = bdad.applySid
-                                                    left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = bdad.busVinSid
-                                                    left join anrui_buscenter.bus_sales_order bo on bo.sid = bv.salesOrderSid
-                                                    left join anrui_buscenter.bus_sales_order_model bm on bm.salesOrderSid = bo.sid
-                                                    left join anrui_fin.fin_uncollected_receivables_detailed fd
-                                                              on fd.busVinSid = bdad.busVinSid
-                                                    left join anrui_fin.fin_selected_receivables_detailed fs
-                                                              on fs.receivablesSid = fd.sid
-                                           where ba.nodeState = '已办结'
-                                             and ba.typeState = 1
-                                           group by bdad.busVinSid, ba.useOrgSid, bm.modelSid, bm.modelConfigSid
-                                           having sum(fd.reveivableMoney) > ifnull(sum(fs.subscriptionMoney), 0)
-                                           union all
-                                           select (sum(fd.reveivableMoney) - sum(fs.subscriptionMoney)) as scount,
+                                                      bm.modelConfigSid AS vehMConfigSid,
+                                                      bm.modelSid AS vehModelSid,
+                                                      so.NAME,
+                                                      SUM( s.reveivableMoney ),
+                                                      SUM( s.subscriptionMoney ),
+                                                      bo.contractNo,
+                                                      (
+                                                              SUM( s.reveivableMoney ) - SUM( s.subscriptionMoney )) AS scount
+                                                  FROM
+                                                      anrui_buscenter.bus_delivered_apply_details bdad
+                                                          LEFT JOIN anrui_buscenter.bus_delivered_apply ba ON ba.sid = bdad.applySid
+                                                          LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bv ON bv.sid = bdad.busVinSid
+                                                          LEFT JOIN anrui_buscenter.bus_sales_order bo ON bo.sid = bv.salesOrderSid
+                                                          LEFT JOIN anrui_buscenter.bus_sales_order_model bm ON bm.salesOrderSid = bo.sid
+                                                          LEFT JOIN (
+                                                          SELECT
+                                                              fd.reveivableMoney,
+                                                              fd.busVinSid,
+                                                              IFNULL( SUM( fs.subscriptionMoney ), 0 ) AS subscriptionMoney
+                                                          FROM
+                                                              anrui_fin.fin_uncollected_receivables_detailed fd
+                                                                  LEFT JOIN anrui_fin.fin_selected_receivables_detailed fs ON fs.receivablesSid = fd.sid
+                                                          WHERE
+                                                                  fd.kxState = '01'
+                                                            AND fs.auditState = 3
+                                                          GROUP BY
+                                                              fd.sid
+                                                      ) s ON s.busVinSid = bv.sid
+                                                          LEFT JOIN anrui_portal.sys_organization so ON so.sid = ba.useOrgSid
+                                                  WHERE
+                                                          ba.nodeState = '已办结'
+                                                    AND ba.typeState = 1
+                                                  GROUP BY
+                                                      bv.sid,
                                                       ba.useOrgSid,
-                                                  bm.modelConfigSid                                     as vehMConfigSid,
-                                                  bm.modelSid                                           as vehModelSid
-                                           from anrui_buscenter.bus_arrears_carry_vehicle_details bdad
-                                                    left join anrui_buscenter.bus_arrears_carry_vehicle_apply ba
-                                                              on ba.sid = bdad.applySid
-                                                    left join anrui_buscenter.bus_sales_order_vehicle bv on bv.linkSid = bdad.vinSid
-                                                    left join anrui_buscenter.bus_sales_order bo on bo.sid = bv.salesOrderSid
-                                                    left join anrui_buscenter.bus_sales_order_model bm on bm.salesOrderSid = bo.sid
-                                                    left join anrui_fin.fin_uncollected_receivables_detailed fd
-                                                              on fd.busVinSid = bv.sid
-                                                    left join anrui_fin.fin_selected_receivables_detailed fs
-                                                              on fs.receivablesSid = fd.sid
-                                                    left join anrui_base.base_vehicle bbv on bbv.sid = bv.linkSid
-                                           where ba.nodeState = '已办结'
-                                             and ba.paymentMethodKey = 1
-                                             and bbv.vehicleState = '0002'
-                                           group by bv.sid, ba.useOrgSid, bm.modelSid, bm.modelConfigSid
-                                           having sum(fd.reveivableMoney) > ifnull(sum(fs.subscriptionMoney), 0)) cc
+                                                      bm.modelSid,
+                                                      bm.modelConfigSid
+                                                  HAVING
+                                                          SUM( s.reveivableMoney ) > SUM( s.subscriptionMoney )) a
+                                          GROUP BY
+                                              a.useOrgSid,
+                                              a.vehMConfigSid,
+                                              a.vehModelSid UNION ALL
+                                          SELECT
+                                              SUM( a.scount ) AS scount,
+                                              a.useOrgSid,
+                                              a.NAME,
+                                              a.contractNo,
+                                              a.vehMConfigSid,
+                                              a.vehModelSid
+                                          FROM
+                                              (
+                                                  SELECT
+                                                      bdad.id,
+                                                      ba.useOrgSid,
+                                                      bm.modelConfigSid AS vehMConfigSid,
+                                                      bm.modelSid AS vehModelSid,
+                                                      so.NAME,
+                                                      SUM( s.reveivableMoney ),
+                                                      SUM( s.subscriptionMoney ),
+                                                      bo.contractNo,
+                                                      (
+                                                              SUM( s.reveivableMoney ) - SUM( s.subscriptionMoney )) AS scount
+                                                  FROM
+                                                      anrui_buscenter.bus_arrears_carry_vehicle_details bdad
+                                                          LEFT JOIN anrui_buscenter.bus_arrears_carry_vehicle_apply ba ON ba.sid = bdad.applySid
+                                                          LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bv ON bv.linkSid = bdad.vinSid
+                                                          LEFT JOIN anrui_buscenter.bus_sales_order bo ON bo.sid = bv.salesOrderSid
+                                                          LEFT JOIN anrui_buscenter.bus_sales_order_model bm ON bm.salesOrderSid = bo.sid
+                                                          LEFT JOIN anrui_base.base_vehicle bbv ON bbv.sid = bv.linkSid
+                                                          LEFT JOIN (
+                                                          SELECT
+                                                              fd.reveivableMoney,
+                                                              fd.busVinSid,
+                                                              IFNULL( SUM( fs.subscriptionMoney ), 0 ) AS subscriptionMoney
+                                                          FROM
+                                                              anrui_fin.fin_uncollected_receivables_detailed fd
+                                                                  LEFT JOIN anrui_fin.fin_selected_receivables_detailed fs ON fs.receivablesSid = fd.sid
+                                                          WHERE
+                                                                  fd.kxState = '01'
+                                                            AND fs.auditState = 3
+                                                          GROUP BY
+                                                              fd.sid
+                                                      ) s ON s.busVinSid = bv.sid
+                                                          LEFT JOIN anrui_portal.sys_organization so ON so.sid = ba.useOrgSid
+                                                  WHERE
+                                                          ba.nodeState = '已办结'
+                                                    AND ba.paymentMethodKey = 1
+                                                    AND bbv.vehicleState = '0002'
+                                                  GROUP BY
+                                                      bv.sid,
+                                                      ba.useOrgSid,
+                                                      bm.modelSid,
+                                                      bm.modelConfigSid
+                                                  HAVING
+                                                          SUM( s.reveivableMoney ) > SUM( s.subscriptionMoney )) a
+                                          GROUP BY
+                                              a.useOrgSid,
+                                              a.vehMConfigSid,
+                                              a.vehModelSid
+                                      ) cc
+                                  GROUP BY
+                                      cc.useOrgSid,
+                                      cc.vehMConfigSid,
+                                      cc.vehModelSid
 ) s
     on r.useOrgSid = s.useOrgSid
         and r.vehModelSid = s.vehModelSid
@@ -734,38 +905,109 @@ where DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
 
 -- 金融未放款数量--- 截止当日贷款业务已出库且融资放款未认款的台数
 update daily_report r inner join (
-    select count(bv.id) as scount, bo.useOrgSid, bm.modelSid, bm.modelConfigSid, fd.reveivableMoney
+    SELECT
+        count( a.id ) AS scount,
+        a.useOrgSid,
+        a.NAME,
+        a.contractNo,
+        a.vehMConfigSid,
+        a.vehModelSid
+    FROM
+        (SELECT bv.id,
+                bo.useOrgSid,
+                bm.modelConfigSid AS vehMConfigSid,
+                bm.modelSid       AS vehModelSid,
+                so.NAME,
+                SUM(s.reveivableMoney),
+                SUM(s.subscriptionMoney),
+                bo.contractNo
          from anrui_buscenter.bus_sales_order_vehicle bv
                   left join anrui_buscenter.bus_sales_order bo on bo.sid = bv.salesOrderSid
                   left join anrui_base.base_vehicle bbv on bbv.sid = bv.linkSid
                   left join anrui_buscenter.bus_sales_order_model bm on bm.salesOrderSid = bv.salesOrderSid
-             left join anrui_fin.fin_uncollected_receivables_detailed fd on fd.busVinSid = bv.sid
-             left join anrui_fin.fin_selected_receivables_detailed fs on fs.receivablesSid = fd.sid
-    where bo.payTypeKey = 2
+                  LEFT JOIN (
+             SELECT
+                 fd.reveivableMoney,
+                 fd.busVinSid,
+                 IFNULL( SUM( fs.subscriptionMoney ), 0 ) AS subscriptionMoney
+             FROM
+                 anrui_fin.fin_uncollected_receivables_detailed fd
+                     LEFT JOIN anrui_fin.fin_selected_receivables_detailed fs ON fs.receivablesSid = fd.sid
+             WHERE
+                     fd.kxState = '01'
+               AND fs.auditState = 3
                and fd.receivablesName = '融资放款'
+             GROUP BY
+                 fd.sid
+         ) s ON s.busVinSid = bv.sid
+                  LEFT JOIN anrui_portal.sys_organization so ON so.sid = bo.useOrgSid
+         where bo.payTypeKey = 2
+
            and bbv.vehicleState = '0002'
          group by bv.sid, bo.useOrgSid, bm.modelSid, bm.modelConfigSid
-    having fd.reveivableMoney > ifnull(sum(fs.subscriptionMoney), 0)) as s on
-            r.useOrgSid = s.useOrgSid AND r.vehModelSid = s.modelSid AND r.vehMConfigSid = s.modelConfigSid
+         HAVING
+                 SUM( s.reveivableMoney ) > SUM( s.subscriptionMoney )) a
+    GROUP BY
+        a.useOrgSid,
+        a.vehMConfigSid,
+        a.vehModelSid) as s on
+            r.useOrgSid = s.useOrgSid AND r.vehModelSid = s.vehModelSid AND r.vehMConfigSid = s.vehMConfigSid
 SET r.`loan_not_count`=s.scount
 WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
 
 -- 金融未放款金额-- 截止当日贷款业务已出库且融资放款未认款的台数融资放款金额之和
 
 update daily_report r inner join (
-    select sum(fd.reveivableMoney) as scount, bo.useOrgSid, bm.modelSid, bm.modelConfigSid, fd.reveivableMoney
-    from anrui_buscenter.bus_sales_order_vehicle bv
-             left join anrui_buscenter.bus_sales_order bo on bo.sid = bv.salesOrderSid
-             left join anrui_base.base_vehicle bbv on bbv.sid = bv.linkSid
-             left join anrui_buscenter.bus_sales_order_model bm on bm.salesOrderSid = bv.salesOrderSid
-             left join anrui_fin.fin_uncollected_receivables_detailed fd on fd.busVinSid = bv.sid
-             left join anrui_fin.fin_selected_receivables_detailed fs on fs.receivablesSid = fd.sid
-    where bo.payTypeKey = 2
-      and fd.receivablesName = '融资放款'
-      and bbv.vehicleState = '0002'
-    group by bv.sid, bo.useOrgSid, bm.modelSid, bm.modelConfigSid
-    having fd.reveivableMoney > ifnull(sum(fs.subscriptionMoney), 0)) as s on
-            r.useOrgSid = s.useOrgSid AND r.vehModelSid = s.modelSid AND r.vehMConfigSid = s.modelConfigSid
+    SELECT
+        SUM( a.scount ) AS scount,
+        a.useOrgSid,
+        a.NAME,
+        a.contractNo,
+        a.vehMConfigSid,
+        a.vehModelSid
+    FROM
+        (SELECT
+             bv.id,
+             bo.useOrgSid,
+             bm.modelConfigSid AS vehMConfigSid,
+             bm.modelSid AS vehModelSid,
+             so.NAME,
+             SUM( s.reveivableMoney ),
+             SUM( s.subscriptionMoney ),
+             bo.contractNo,
+             (
+                     SUM( s.reveivableMoney ) - SUM( s.subscriptionMoney )) AS scount
+         FROM anrui_buscenter.bus_sales_order_vehicle bv
+                  LEFT JOIN anrui_buscenter.bus_sales_order bo ON bo.sid = bv.salesOrderSid
+                  LEFT JOIN anrui_base.base_vehicle bbv ON bbv.sid = bv.linkSid
+                  LEFT JOIN anrui_buscenter.bus_sales_order_model bm ON bm.salesOrderSid = bv.salesOrderSid
+                  LEFT JOIN (
+             SELECT
+                 fd.reveivableMoney,
+                 fd.busVinSid,
+                 IFNULL( SUM( fs.subscriptionMoney ), 0 ) AS subscriptionMoney
+             FROM
+                 anrui_fin.fin_uncollected_receivables_detailed fd
+                     LEFT JOIN anrui_fin.fin_selected_receivables_detailed fs ON fs.receivablesSid = fd.sid
+             WHERE
+                     fd.kxState = '01'
+               AND fs.auditState = 3
+               AND fd.receivablesName = '融资放款'
+             GROUP BY
+                 fd.sid
+         ) s ON s.busVinSid = bv.sid
+                  LEFT JOIN anrui_portal.sys_organization so ON so.sid = bo.useOrgSid
+         WHERE bo.payTypeKey = 2
+
+           AND bbv.vehicleState = '0002'
+         GROUP BY bv.sid, bo.useOrgSid, bm.modelSid, bm.modelConfigSid
+         HAVING
+                 SUM( s.reveivableMoney ) > SUM( s.subscriptionMoney )) a
+    GROUP BY
+        a.useOrgSid,
+        a.vehMConfigSid,
+        a.vehModelSid) as s on
+            r.useOrgSid = s.useOrgSid AND r.vehModelSid = s.vehModelSid AND r.vehMConfigSid = s.vehMConfigSid
 SET r.`loan_not_amount`=ROUND(s.scount / 10000, 2)
 WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();