Merge remote-tracking branch 'origin/master'

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

@@ -79,4 +79,8 @@ public class BusSalesOrderVehicle extends BaseEntity {
     private String riskStaffUserSid;
     @ApiModelProperty("风控专员用户姓名")
     private String riskStaffUserName;
+    @ApiModelProperty("实际还款人姓名")
+    private String reaRepaymentName;
+    @ApiModelProperty("实际还款人电话")
+    private String reaRepaymentPhone;
 }

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

@@ -157,4 +157,8 @@ public interface BusSalesOrderVehicleFeign {
     @GetMapping("/selectByBorrowerSid")
     @ResponseBody
     ResultBean<List<BusSalesOrderVehicle>> selectByBorrowerSid(@RequestParam("borrowerSid") String borrowerSid);
+
+    @ApiOperation("维护实际还款人")
+    @PostMapping("/maintReaRepayment")
+    public ResultBean maintReaRepayment(@RequestBody ReaRepaymentDto reaRepaymentDto);
 }

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

@@ -153,4 +153,9 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
         return null;
     }
 
+    @Override
+    public ResultBean maintReaRepayment(ReaRepaymentDto reaRepaymentDto) {
+        return null;
+    }
+
 }

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

@@ -0,0 +1,23 @@
+package com.yxt.anrui.buscenter.api.bussalesordervehicle;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ReaRepaymentDto {
+
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车牌号")
+    private String carNum;
+    @ApiModelProperty("客户名称")
+    private String custName;
+    @ApiModelProperty("贷款人")
+    private String borrerName;
+    @ApiModelProperty("实际还款人名称")
+    private String reaRepaymentName;
+    @ApiModelProperty("实际还款人电话")
+    private String reaRepaymentPhone;
+    @ApiModelProperty("销售订单车辆sid")
+    private String saleVehSid;
+}

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

@@ -175,4 +175,7 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
 
     @Select("select * from bus_sales_order_vehicle where borrowerSid = #{borrowerSid}")
     List<BusSalesOrderVehicle> selectByBorrowerSid(String borrowerSid);
+
+    @Update("update bus_sales_order_vehicle set reaRepaymentName = #{reaRepaymentName},reaRepaymentPhone = #{reaRepaymentPhone} where sid = #{saleVehSid}")
+    void maintReaRepayment(@Param("saleVehSid") String saleVehSid,@Param("reaRepaymentName") String reaRepaymentName,@Param("reaRepaymentPhone") String reaRepaymentPhone);
 }

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

@@ -173,4 +173,11 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
     public ResultBean<List<BusSalesOrderVehicle>> selectByBorrowerSid(String borrowerSid) {
         return busSalesOrderVehicleService.selectByBorrowerSid(borrowerSid);
     }
+
+    @Override
+    public ResultBean maintReaRepayment(ReaRepaymentDto reaRepaymentDto) {
+        ResultBean rb = ResultBean.fireFail();
+        busSalesOrderVehicleService.maintReaRepayment(reaRepaymentDto);
+        return rb.success();
+    }
 }

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

@@ -649,4 +649,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         List<BusSalesOrderVehicle> busSalesOrderVehicleList = baseMapper.selectByBorrowerSid(borrowerSid);
         return rb.success().setData(busSalesOrderVehicleList);
     }
+
+    public void maintReaRepayment(ReaRepaymentDto reaRepaymentDto) {
+        baseMapper.maintReaRepayment(reaRepaymentDto.getSaleVehSid(),reaRepaymentDto.getReaRepaymentName(),reaRepaymentDto.getReaRepaymentPhone());
+    }
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

@@ -801,17 +801,17 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
            /* if (!mobile.matches("^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$")) {
                 return rb.setMsg("手机号格式不正确");
             }*/
-            if (StringUtils.isNotBlank(dto.getIDNumber())) {
+            /*if (StringUtils.isNotBlank(dto.getIDNumber())) {
                 if (!weixin.matches("^[1-9]\\d{5}(18|19|([23]\\d))\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx]$")) {
                     return rb.setMsg("证件号码格式不正确");
                 }
-            }
+            }*/
         } else {
-            if (StringUtils.isNotBlank(dto.getIDNumber())) {
+            /*if (StringUtils.isNotBlank(dto.getIDNumber())) {
                 if (dto.getIDNumber().length() != 9 && dto.getIDNumber().length() != 18) {
                     return rb.setMsg("证件号码格式不正确");
                 }
-            }
+            }*/
         }
         if (StringUtils.isNotBlank(weixin)) {
             if (!weixin.matches("^[a-zA-Z]{1}[-_a-zA-Z0-9]{5,19}$") && !weixin.matches("^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$")) {

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionFeign.java

@@ -61,10 +61,10 @@ public interface SysFunctionFeign {
     @ApiOperation("新增保存")
     @PostMapping("/save")
     public ResultBean save(@RequestBody SysFunctionDto dto);
-      
+
     @ApiOperation("修改保存")
     @PostMapping("/update/{sid}")
-    public ResultBean update(@RequestBody SysFunctionDto dto,@PathVariable("sid") String sid);
+    public ResultBean update(@RequestBody SysFunctionDto dto, @PathVariable("sid") String sid);
 
     @ApiOperation("修改功能的是否可用的状态")
     @PostMapping("/updateIsEnable/{sid}/{isEnable}")
@@ -73,6 +73,7 @@ public interface SysFunctionFeign {
     @ApiOperation("删除记录")
     @GetMapping("/del/{ids}")
     public ResultBean del(@PathVariable("ids") String ids);
+
     @ApiOperation("删除记录")
     @GetMapping("/delBySids/{sids}")
     public ResultBean delBySids(@PathVariable("sids") String sids);
@@ -80,12 +81,19 @@ public interface SysFunctionFeign {
     @ApiOperation("获取一条记录")
     @GetMapping("/fetch/{id}")
     public ResultBean<SysFunctionVo> fetch(@PathVariable("id") String id);
+
     @ApiOperation("获取一条记录")
     @GetMapping("/fetchBySid/{sid}")
     public ResultBean<SysFunctionVo> fetchBySid(@PathVariable("sid") String sid);
-    @ApiOperation("角色授权时查询功能列表")
+
+    @ApiOperation("角色授权时查询功能列表（Pc）")
     @GetMapping("/getFunctionAuthorization/{roleSid}")
-    public ResultBean<List<Map<String,Object>>> getFunctionAuthorization(@PathVariable("roleSid") String roleSid);
+    public ResultBean<List<Map<String, Object>>> getFunctionAuthorization(@PathVariable("roleSid") String roleSid);
+
+    @ApiOperation("角色授权时查询功能列表（App）")
+    @GetMapping("/getFunctionAuthorizationApp/{roleSid}")
+    public ResultBean<List<Map<String, Object>>> getFunctionAuthorizationApp(@PathVariable("roleSid") String roleSid);
+
     @ApiOperation("查询按钮的权限")
     @PostMapping("/getButtonPermissions")
     public ResultBean<List<ButtonPermissionVo>> getButtonPermissions(@RequestBody ButtonPermissionQuery query);

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionFeignFallback.java

@@ -96,6 +96,11 @@ public class SysFunctionFeignFallback implements SysFunctionFeign {
 		return null;
 	}
 
+	@Override
+	public ResultBean<List<Map<String, Object>>> getFunctionAuthorizationApp(String roleSid) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<List<ButtonPermissionVo>> getButtonPermissions(ButtonPermissionQuery query) {
 		return null;

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.java

@@ -57,15 +57,20 @@ public interface SysFunctionMapper extends BaseMapper<SysFunction> {
      */
     int selectBySourceSid(@Param("isEnable") int isEnable, @Param("sourceSid") String sourceSid);
 
-     List<ButtonPermissionVo>  getButtonPermissions(@Param("query")ButtonPermissionQuery query);
-     @Select("SELECT ss.sourceName,ss.sid FROM sys_source ss  LEFT JOIN sys_source_role ssr ON ss.sid=ssr.sorceSid where ssr.rolesid=#{roleSid}")
-    List<Map<String, Object>> getSourceAuthorization(@Param("roleSid")String roleSid);
+    List<ButtonPermissionVo> getButtonPermissions(@Param("query") ButtonPermissionQuery query);
+
+    List<Map<String, Object>> getSourceAuthorization(@Param("roleSid") String roleSid);
+
     @Select("SELECT sm.name,sm.sid,sm.pageUrl FROM sys_menu sm  LEFT JOIN sys_source_menu ssm ON sm.sid=ssm.menuSid where ssm.sourceSid=#{sourceSid}")
     List<Map<String, Object>> getMenuAuthorization(@Param("sourceSid") String sourceSid);
+
     @Select("SELECT sf.name,sf.sid FROM sys_function sf WHERE sf.actionUrl= #{pageUrl}")
     List<Map<String, Object>> getFunctionAuthorization(@Param("pageUrl") String pageUrl);
+
     @Select("SELECT sf.name,sf.sid,IF(IFNULL(srf.id,0)<=0,1,0) checked  FROM sys_function sf  " +
             " LEFT JOIN sys_role_function srf ON srf.functionSid=sf.sid  " +
             " WHERE sf.actionUrl= #{pageUrl} AND srf.roleSid = #{roleSid} ")
-    List<Map<String, Object>> getFunctionByRoleSid(@Param("pageUrl") String pageUrl,@Param("roleSid") String roleSid);
+    List<Map<String, Object>> getFunctionByRoleSid(@Param("pageUrl") String pageUrl, @Param("roleSid") String roleSid);
+
+    List<Map<String, Object>> getSourceAuthorizationApp(@Param("roleSid") String roleSid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.xml

@@ -72,4 +72,32 @@
                        ON sur.roleSid = srf.rolesid
                WHERE sur.userSid = #{query.userSid})
     </select>
+
+    <select id="getSourceAuthorization" resultType="java.util.Map">
+        SELECT DISTINCT ss.sourceName,
+                        ss.sid
+        FROM sys_source ss
+                     LEFT JOIN sys_source_role ssr
+                ON ss.sid = ssr.sorceSid
+                     LEFT JOIN sys_source_function ssf
+                ON ssr.`sorceSid` = ssf.`sourceSid`
+                     LEFT JOIN sys_function sf
+                ON ssf.`functionSid` = sf.sid
+        WHERE ssr.rolesid = #{roleSid}
+          AND sf.phoneFunction = '0'
+    </select>
+
+    <select id="getSourceAuthorizationApp" resultType="java.util.Map">
+        SELECT DISTINCT ss.sourceName,
+                        ss.sid
+        FROM sys_source ss
+                     LEFT JOIN sys_source_role ssr
+                ON ss.sid = ssr.sorceSid
+                     LEFT JOIN sys_source_function ssf
+                ON ssr.`sorceSid` = ssf.`sourceSid`
+                     LEFT JOIN sys_function sf
+                ON ssf.`functionSid` = sf.sid
+        WHERE ssr.rolesid = #{roleSid}
+          AND sf.phoneFunction = '1'
+    </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionRest.java

@@ -201,6 +201,13 @@ public class SysFunctionRest implements SysFunctionFeign {
         return rb.success().setData(list);
     }
 
+    @Override
+    public ResultBean<List<Map<String, Object>>> getFunctionAuthorizationApp(String roleSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<Map<String,Object>> list=sysFunctionService.getFunctionAuthorizationApp(roleSid);
+        return rb.success().setData(list);
+    }
+
     @Override
     public ResultBean<List<ButtonPermissionVo>> getButtonPermissions(ButtonPermissionQuery query) {
         ResultBean<List<ButtonPermissionVo>> rb = ResultBean.fireFail();

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java

@@ -299,4 +299,49 @@ public class SysFunctionService extends MybatisBaseService<SysFunctionMapper, Sy
         });
         return list;
     }
+
+    public List<Map<String, Object>> getFunctionAuthorizationApp(String roleSid) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        List<Map<String, Object>> lsources = baseMapper.getSourceAuthorizationApp(roleSid);
+        lsources.forEach(f -> {
+            Map<String, Object> map = new HashMap<>();
+            map.put("name", f.get("sourceName").toString());
+            map.put("sid", f.get("sid").toString());
+            map.put("checked", "1");
+            list.add(map);
+        });
+
+        list.forEach(f -> {
+            List<Map<String, Object>> list2 = new ArrayList<>();
+            String sid = f.get("sid").toString();
+            List<Map<String, Object>> lmenus = baseMapper.getMenuAuthorization(sid);
+            lmenus.forEach(ff -> {
+                Map<String, Object> map = new HashMap<>();
+                if (ff.get("pageUrl") != null && com.yxt.common.base.utils.StringUtils.isNotBlank(ff.get("pageUrl").toString())) {
+                    String pageUrl = ff.get("pageUrl").toString();
+                    List<Map<String, Object>> lfuncs = baseMapper.getFunctionAuthorization(pageUrl);
+                    List<Map<String, Object>> functionByRoleSid = baseMapper.getFunctionByRoleSid(pageUrl, roleSid);
+                    if (lfuncs.size() > 0){
+                        map.put("name", ff.get("name"));
+                        String sids = ff.get("sid").toString();
+                        map.put("sid", sids);
+                        map.put("checked", "1");
+                        map.put("children", new ArrayList<>());
+                        for (Map<String, Object> lfunc : lfuncs) {
+                            for (Map<String, Object> funByRole : functionByRoleSid) {
+                                if (lfunc.get("sid").equals(funByRole.get("sid"))) {
+                                    lfunc.put("checked", "0");
+                                }
+                            }
+                            lfunc.put("children", new ArrayList<>());
+                        }
+                        map.put("children", lfuncs);
+                        list2.add(map);
+                    }
+                }
+            });
+            f.put("children", list2);
+        });
+        return list;
+    }
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehFegin.java

@@ -29,4 +29,8 @@ public interface LoanBeOverdueVehFegin {
     @ApiOperation("分配风控专员")
     @PostMapping("/allocationRiskStaff")
     public ResultBean allocationRiskStaff(@RequestBody AllocationQuery allocationQuery);
+
+    @ApiOperation("初始化实际还款人")
+    @PostMapping("/initReaRepayment")
+    public ResultBean<ReaRepaymentVo> initReaRepayment(@RequestParam("saleVehSid") String saleVehSid);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/ReaRepaymentVo.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.riskcenter.api.loanbeoverdueveh;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ReaRepaymentVo {
+
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车牌号")
+    private String carNum;
+    @ApiModelProperty("客户名称")
+    private String custName;
+    @ApiModelProperty("贷款人")
+    private String borrerName;
+    @ApiModelProperty("实际还款人名称")
+    private String reaRepaymentName;
+    @ApiModelProperty("实际还款人电话")
+    private String reaRepaymentPhone;
+    @ApiModelProperty("销售订单车辆sid")
+    private String saleVehSid;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/DkRecordVo.java

@@ -63,19 +63,19 @@ public class DkRecordVo implements Vo {
     private String borrowerName; // 贷款人名称
 	@ApiModelProperty("期数")
     private String period; // 期数
-	@ApiModelProperty("系统逾期金额")
+	@ApiModelProperty("平台逾期月还")
     private String sysBeMoney; // 系统逾期金额
-	@ApiModelProperty("资方逾期金额")
+	@ApiModelProperty("资方逾期月还")
     private String bankBeMoney; // 资方逾期金额
-	@ApiModelProperty("资方逾期罚息")
+	@ApiModelProperty("资方逾期利息")
     private String bankBeInter; // 资方逾期罚息
 	@ApiModelProperty("垫款金额")
     private String padMoney; // 垫款金额
-	@ApiModelProperty("付款账户")
+	@ApiModelProperty("付款账户名称")
     private String paymentAccount; // 付款账户
 	@ApiModelProperty("付款账号")
     private String paymentNum; // 付款账号
-	@ApiModelProperty("资方收款账户")
+	@ApiModelProperty("资方收款账户名称")
     private String bankCollectionAcc; // 资方收款账户
 	@ApiModelProperty("资方收款账号")
     private String bankCollectionNum; // 资方收款账号

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVeh.java

@@ -80,6 +80,8 @@ public class LoanBePadsincereVeh extends BaseEntity {
     private String bankCollectionAcc; // 资方收款账户
 	@ApiModelProperty("资方收款账号")
     private String bankCollectionNum; // 资方收款账号
+    @ApiModelProperty("销售订单车辆sid")
+    private String saleVehSid;
 	@ApiModelProperty("垫款申请sid")
     private String mainSid; // 垫款申请sid
 

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehDetailsVo.java

@@ -79,6 +79,8 @@ public class LoanBePadsincereVehDetailsVo implements Vo {
     private String bankCollectionAcc; // 资方收款账户
 	@ApiModelProperty("资方收款账号")
     private String bankCollectionNum; // 资方收款账号
+    @ApiModelProperty("销售订单车辆sid")
+    private String busVinSid;
 	@ApiModelProperty("垫款申请sid")
     private String mainSid; // 垫款申请sid
 

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehDto.java

@@ -79,6 +79,8 @@ public class LoanBePadsincereVehDto implements Dto {
     private String bankCollectionAcc; // 资方收款账户
 	@ApiModelProperty("资方收款账号")
     private String bankCollectionNum; // 资方收款账号
+    @ApiModelProperty("销售订单车辆sid")
+    private String busVinSid;
 	@ApiModelProperty("垫款申请sid")
     private String mainSid; // 垫款申请sid
 

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

@@ -16,4 +16,6 @@ public class LoanRepaymentScheduleDetailsVo {
     private String borrowerName;
     @ApiModelProperty("销售订单sid")
     private String salesOrderSid;
+    @ApiModelProperty("销售订单车辆sid")
+    private String busVinSid;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordVehInit;
 import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.LoanBeOverdueVehVo;
+import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.ReaRepaymentVo;
 import com.yxt.anrui.riskcenter.api.loanborrower.AppLoanBorrowerListVo;
 import com.yxt.anrui.riskcenter.api.loanborrower.LoanBorrower;
 import com.yxt.anrui.riskcenter.api.loanborrower.LoanBorrowerVo;
@@ -23,4 +24,6 @@ public interface LoanBeOverdueVehMapper {
     void allocationRiskStaff(@Param("saleVehSid") String saleVehSid, @Param("userSid") String userSid, @Param("userName") String userName);
 
     List<LoanBeCollectionRecordVehInit> initVehListByBorrSid(String borrowerSid);
+
+    ReaRepaymentVo initReaRepayment(String saleVehSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml

@@ -5,134 +5,148 @@
     <!--    ${ew.customSqlSegment} -->
 
     <select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanbeoverdueveh.LoanBeOverdueVehVo">
-        SELECT a1.busVinSid     AS saleVehSid,
-               a1.`useOrgName`,
-               a1.`dept`,
-               a1.`loanContractNo`,
-               a1.borrowerName,
-               RIGHT(a1.vinNo,8) AS vinNo,
-               a1.vehMark AS carNum,
-               a1.`bankName`,
-               a1.`bankContractNo`,
-               a1.dueMoney      AS bankMonthRep,
-               a1.dueDate       AS firstBeDate,
-               COUNT(a1.sid)    AS beOverduePeriod,
-               SUM(a1.yq_total) AS beOverdueMoney,
-               SUM(a1.yq_hsqs)  AS beOverdueMoneyAndPeriod,
-               SUM(a1.yd_dkje)  AS advMoney,
-               SUM(a1.yd_zjzyf) AS fundPossCostMoney,
-               a1.riskStaffUserSid,
-               a1.riskStaffUserName,
-               a1.createTime,
-               a1.orgSidPath
-        FROM (SELECT lrpd.sid,
-                     lrpd.busVinSid,
-                     lrpd.`useOrgName`,
-                     lrpd.`dept`,
-                     lrpd.`loanContractNo`,
-                     lrpd.borrowerName,
-                     lrpd.`vinNo`,
-                     lrpd.`vehMark`,
-                     lrpd.`bankName`,
-                     lrpd.`bankContractNo`,
-                     lrpd.dueMoney,
-                     lrpd.dueDate,
-                     (
-                             lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0))
-                             )                   AS yq_total,
-                     (
-                             lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0))
-                             ) / lrpd.`dueMoney` AS yq_hsqs,
-                     lrpd.`paymentMoney`         AS yd_dkje,
-                     lrpd.fund                   AS yd_zjzyf,
-                     lrpd.orgSidPath,
-                     lrpd.createBySid,
-                     bv.riskStaffUserSid,
-                     bv.riskStaffUserName,
-                     lr.createTime
-              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
-              WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; CURDATE()
-              GROUP BY lrpd.`sid`
-              HAVING (yq_total > 0)) a1
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
-
-    <update id="allocationRiskStaff">
-        UPDATE
-                anrui_buscenter.`bus_sales_order_vehicle`
-        SET riskStaffUserSid  = #{userSid},
-            riskStaffUserName = #{userName}
-        WHERE sid = #{saleVehSid}
-    </update>
-
-    <select id="initVehListByBorrSid"
-            resultType="com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordVehInit">
-        SELECT
-        RIGHT(a1.vinNo, 8) AS vinNo,
-        a1.customer AS custName,
-        a1.mobile AS custPhone,
+        SELECT a1.busVinSid AS saleVehSid,
+        a1.`useOrgName`,
+        a1.`dept`,
         a1.`loanContractNo`,
-        a1.`bankName`,
+        a1.borrowerName,
+        RIGHT(a1.vinNo,8) AS vinNo,
         a1.vehMark AS carNum,
+        a1.`bankName`,
+        a1.`bankContractNo`,
+        a1.dueMoney AS bankMonthRep,
         a1.dueDate AS firstBeDate,
         COUNT(a1.sid) AS beOverduePeriod,
         SUM(a1.yq_total) AS beOverdueMoney,
         SUM(a1.yq_hsqs) AS beOverdueMoneyAndPeriod,
-        a1.busVinSid AS saleVehSid,
-        a1.salesOrderSid
-        FROM
-        (SELECT
-        lrpd.sid,
+        SUM(a1.yd_dkje) AS advMoney,
+        SUM(a1.yd_zjzyf) AS fundPossCostMoney,
+        a1.riskStaffUserSid,
+        a1.riskStaffUserName,
+        a1.createTime,
+        a1.orgSidPath
+        FROM (SELECT lrpd.sid,
         lrpd.busVinSid,
+        lrpd.`useOrgName`,
+        lrpd.`dept`,
         lrpd.`loanContractNo`,
+        lrpd.borrowerName,
         lrpd.`vinNo`,
+        lrpd.`vehMark`,
         lrpd.`bankName`,
+        lrpd.`bankContractNo`,
+        lrpd.dueMoney,
         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
-        FROM
-        `loan_repayment_plan_details` lrpd
+        lrpd.`paymentMoney` AS yd_dkje,
+        lrpd.fund AS yd_zjzyf,
+        lrpd.orgSidPath,
+        lrpd.createBySid,
+        bv.riskStaffUserSid,
+        bv.riskStaffUserName,
+        lr.createTime
+        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
+        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
         WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; CURDATE()
         GROUP BY lrpd.`sid`
         HAVING (yq_total > 0)) a1
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <update id="allocationRiskStaff">
+        UPDATE
+                anrui_buscenter.`bus_sales_order_vehicle`
+        SET riskStaffUserSid  = #{userSid},
+            riskStaffUserName = #{userName}
+        WHERE sid = #{saleVehSid}
+    </update>
+
+    <select id="initVehListByBorrSid"
+            resultType="com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordVehInit">
+        SELECT
+                RIGHT (a1.vinNo, 8) AS vinNo,
+                a1.customer AS custName,
+                a1.mobile AS custPhone,
+                a1.`loanContractNo`,
+                a1.`bankName`,
+                a1.vehMark AS carNum,
+                a1.dueDate AS firstBeDate,
+                COUNT (a1.sid) AS beOverduePeriod,
+                SUM (a1.yq_total) AS beOverdueMoney,
+                SUM (a1.yq_hsqs) AS beOverdueMoneyAndPeriod,
+                a1.busVinSid AS saleVehSid,
+                a1.salesOrderSid
+        FROM
+                (SELECT
+                lrpd.sid,
+                lrpd.busVinSid,
+                lrpd.`loanContractNo`,
+                lrpd.`vinNo`,
+                lrpd.`bankName`,
+                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
+                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
+                WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; CURDATE()
+                GROUP BY lrpd.`sid`
+                HAVING (yq_total > 0)) a1
         WHERE a1.borrowerSid = #{borrowerSid}
         GROUP BY a1.loanContractNo,
-        a1.vinNo,
-        a1.busVinSid
+                a1.vinNo,
+                a1.busVinSid
+    </select>
+
+    <select id="initReaRepayment" resultType="com.yxt.anrui.riskcenter.api.loanbeoverdueveh.ReaRepaymentVo">
+        SELECT DISTINCT ld.`vinNo`,
+                        ld.`vehMark`      AS carNum,
+                        ld.`customer`     AS custName,
+                        ld.`borrowerName` AS borrerName,
+                        bv.`reaRepaymentName`,
+                        bv.`reaRepaymentPhone`,
+                        ld.`busVinSid` AS saleVehSid
+        FROM loan_repayment_plan_details ld
+                     LEFT JOIN anrui_buscenter.`bus_sales_order_vehicle` bv
+                ON ld.`busVinSid` = bv.`sid`
+        WHERE ld.`busVinSid` = #{saleVehSid}
     </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehRest.java

@@ -1,9 +1,6 @@
 package com.yxt.anrui.riskcenter.biz.loanbeoverdueveh;
 
-import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.AllocationQuery;
-import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.LoanBeOverdueVehFegin;
-import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.LoanBeOverdueVehQuery;
-import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.LoanBeOverdueVehVo;
+import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.*;
 import com.yxt.anrui.riskcenter.api.loanborrower.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -41,4 +38,11 @@ public class LoanBeOverdueVehRest implements LoanBeOverdueVehFegin {
     public ResultBean allocationRiskStaff(AllocationQuery allocationQuery) {
         return loanBeOverdueVehService.allocationRiskStaff(allocationQuery);
     }
+
+    @Override
+    public ResultBean<ReaRepaymentVo> initReaRepayment(String saleVehSid) {
+        ResultBean rb = ResultBean.fireFail();
+        ReaRepaymentVo reaRepaymentVo = loanBeOverdueVehService.initReaRepayment(saleVehSid);
+        return rb.success().setData(reaRepaymentVo);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java

@@ -2,13 +2,13 @@ package com.yxt.anrui.riskcenter.biz.loanbeoverdueveh;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
+import com.yxt.anrui.buscenter.api.bussalesvehicle.BusSalesVehicleFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordVehInit;
-import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.AllocationQuery;
-import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.LoanBeOverdueVehQuery;
-import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.LoanBeOverdueVehVo;
+import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.*;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -26,6 +26,8 @@ public class LoanBeOverdueVehService {
     private SysUserFeign sysUserFeign;
     @Autowired
     private LoanBeOverdueVehMapper loanBeOverdueVehMapper;
+    @Autowired
+    private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
 
     public PagerVo<LoanBeOverdueVehVo> listPageVo(PagerQuery<LoanBeOverdueVehQuery> pq) {
         LoanBeOverdueVehQuery query = pq.getParams();
@@ -186,4 +188,9 @@ public class LoanBeOverdueVehService {
     public List<LoanBeCollectionRecordVehInit> initVehListByBorrSid(String borrowerSid) {
         return loanBeOverdueVehMapper.initVehListByBorrSid(borrowerSid);
     }
+
+    public ReaRepaymentVo initReaRepayment(String saleVehSid) {
+        ReaRepaymentVo reaRepaymentVo = loanBeOverdueVehMapper.initReaRepayment(saleVehSid);
+        return reaRepaymentVo;
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java

@@ -343,9 +343,9 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
         BeanUtil.copyProperties(entity, vo);
         List<LoanBePadsincereVehDetailsVo> loanBePadsincereVehDetailsVos = loanBePadsincereVehService.selByMainSid(sid);
         vo.setLoanBePadsincereVehList(loanBePadsincereVehDetailsVos);
-        List<LoanFile> loanFiles = loanFileService.selectByLinkSid(sid,LoanFileEnum.BEPADSINCERE.getAttachType());
+        List<LoanFile> loanFiles = loanFileService.selectByLinkSid(sid, LoanFileEnum.BEPADSINCERE.getAttachType());
         List<LoanBePadsincereFile> loanBePadsincereFiles = new ArrayList<>();
-        if (loanFiles != null && loanFiles.size() > 0){
+        if (loanFiles != null && loanFiles.size() > 0) {
             for (LoanFile loanFile : loanFiles) {
                 LoanBePadsincereFile loanBePadsincereFile = new LoanBePadsincereFile();
                 String filePath = loanFile.getFilePath();
@@ -391,29 +391,26 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
         for (BePadsincereExcelInfo bePadsincereExcelInfo : resultList) {
             List<LoanRepaymentScheduleDetailsVo> loanRepaymentScheduleDetailsVos = loanRepaymentScheduleService.selectByBankContractNo(bePadsincereExcelInfo.getBankContractNo());
             for (LoanRepaymentScheduleDetailsVo loanRepaymentScheduleDetailsVo : loanRepaymentScheduleDetailsVos) {
-                String vinNo = loanRepaymentScheduleDetailsVo.getVinNo();
-                String[] vinNos = vinNo.split(",");
-                for (String no : vinNos) {
-                    LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo = new LoanBePadsincereVehDetailsVo();
-                    loanBePadsincereVehDetailsVo.setVinNo(no);
-                    loanBePadsincereVehDetailsVo.setLoanContractNo(loanRepaymentScheduleDetailsVo.getLoanContractNo());
-                    loanBePadsincereVehDetailsVo.setBankName(loanRepaymentScheduleDetailsVo.getBankName());
-                    loanBePadsincereVehDetailsVo.setBankContractNo(bePadsincereExcelInfo.getBankContractNo());
-                    BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanRepaymentScheduleDetailsVo.getSalesOrderSid()).getData();
-                    loanBePadsincereVehDetailsVo.setCustomerName(busSalesOrder.getCustomerName());
-                    loanBePadsincereVehDetailsVo.setBorrowerName(loanRepaymentScheduleDetailsVo.getBorrowerName());
-                    loanBePadsincereVehDetailsVo.setPeriod(bePadsincereExcelInfo.getPeriod());
-                    String sysBeMoney = loanRepaymentPlanDetailsService.selBeMoney(no, bePadsincereExcelInfo.getPeriod(), bePadsincereExcelInfo.getBankContractNo());
-                    loanBePadsincereVehDetailsVo.setSysBeMoney(sysBeMoney);
-                    loanBePadsincereVehDetailsVo.setBankBeMoney(String.valueOf(Integer.parseInt(bePadsincereExcelInfo.getBePrincipal()) / vinNos.length));
-                    loanBePadsincereVehDetailsVo.setBankBeInter(String.valueOf(Integer.parseInt(bePadsincereExcelInfo.getBeDefInter()) / vinNos.length));
-                    loanBePadsincereVehDetailsVo.setPadMoney(String.valueOf(Integer.parseInt(loanBePadsincereVehDetailsVo.getBankBeMoney()) + Integer.parseInt(loanBePadsincereVehDetailsVo.getBankBeInter())));
-                    loanBePadsincereVehDetailsVo.setPaymentAccount(bePadsincereExcelInfo.getPaymentAccount());
-                    loanBePadsincereVehDetailsVo.setPaymentNum(bePadsincereExcelInfo.getPaymentNum());
-                    loanBePadsincereVehDetailsVo.setBankCollectionAcc(bePadsincereExcelInfo.getBankCollectionAcc());
-                    loanBePadsincereVehDetailsVo.setBankCollectionNum(bePadsincereExcelInfo.getBankCollectionNum());
-                    resultList2.add(loanBePadsincereVehDetailsVo);
-                }
+                LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo = new LoanBePadsincereVehDetailsVo();
+                loanBePadsincereVehDetailsVo.setVinNo(loanRepaymentScheduleDetailsVo.getVinNo());
+                loanBePadsincereVehDetailsVo.setLoanContractNo(loanRepaymentScheduleDetailsVo.getLoanContractNo());
+                loanBePadsincereVehDetailsVo.setBankName(loanRepaymentScheduleDetailsVo.getBankName());
+                loanBePadsincereVehDetailsVo.setBankContractNo(bePadsincereExcelInfo.getBankContractNo());
+                BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanRepaymentScheduleDetailsVo.getSalesOrderSid()).getData();
+                loanBePadsincereVehDetailsVo.setCustomerName(busSalesOrder.getCustomerName());
+                loanBePadsincereVehDetailsVo.setBorrowerName(loanRepaymentScheduleDetailsVo.getBorrowerName());
+                loanBePadsincereVehDetailsVo.setPeriod(bePadsincereExcelInfo.getPeriod());
+                String sysBeMoney = loanRepaymentPlanDetailsService.selBeMoney(loanRepaymentScheduleDetailsVo.getVinNo(), bePadsincereExcelInfo.getPeriod(), bePadsincereExcelInfo.getBankContractNo());
+                loanBePadsincereVehDetailsVo.setSysBeMoney(sysBeMoney);
+                loanBePadsincereVehDetailsVo.setBankBeMoney(String.valueOf(Integer.parseInt(bePadsincereExcelInfo.getBePrincipal()) / loanRepaymentScheduleDetailsVos.size()));
+                loanBePadsincereVehDetailsVo.setBankBeInter(String.valueOf(Integer.parseInt(bePadsincereExcelInfo.getBeDefInter()) / loanRepaymentScheduleDetailsVos.size()));
+                loanBePadsincereVehDetailsVo.setPadMoney(String.valueOf(Integer.parseInt(loanBePadsincereVehDetailsVo.getBankBeMoney()) + Integer.parseInt(loanBePadsincereVehDetailsVo.getBankBeInter())));
+                loanBePadsincereVehDetailsVo.setPaymentAccount(bePadsincereExcelInfo.getPaymentAccount());
+                loanBePadsincereVehDetailsVo.setPaymentNum(bePadsincereExcelInfo.getPaymentNum());
+                loanBePadsincereVehDetailsVo.setBankCollectionAcc(bePadsincereExcelInfo.getBankCollectionAcc());
+                loanBePadsincereVehDetailsVo.setBankCollectionNum(bePadsincereExcelInfo.getBankCollectionNum());
+                loanBePadsincereVehDetailsVo.setBusVinSid(loanRepaymentScheduleDetailsVo.getBusVinSid());
+                resultList2.add(loanBePadsincereVehDetailsVo);
             }
         }
         if (StringUtils.isNotBlank(importReturn.getCheckInfo())) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehService.java

@@ -84,6 +84,7 @@ public class LoanBePadsincereVehService extends MybatisBaseService<LoanBePadsinc
     public void insertByDto(LoanBePadsincereVehDto dto) {
         LoanBePadsincereVeh entity = new LoanBePadsincereVeh();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
+        entity.setSaleVehSid(dto.getBusVinSid());
         baseMapper.insert(entity);
     }
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java

@@ -790,37 +790,37 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl());
         privilegeQuery.setUserSid(pagerQuery.getUserSid());
         ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
-//        if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
-//            //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
-//            String orgSidPath = pagerQuery.getOrgPath();
-//            orgSidPath = orgSidPath + "/";
-//            int i1 = orgSidPath.indexOf("/");
-//            int i2 = orgSidPath.indexOf("/", i1 + 1);
-//            int i3 = orgSidPath.indexOf("/", i2 + 1);
-//            int i4 = orgSidPath.indexOf("/", i3 + 1);
-//            String orgLevelKey = defaultIdReltBean.getData();
-//            if ("1".equals(orgLevelKey)) {
-//                orgSidPath = orgSidPath.substring(0, i1);
-//                qw.like("p.orgSidPath", orgSidPath);
-//            } else if ("2".equals(orgLevelKey)) {
-//                orgSidPath = orgSidPath.substring(0, i2);
-//                qw.like("p.orgSidPath", orgSidPath);
-//            } else if ("3".equals(orgLevelKey)) {
-//                orgSidPath = orgSidPath.substring(0, i3);
-//                qw.like("p.orgSidPath", orgSidPath);
-//            } else if ("4".equals(orgLevelKey)) {
-//                orgSidPath = orgSidPath.substring(0, i4);
-//                qw.like("p.orgSidPath", orgSidPath);
-//            } else if ("5".equals(orgLevelKey)) {
-//                qw.eq("p.salesUserSid", pagerQuery.getUserSid());
-//            } else {
-//                PagerVo<TransferPaymentVo> p = new PagerVo<>();
-//                return p;
-//            }
-//        } else {
-//            PagerVo<TransferPaymentVo> p = new PagerVo<>();
-//            return p;
-//        }
+        if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+            //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+            String orgSidPath = pagerQuery.getOrgPath();
+            orgSidPath = orgSidPath + "/";
+            int i1 = orgSidPath.indexOf("/");
+            int i2 = orgSidPath.indexOf("/", i1 + 1);
+            int i3 = orgSidPath.indexOf("/", i2 + 1);
+            int i4 = orgSidPath.indexOf("/", i3 + 1);
+            String orgLevelKey = defaultIdReltBean.getData();
+            if ("1".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i1);
+                qw.like("p.orgSidPath", orgSidPath);
+            } else if ("2".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i2);
+                qw.like("p.orgSidPath", orgSidPath);
+            } else if ("3".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i3);
+                qw.like("p.orgSidPath", orgSidPath);
+            } else if ("4".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i4);
+                qw.like("p.orgSidPath", orgSidPath);
+            } else if ("5".equals(orgLevelKey)) {
+                qw.eq("p.salesUserSid", pagerQuery.getUserSid());
+            } else {
+                PagerVo<TransferPaymentVo> p = new PagerVo<>();
+                return p;
+            }
+        } else {
+            PagerVo<TransferPaymentVo> p = new PagerVo<>();
+            return p;
+        }
         //=======================
         if (StringUtils.isNotBlank(pagerQuery.getType())) {
             String type = pagerQuery.getType();

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

@@ -41,12 +41,15 @@
 
     <select id="selectByBankContractNo"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentScheduleDetailsVo">
-        SELECT loanContractNo,
-               vinNo,
-               bankName,
-               borrowerName,
-               salesOrderSid
-        FROM loan_repayment_schedule
-        WHERE bankContractNo = #{bankContractNo}
+        SELECT DISTINCT lrs.loanContractNo,
+                        lrpd.vinNo,
+                        lrs.bankName,
+                        lrs.borrowerName,
+                        lrs.salesOrderSid,
+                        lrpd.busVinSid
+        FROM loan_repayment_schedule lrs
+                     LEFT JOIN loan_repayment_plan_details lrpd
+                ON lrpd.scheduleSid = lrs.sid
+        WHERE lrs.bankContractNo = #{bankContractNo}
     </select>
 </mapper>

doc/databases/报表中心.sql

@@ -3,19 +3,15 @@ UPDATE daily_report r
     INNER JOIN (
         select sum(v.scount) as scount, v.useOrgSid, v.modelSid, v.modelConfigSid
         from (
-                 select bo.platformNo 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 != '已办结'
+                 where (si.nodeState != '已办结' and si.nodeState != '终止')
                    and bo.isDelete <> 1
                    and LENGTH(offlineDate) > 0
                    and bo.sid not in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo)
-                 union all
-                 select bo.platformNo as scount, bo.useOrgSid, bd.vehicleSid modelSid, 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 LENGTH(offlineDate) < 1
-                   and bo.sid not in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo)) as v
+                 group by bo.createOrgSid
+             ) as v
         GROUP BY v.`useOrgSid`,
                  v.`modelSid`,
                  v.`modelConfigSid`
@@ -31,19 +27,15 @@ UPDATE daily_report r
     INNER JOIN (
         select sum(v.scount) as scount, v.useOrgSid, v.modelSid, v.modelConfigSid
         from (
-                 select bo.platformNo 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 != '已办结'
+                 where (si.nodeState != '已办结' and si.nodeState != '终止')
                    and bo.isDelete <> 1
                    and LENGTH(offlineDate) > 0
                    and bo.sid in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo)
-                 union all
-                 select bo.platformNo as scount, bo.useOrgSid, bd.vehicleSid modelSid, 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 LENGTH(offlineDate) < 1
-                   and bo.sid in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo)) as v
+                 group by bo.createOrgSid
+             ) as v
         GROUP BY v.`useOrgSid`,
                  v.`modelSid`,
                  v.`modelConfigSid`
@@ -321,13 +313,14 @@ WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
 
 -- 本年销售全款
 UPDATE daily_report r
-    INNER JOIN (select count(bv.id) as scount, bv.modelSid, bv.modelConfigSid, bv.useOrgSid
-                from anrui_base.base_vehicle bv
-                         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'
-                group by useOrgSid, modelSid, modelConfigSid
+    INNER JOIN (select sum(ss.scount) as scount, ss.modelSid, ss.modelConfigSid, ss.useOrgSid
+                from (select count(bv.id) as scount, bv.modelSid, bv.modelConfigSid, bv.useOrgSid
+                      from anrui_base.base_vehicle bv
+                               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'
+                      group by bv.useOrgSid, bv.modelSid, bv.modelConfigSid) ss group by ss.useOrgSid, ss.modelSid, ss.modelConfigSid
     ) AS s ON r.useOrgSid = s.useOrgSid
         AND r.vehModelSid = s.modelSid
         AND r.vehMConfigSid = s.modelConfigSid
@@ -335,13 +328,14 @@ SET r.`sale_full_year` = s.scount
 WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
 -- 本年销售贷款
 UPDATE daily_report r
-    INNER JOIN (select count(bv.id) as scount, bv.modelSid, bv.modelConfigSid, bv.useOrgSid
-                from anrui_base.base_vehicle bv
-                         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'
-                group by useOrgSid, modelSid, modelConfigSid
+    INNER JOIN (select sum(ss.scount) as scount, ss.modelSid, ss.modelConfigSid, ss.useOrgSid
+                from (select count(bv.id) as scount, bv.modelSid, bv.modelConfigSid, bv.useOrgSid
+                      from anrui_base.base_vehicle bv
+                               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'
+                      group by bv.useOrgSid, bv.modelSid, bv.modelConfigSid) ss group by ss.useOrgSid, ss.modelSid, ss.modelConfigSid
     ) AS s ON r.useOrgSid = s.useOrgSid
         AND r.vehModelSid = s.modelSid
         AND r.vehMConfigSid = s.modelConfigSid
@@ -575,19 +569,24 @@ update daily_report r inner join (
     on r.useOrgSid = s.useOrgSid
         and r.vehModelSid = s.vehModelSid
         and r.vehMConfigSid = s.vehMConfigSid
-set saleOfStockRatio =if(s.subtotal = 0, stock_subtotal + pcOrder_subtotal,
-                         ROUND((stock_subtotal + pcOrder_subtotal) / ROUND(s.subtotal / 3, 2), 2)),
-    stock_total      = (stock_subtotal + pcOrder_subtotal)
+set saleOfStockRatio =if(ROUND((stock_subtotal + pcOrder_subtotal) / ROUND(s.subtotal / 3, 2), 2) = 0,
+                         stock_subtotal + pcOrder_subtotal,
+                         ROUND((stock_subtotal + pcOrder_subtotal) / ROUND(s.subtotal / 3, 2), 2))
+where DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
+
+-- 库存小计
+update daily_report
+set stock_total = (stock_subtotal + pcOrder_subtotal)
 where DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
 
 --  ==============================================
 -- 欠款出库数量、欠款出库金额万元、金融未放款数量、金融未放款金额（万元）
 -- 欠款出库数量--截止当日欠款出库申请通过且未回清款的台数
-update daily_report r inner join (
+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, 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.sid
+             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
@@ -595,7 +594,20 @@ update daily_report r inner join (
     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)) s
+    having sum(fd.reveivableMoney) > ifnull(sum(fs.subscriptionMoney), 0)
+    union all
+    select count(bdad.id) as scount,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
+    where ba.nodeState = '已办结'
+    group by bv.sid, ba.useOrgSid, bm.modelSid, bm.modelConfigSid
+    having sum(fd.reveivableMoney) > ifnull(sum(fs.subscriptionMoney), 0)) cc
+    ) s
     on r.useOrgSid = s.useOrgSid
         and r.vehModelSid = s.vehModelSid
         and r.vehMConfigSid = s.vehMConfigSid
@@ -604,28 +616,39 @@ where DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
 
 
 -- 欠款出库金融--截止当日欠款出库申请通过且未回清款的台数欠款总额
-update daily_report r inner join (
+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,
            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.sid
+             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_base.base_vehicle_state bs on bs.busSid = bdad.busVinSid
              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,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
+    where ba.nodeState = '已办结'
+    group by bv.sid, ba.useOrgSid, bm.modelSid, bm.modelConfigSid
+    having sum(fd.reveivableMoney) > ifnull(sum(fs.subscriptionMoney), 0)) cc
 ) s
     on r.useOrgSid = s.useOrgSid
         and r.vehModelSid = s.vehModelSid
         and r.vehMConfigSid = s.vehMConfigSid
-set arrears_carry_veh_amount = s.scount
+set arrears_carry_veh_amount = ROUND(s.scount / 10000, 2)
 where DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
 
 
@@ -663,7 +686,7 @@ update daily_report r inner join (
     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
-SET r.`loan_not_amount`=s.scount
+SET r.`loan_not_amount`=ROUND(s.scount / 10000, 2)
 WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();