Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/flow/FlowableService.java

@@ -127,7 +127,7 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
     }
 
     public ResultBean processPagerList(Integer pageNum, Integer pageSize) {
-        return flowDefinitionFeign.pagerList(pageNum, pageSize);
+        return flowDefinitionFeign.pagerList(pageNum, pageSize,"");
     }
 
     public ResultBean todoTaskList(String userSid,PagerQuery<TaskQuery> pQuery) {

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowdefinition/FlowDefinitionFeign.java

@@ -34,7 +34,8 @@ public interface FlowDefinitionFeign {
     @PostMapping("/pagerList")
     @ResponseBody
     public ResultBean pagerList(@ApiParam(value = "当前页码", required = true) @RequestParam("pageNum") Integer pageNum,
-                                @ApiParam(value = "每页条数", required = true) @RequestParam("pageSize") Integer pageSize);
+                                @ApiParam(value = "每页条数", required = true) @RequestParam("pageSize") Integer pageSize,
+                                @ApiParam(value = "名称", required = false) @RequestParam("name") String name);
 
     /**
      * 挂起后，就不可以再开启一个流程实例了，也就是 runtimeService.startProcessInstanceByKey("流程定义ID");会抛出异常

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowdefinition/FlowDefinitionFeignFallBack.java

@@ -21,7 +21,7 @@ public class FlowDefinitionFeignFallBack implements FlowDefinitionFeign {
     }
 
     @Override
-    public ResultBean pagerList(Integer pageNum, Integer pageSize) {
+    public ResultBean pagerList(Integer pageNum, Integer pageSize,String name) {
         return null;
     }
 

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

@@ -75,7 +75,7 @@ public enum ProcDefEnum {
     LOANSUBLETAPPLY("交回车辆二次转租申请", "process_lu7pdwzs:1:7940004"),
     LOANOUTBOUNDVEHAPPLY("交回车辆出库申请", "process_14spbdx8:1:7982504"),
     LOANSECONDSALEAPPLY("交车车辆二次销售申请", "process_6kb1z0pe:4:8110004"),
-    LOANSETTLEAPPLY("结清申请", ""),
+    LOANSETTLEAPPLY("结清申请", "process_ob34xgz2:1:8222504"),
     LOANREPURCHASEAPPLY("回购申请", "process_1ozjarxl:1:8207504"),
     LOANCASEAPPEALAPPLY("案件上诉申请", "process_0r2ruoxm:1:8215004"),
     LOANCASEEXECUTEAPPLY("案件执行立案申请", "process_aeho48ap:1:8220004"),

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@@ -233,7 +233,7 @@ public class FlowableRest implements FlowableFeign {
     @Override
     public ResultBean processPagerList(@ApiParam(value = "当前页码", required = true) @RequestParam("pageNum") Integer pageNum,
                                        @ApiParam(value = "每页条数", required = true) @RequestParam("pageSize") Integer pageSize) {
-        return flowableService.processPagerList(pageNum, pageSize);
+        return flowableService.processPagerList(pageNum, pageSize,"");
     }
 
     @Override

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java

@@ -93,8 +93,8 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
         return flowTaskService.businessMyprocessNew(userSid, pq);
     }
 
-    public ResultBean processPagerList(Integer pageNum, Integer pageSize) {
+    public ResultBean processPagerList(Integer pageNum, Integer pageSize,String name) {
-        return flowDefinitionService.pagerListNew(pageNum, pageSize);
+        return flowDefinitionService.pagerListNew(pageNum, pageSize,name);
     }
 
     public ResultBean todoTaskList(String userSid, PagerQuery<TaskQuery> pQuery) {

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowdefinition/FlowDefinitionRest.java

@@ -72,8 +72,8 @@ public class FlowDefinitionRest implements FlowDefinitionFeign {
     }
 
     @Override
-    public ResultBean pagerList(Integer pageNum, Integer pageSize) {
+    public ResultBean pagerList(Integer pageNum, Integer pageSize,String name) {
-        return flowDefinitionService.pagerListNew(pageNum, pageSize);
+        return flowDefinitionService.pagerListNew(pageNum, pageSize,name);
     }
 
     @Override

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowdefinition/FlowDefinitionService.java

@@ -76,11 +76,19 @@ public class FlowDefinitionService extends FlowServiceFactory {
         repositoryService.setProcessDefinitionCategory(definition.getId(), category);
     }
 
-    public Page<FlowDefinitionVo> list(Integer pageNum, Integer pageSize) {
+    public Page<FlowDefinitionVo> list(Integer pageNum, Integer pageSize,String name) {
         Page<FlowDefinitionVo> page = new Page<>();
         // 流程定义列表数据查询
-        ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery()
+       /* ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery()
-                .orderByProcessDefinitionKey().asc();
+                .orderByProcessDefinitionKey().asc();*/
+        ProcessDefinitionQuery processDefinitionQuery = null;
+        if(StringUtils.isBlank(name)){
+            processDefinitionQuery = repositoryService.createProcessDefinitionQuery()
+                    .orderByProcessDefinitionKey().asc();
+        }else{
+            processDefinitionQuery = repositoryService.createProcessDefinitionQuery().processDefinitionNameLike("%"+name+"%")
+                    .orderByProcessDefinitionKey().asc();
+        }
         page.setTotal(processDefinitionQuery.count());
         List<ProcessDefinition> processDefinitionList = processDefinitionQuery.listPage((pageNum - 1) * pageSize, pageSize);
 
@@ -338,8 +346,8 @@ public class FlowDefinitionService extends FlowServiceFactory {
         return resultBean;
     }
 
-    public ResultBean pagerListNew(Integer pageNum, Integer pageSize) {
+    public ResultBean pagerListNew(Integer pageNum, Integer pageSize,String name) {
-        Page<FlowDefinitionVo> pageList = list(pageNum, pageSize);
+        Page<FlowDefinitionVo> pageList = list(pageNum, pageSize,name);
         return ResultBean.fireSuccess().setData(pageList);
     }
 

anrui-flowable/anrui-flowable-ui/src/views/flowable/definition/index.vue

@@ -295,7 +295,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        name: null,
+        name: "",
         category: null,
         key: null,
         tenantId: null,

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java

@@ -101,7 +101,7 @@ public class FlowableRest implements FlowableFeign {
 
     @Override
     public ResultBean processPagerList(Integer pageNum, Integer pageSize) {
-        return flowableService.processPagerList(pageNum, pageSize);
+        return flowableService.processPagerList(pageNum, pageSize,"");
     }
 
     @Override

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java

@@ -145,8 +145,8 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
         return flowTaskFeign.businessMyprocess(userSid, pq);
     }
 
-    public ResultBean processPagerList(Integer pageNum, Integer pageSize) {
+    public ResultBean processPagerList(Integer pageNum, Integer pageSize,String name) {
-        return flowDefinitionFeign.pagerList(pageNum, pageSize);
+        return flowDefinitionFeign.pagerList(pageNum, pageSize,name);
     }
 
     public ResultBean todoTaskList(String userSid, PagerQuery<TaskQuery> pQuery) {

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

@@ -82,5 +82,7 @@ public class LoanSettleApplyDetailsVo {
     private String procInstId;
 
     private String busSid;
+    @ApiModelProperty("是否展示回购字段")
+    private boolean showHg;
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlevehicle/LoanSettleVehicle.java

@@ -0,0 +1,55 @@
+package com.yxt.anrui.riskcenter.api.loansettlevehicle;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/18
+ **/
+@Data
+public class LoanSettleVehicle extends BaseEntity {
+    private static final long serialVersionUID = -155930989121686367L;
+    @ApiModelProperty("结清类型key")
+    private String typeState;
+    @ApiModelProperty("结清类型value")
+    private String typeStateValue;
+    @ApiModelProperty("分公司")
+    private String useOrgName;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+    @ApiModelProperty("销售部门")
+    private String createDept;
+    @ApiModelProperty("销售部门sid")
+    private String createDeptSid;
+    @ApiModelProperty("机构全路径sid")
+    private String orgSidPath;
+    @ApiModelProperty("贷款合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("销售订单车辆sid")
+    private String busVinSid;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("贷款人")
+    private String loanName;
+    @ApiModelProperty("贷款人sid")
+    private String loanSid;
+    @ApiModelProperty("期数")
+    private String peroid;
+    @ApiModelProperty("结清日期")
+    private String settingDate;
+    @ApiModelProperty("资方结清金额")
+    private BigDecimal bankSettlePrice;
+    @ApiModelProperty("公司正常结清合计")
+    private BigDecimal settleAll;
+    @ApiModelProperty("公司减免后结清合计")
+    private BigDecimal amountTo;
+    @ApiModelProperty("结清利润")
+    private BigDecimal profit;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlevehicle/LoanSettleVehicleDto.java

@@ -0,0 +1,54 @@
+package com.yxt.anrui.riskcenter.api.loansettlevehicle;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/18
+ **/
+@Data
+public class LoanSettleVehicleDto {
+    private String createBySid;
+    @ApiModelProperty("结清类型key")
+    private String typeState;
+    @ApiModelProperty("结清类型value")
+    private String typeStateValue;
+    @ApiModelProperty("分公司")
+    private String useOrgName;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+    @ApiModelProperty("销售部门")
+    private String createDept;
+    @ApiModelProperty("销售部门sid")
+    private String createDeptSid;
+    @ApiModelProperty("机构全路径sid")
+    private String orgSidPath;
+    @ApiModelProperty("贷款合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("销售订单车辆sid")
+    private String busVinSid;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("贷款人")
+    private String loanName;
+    @ApiModelProperty("贷款人sid")
+    private String loanSid;
+    @ApiModelProperty("期数")
+    private String peroid;
+    @ApiModelProperty("结清日期")
+    private String settingDate;
+    @ApiModelProperty("资方结清金额")
+    private String bankSettlePrice;
+    @ApiModelProperty("公司正常结清合计")
+    private String settleAll;
+    @ApiModelProperty("公司减免后结清合计")
+    private String amountTo;
+    @ApiModelProperty("结清利润")
+    private String profit;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlevehicle/LoanSettleVehicleFeign.java

@@ -0,0 +1,27 @@
+package com.yxt.anrui.riskcenter.api.loansettlevehicle;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/18
+ **/
+@FeignClient(
+        contextId = "anrui-riskcenter-LoanSettleVehicle",
+        name = "anrui-riskcenter",
+        path = "v1/LoanSettleVehicle",
+        fallback = LoanSettleVehicleFeignFallback.class)
+public interface LoanSettleVehicleFeign {
+
+    @ApiOperation("分页列表")
+    @PostMapping("/listPage")
+    ResultBean<PagerVo<LoanSettleVehicleVo>> pageList(@RequestBody PagerQuery<LoanSettleVehicleQuery> pagerQuery);
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlevehicle/LoanSettleVehicleFeignFallback.java

@@ -0,0 +1,12 @@
+package com.yxt.anrui.riskcenter.api.loansettlevehicle;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/18
+ **/
+@Component
+public class LoanSettleVehicleFeignFallback {
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlevehicle/LoanSettleVehicleQuery.java

@@ -0,0 +1,34 @@
+package com.yxt.anrui.riskcenter.api.loansettlevehicle;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/18
+ **/
+@Data
+public class LoanSettleVehicleQuery implements Query {
+    private static final long serialVersionUID = -7116738252164609661L;
+
+    @ApiModelProperty("分公司")
+    private String useOrgName;
+    @ApiModelProperty("销售部门")
+    private String createDept;
+    @ApiModelProperty("贷款合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("贷款人")
+    private String loanName;
+    @ApiModelProperty("结清类型")
+    private String typeStateKey;
+
+    private String menuUrl;
+    private String orgPath;
+    private String userSid;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlevehicle/LoanSettleVehicleVo.java

@@ -0,0 +1,48 @@
+package com.yxt.anrui.riskcenter.api.loansettlevehicle;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/18
+ **/
+@Data
+public class LoanSettleVehicleVo {
+
+    private String sid;
+    @ApiModelProperty("结清类型value")
+    private String typeStateValue;
+    @ApiModelProperty("分公司")
+    private String useOrgName;
+
+    @ApiModelProperty("销售部门")
+    private String createDept;
+
+    @ApiModelProperty("贷款合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("销售订单车辆sid")
+    private String busVinSid;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("贷款人")
+    private String loanName;
+
+    @ApiModelProperty("期数")
+    private String peroid;
+    @ApiModelProperty("结清日期")
+    private String settingDate;
+    @ApiModelProperty("资方结清金额")
+    private String bankSettlePrice;
+    @ApiModelProperty("公司正常结清合计")
+    private String settleAll;
+    @ApiModelProperty("公司减免后结清合计")
+    private String amountTo;
+    @ApiModelProperty("结清利润")
+    private String profit;
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankMapper.xml

@@ -86,7 +86,7 @@
                          WHERE busSid IN
                                (SELECT lrpd.sid
                                 FROM loan_repayment_plan_details lrpd
-                                WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < CURDATE())),
+                                WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < CURDATE() and lrpd.busVinSid = a1.busVinSid)),
                         0
                     )
             ) AS    overdueMoney,
@@ -113,6 +113,7 @@
                        LEFT JOIN anrui_buscenter.`bus_sales_order_vehicle` bv
                                  ON lrpd.busVinSid = bv.sid
               WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < #{stopDate}
+                and lrpd.useOrgSid = #{useOrgSid}
               GROUP BY lrpd.`sid`
               HAVING (yq_total > 0)) a1
         <where>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankService.java

@@ -56,6 +56,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
@@ -642,6 +643,14 @@ public class LoanOverdueBankService extends MybatisBaseService<LoanOverdueBankMa
         qw.groupBy("a1.loanContractNo");
         List<LoanOverdueBankDetailsDto> detailsDtoList = baseMapper.detailsList(useOrgSid, qw, stopDate);
         detailsDtoList.removeAll(Collections.singleton(null));
+        if (!detailsDtoList.isEmpty()) {
+            for (int i = 0; i < detailsDtoList.size(); i++) {
+                LoanOverdueBankDetailsDto loanOverdueBankDetailsDto = detailsDtoList.get(i);
+                if (StringUtils.isNotBlank(loanOverdueBankDetailsDto.getOverdueMoney())) {
+                    loanOverdueBankDetailsDto.setOverdueMoney(new BigDecimal(loanOverdueBankDetailsDto.getOverdueMoney()).setScale(2, BigDecimal.ROUND_HALF_UP).toString());
+                }
+            }
+        }
         return detailsDtoList;
     }
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinMapper.xml

@@ -76,7 +76,7 @@
                          WHERE busSid IN
                                (SELECT lrpd.sid
                                 FROM loan_repayment_plan_details lrpd
-                                WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < CURDATE())),
+                                WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < CURDATE() and lrpd.busVinSid = a1.busVinSid)),
                         0
                     )
             )          AS overdueMoney,

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

@@ -32,6 +32,7 @@ import com.yxt.anrui.riskcenter.api.loansettlecompanycost.LoanSettleCompanyCost;
 import com.yxt.anrui.riskcenter.api.loansettlecompanycost.LoanSettleCompanyCostVo;
 import com.yxt.anrui.riskcenter.api.loansettlecompanyreduction.LoanSettleCompanyReduction;
 import com.yxt.anrui.riskcenter.api.loansettlecompanyreduction.LoanSettleCompanyReductionVo;
+import com.yxt.anrui.riskcenter.api.loansettlevehicle.LoanSettleVehicleDto;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail;
 import com.yxt.anrui.riskcenter.biz.loansettlebankcost.LoanSettleBankCostMapper;
@@ -40,6 +41,7 @@ import com.yxt.anrui.riskcenter.biz.loansettlecompanycost.LoanSettleCompanyCostM
 import com.yxt.anrui.riskcenter.biz.loansettlecompanycost.LoanSettleCompanyCostService;
 import com.yxt.anrui.riskcenter.biz.loansettlecompanyreduction.LoanSettleCompanyReductionMapper;
 import com.yxt.anrui.riskcenter.biz.loansettlecompanyreduction.LoanSettleCompanyReductionService;
+import com.yxt.anrui.riskcenter.biz.loansettlevehicle.LoanSettleVehicleService;
 import com.yxt.anrui.riskcenter.biz.loansolutions.LoanSolutionsMapper;
 import com.yxt.anrui.riskcenter.biz.loansolutionsdetail.LoanSolutionsDetailService;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -107,6 +109,8 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
     private LoanSettleCompanyCostMapper loanSettleCompanyCostMapper;
     @Autowired
     private LoanSettleCompanyReductionMapper loanSettleCompanyReductionMapper;
+    @Autowired
+    private LoanSettleVehicleService loanSettleVehicleService;
 
 
     public PagerVo<LoanSettleApplyVo> listPageVo(PagerQuery<LoanSettleApplyQuery> pq) {
@@ -251,6 +255,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 loanSettleApply.setTypeState("01");
                 loanSettleApply.setTypeStateValue("正常结清");
             }
+            loanSettleApply.setTrueReduction(dto.isTrueReduction() ? 1 : 0);
             baseMapper.insert(loanSettleApply);
         } else {//修改
             LoanSettleApply loanSettleApply = fetchBySid(sid);
@@ -267,10 +272,16 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 loanSettleCompanyCostService.saveCost(sid, loanSettleCompanyCostVo);
             }
             LoanSettleCompanyReductionVo loanSettleCompanyReductionVo = dto.getLoanSettleCompanyReductionVo();
+            loanSettleApply.setTrueReduction(dto.isTrueReduction() ? 1 : 0);
+            if (!dto.isTrueReduction()) {
+                loanSettleCompanyReductionVo.setAmountTo("");
+                loanSettleCompanyReductionVo.setDepositPenalty("");
+                loanSettleCompanyReductionVo.setOtherCost("");
+                loanSettleCompanyReductionVo.setFundPenalty("");
+            }
             if (loanSettleCompanyReductionVo != null) {
                 loanSettleCompanyReductionService.saveReduction(sid, loanSettleCompanyReductionVo);
             }
-            loanSettleApply.setTrueReduction(dto.isTrueReduction() ? 1 : 0);
             baseMapper.updateById(loanSettleApply);
         }
         return rb.success().setData(sid);
@@ -339,6 +350,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
             loanSettleApplyDetailsVo.setSid(sid);
             loanSettleApplyDetailsVo.setUserSid(loanSettleApply.getCreateBySid());
             loanSettleApplyDetailsVo.setCreateTime(DateUtil.format(loanSettleApply.getCreateTime(), "yyyy-MM-dd"));
+            loanSettleApplyDetailsVo.setOrgPath(loanSettleApply.getOrgSidPath());
             LoanSettleBankCostVo loanSettleBankCostVo = new LoanSettleBankCostVo();
             LoanSettleBankCost loanSettleBankCost = loanSettleBankCostService.selectByMainSid(sid);
             if (loanSettleBankCost != null) {
@@ -374,6 +386,9 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 }
                 loanSettleApplyDetailsVo.setLoanSettleCompanyReductionVo(loanSettleCompanyReductionVo);
             }
+            if(StringUtils.isNotBlank(loanSettleApply.getBusSid())){
+                loanSettleApplyDetailsVo.setShowHg(true);
+            }
         }
         return rb.success().setData(loanSettleApplyDetailsVo);
     }
@@ -625,6 +640,8 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 baseMapper.updateById(loanSettleApply);
                 //更新车辆表结清状态
                 baseMapper.updateBus(loanSettleApply.getBusVinSid());
+                //推送到结清车辆台账
+                pushSettlevehicle(businessSid);
             } else {
                 //极光推送
                 loanSettleApply = fetchBySid(businessSid);
@@ -647,6 +664,35 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         }
     }
 
+    private void pushSettlevehicle(String businessSid) {
+        LoanSettleVehicleDto loanSettleVehicleDto = new LoanSettleVehicleDto();
+        LoanSettleApply loanSettleApply = fetchBySid(businessSid);
+        BeanUtil.copyProperties(loanSettleApply, loanSettleVehicleDto);
+        LoanSettleBankCost loanSettleBankCost = loanSettleBankCostService.selectByMainSid(businessSid);
+        if (loanSettleBankCost != null) {
+            if (loanSettleBankCost.getBankSettlePrice() != null) {
+                loanSettleVehicleDto.setBankSettlePrice(loanSettleBankCost.getBankSettlePrice().toString());
+            }
+        }
+        LoanSettleCompanyCost loanSettleCompanyCost = loanSettleCompanyCostService.selectByMainSid(businessSid);
+        if(loanSettleCompanyCost != null){
+            if(loanSettleCompanyCost.getSettleAll() != null){
+                loanSettleVehicleDto.setSettleAll(loanSettleCompanyCost.getSettleAll().toString());
+            }
+        }
+        LoanSettleCompanyReduction loanSettleCompanyReduction = loanSettleCompanyReductionService.selectByMainSid(businessSid);
+        if(loanSettleCompanyReduction != null){
+            if(loanSettleCompanyReduction.getAmountTo() != null){
+                loanSettleVehicleDto.setAmountTo(loanSettleCompanyReduction.getAmountTo().toString());
+            }
+            if(loanSettleCompanyReduction.getProfit() != null){
+                loanSettleVehicleDto.setProfit(loanSettleCompanyReduction.getProfit().toString());
+            }
+        }
+        loanSettleVehicleService.saveSettleVehicle(loanSettleVehicleDto);
+
+    }
+
     private int updateFlowFiled(Map<String, Object> beanToMap) {
         return baseMapper.updateFlowFiled(beanToMap);
     }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlevehicle/LoanSettleVehicleMapper.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.riskcenter.biz.loansettlevehicle;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
+import com.yxt.anrui.riskcenter.api.loansettlevehicle.LoanSettleVehicle;
+import com.yxt.anrui.riskcenter.api.loansettlevehicle.LoanSettleVehicleVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/18
+ **/
+@Mapper
+public interface LoanSettleVehicleMapper extends BaseMapper<LoanSettleVehicle> {
+    LoanSettleVehicle selectByBusVinSid(String busVinSid);
+
+    IPage<LoanSettleVehicleVo> selectPageVo(IPage<LoanSettleVehicle> page, @Param(Constants.WRAPPER)QueryWrapper<LoanSettleVehicle> qw);
+
+    LoanRepaymentPlanDetails selectOneByBusVinSid(String busVinSid);
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlevehicle/LoanSettleVehicleMapper.xml

@@ -0,0 +1,41 @@
+<?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.loansettlevehicle.LoanSettleVehicleMapper">
+    <select id="selectByBusVinSid" resultType="com.yxt.anrui.riskcenter.api.loansettlevehicle.LoanSettleVehicle">
+        select *
+        from loan_settle_vehicle
+        where busVinSid = #{busVinSid}
+    </select>
+
+    <select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loansettlevehicle.LoanSettleVehicleVo">
+        select lv.sid,
+               lv.typeStateValue,
+               lv.useOrgName,
+               lv.createDept,
+               lv.loanContractNo,
+               lv.vinNo,
+               lv.busVinSid,
+               lv.vehMark,
+               lv.loanName,
+               lv.peroid,
+               lv.settingDate,
+               lv.bankSettlePrice,
+               lv.settleAll,
+               lv.amountTo,
+               lv.profit
+        from loan_settle_vehicle lv
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        order by lv.useOrgName desc, lv.typeStateValue desc, lv.loanContractNo desc, lv.vinNo desc
+    </select>
+
+    <select id="selectOneByBusVinSid"
+            resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails">
+        select *
+        from loan_repayment_plan_details
+        where busVinSid = #{busVinSid}
+        order by period desc
+        limit 1
+    </select>
+</mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlevehicle/LoanSettleVehicleRest.java

@@ -0,0 +1,32 @@
+package com.yxt.anrui.riskcenter.biz.loansettlevehicle;
+
+import com.yxt.anrui.riskcenter.api.loansettlevehicle.LoanSettleVehicleFeign;
+import com.yxt.anrui.riskcenter.api.loansettlevehicle.LoanSettleVehicleQuery;
+import com.yxt.anrui.riskcenter.api.loansettlevehicle.LoanSettleVehicleVo;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/18
+ **/
+@RestController
+@RequestMapping("v1/LoanSettleVehicle")
+@Api(tags = "结清车辆台账")
+public class LoanSettleVehicleRest implements LoanSettleVehicleFeign {
+    @Autowired
+    private LoanSettleVehicleService loanSettleVehicleService;
+
+    @Override
+    public ResultBean<PagerVo<LoanSettleVehicleVo>> pageList(PagerQuery<LoanSettleVehicleQuery> pagerQuery) {
+        ResultBean<PagerVo<LoanSettleVehicleVo>> rb = ResultBean.fireFail();
+        PagerVo<LoanSettleVehicleVo> pv = loanSettleVehicleService.listPageVo(pagerQuery);
+        return rb.success().setData(pv);
+    }
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlevehicle/LoanSettleVehicleService.java

@@ -0,0 +1,136 @@
+package com.yxt.anrui.riskcenter.biz.loansettlevehicle;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
+import com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApply;
+import com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApplyQuery;
+import com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApplyVo;
+import com.yxt.anrui.riskcenter.api.loansettlevehicle.LoanSettleVehicle;
+import com.yxt.anrui.riskcenter.api.loansettlevehicle.LoanSettleVehicleDto;
+import com.yxt.anrui.riskcenter.api.loansettlevehicle.LoanSettleVehicleQuery;
+import com.yxt.anrui.riskcenter.api.loansettlevehicle.LoanSettleVehicleVo;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/18
+ **/
+@Service
+public class LoanSettleVehicleService extends MybatisBaseService<LoanSettleVehicleMapper, LoanSettleVehicle> {
+
+
+    @Autowired
+    private SysUserFeign sysUserFeign;
+
+    public ResultBean saveSettleVehicle(LoanSettleVehicleDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String busVinSid = dto.getBusVinSid();
+        //查询
+        LoanSettleVehicle loanSettleVehicle = baseMapper.selectByBusVinSid(busVinSid);
+        if (loanSettleVehicle == null) {
+            loanSettleVehicle = new LoanSettleVehicle();
+            BeanUtil.copyProperties(dto, loanSettleVehicle, "sid");
+            LoanRepaymentPlanDetails loanRepaymentPlanDetails = baseMapper.selectOneByBusVinSid(busVinSid);
+            if (loanRepaymentPlanDetails != null) {
+                loanSettleVehicle.setPeroid(loanRepaymentPlanDetails.getPeriod());
+            }
+            baseMapper.insert(loanSettleVehicle);
+        }
+
+        return rb.success();
+
+    }
+
+    public PagerVo<LoanSettleVehicleVo> listPageVo(PagerQuery<LoanSettleVehicleQuery> pagerQuery) {
+        LoanSettleVehicleQuery query = pagerQuery.getParams();
+        QueryWrapper<LoanSettleVehicle> qw = new QueryWrapper<>();
+        if (query != null) {
+            //分公司
+            if (StringUtils.isNotBlank(query.getUseOrgName())) {
+                qw.like("lv.useOrgName", query.getUseOrgName());
+            }
+            //申请部门
+            if (StringUtils.isNotBlank(query.getCreateDept())) {
+                qw.like("lv.createDept", query.getCreateDept());
+            }
+            //贷款合同编号
+            if (StringUtils.isNotBlank(query.getLoanContractNo())) {
+                qw.like("lv.loanContractNo", query.getLoanContractNo());
+            }
+            //贷款人
+            if (StringUtils.isNotBlank(query.getLoanName())) {
+                qw.like("lv.loanName", query.getLoanName());
+            }
+            //车架号
+            if (StringUtils.isNotBlank(query.getVinNo())) {
+                qw.like("lv.vinNo", query.getVinNo());
+            }
+            //车牌号
+            if (StringUtils.isNotBlank(query.getVehMark())) {
+                qw.like("lv.vehMark", query.getVehMark());
+            }
+            if (StringUtils.isNotBlank(query.getTypeStateKey())) {
+                qw.eq("lv.typeState", query.getTypeStateKey());
+            }
+
+            if (StringUtils.isNotBlank(query.getMenuUrl())) {
+                //=======================
+                PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+                privilegeQuery.setOrgPath(query.getOrgPath());
+                privilegeQuery.setMenuUrl(query.getMenuUrl());
+                privilegeQuery.setUserSid(query.getUserSid());
+                ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+                if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+                    //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                    String orgSidPath = query.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("lv.orgSidPath", orgSidPath);
+                    } else if ("2".equals(orgLevelKey)) {
+                        orgSidPath = orgSidPath.substring(0, i2);
+                        qw.like("lv.orgSidPath", orgSidPath);
+                    } else if ("3".equals(orgLevelKey)) {
+                        orgSidPath = orgSidPath.substring(0, i3);
+                        qw.like("lv.orgSidPath", orgSidPath);
+                    } else if ("4".equals(orgLevelKey)) {
+                        orgSidPath = orgSidPath.substring(0, i4);
+                        qw.like("lv.orgSidPath", orgSidPath);
+                    } else if ("5".equals(orgLevelKey)) {
+                        qw.eq("lv.createBySid", query.getUserSid());
+                    } else {
+                        PagerVo<LoanSettleVehicleVo> p = new PagerVo<>();
+                        return p;
+                    }
+                } else {
+                    PagerVo<LoanSettleVehicleVo> p = new PagerVo<>();
+                    return p;
+                }
+            }
+        }
+        IPage<LoanSettleVehicle> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<LoanSettleVehicleVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<LoanSettleVehicleVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java

@@ -469,6 +469,8 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
         ResultBean<String> resultBean = saveTransferPayment(dto);
         if (resultBean.getSuccess()) {
             businessSid = resultBean.getData();
+        } else {
+            return rb.setMsg(resultBean.getMsg());
         }
         LoanTransferPaymentApply entity = fetchBySid(businessSid);
         String orgSidPath = "";

doc/databases/risk_center.sql

@@ -1865,6 +1865,45 @@ CREATE TABLE `loan_settle_company_reduction`
   DEFAULT CHARSET = utf8 COMMENT ='公司结清费用减免情况';
 
 
+DROP TABLE IF EXISTS `loan_settle_vehicle`;
+CREATE TABLE `loan_settle_vehicle`
+(
+    `id`              int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`             varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion`     int(32)              DEFAULT '0' COMMENT '版本锁',
+    `createTime`      timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`      timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`        int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`           int(32)              DEFAULT '1' COMMENT '状态',
+    `isDelete`        int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`         varchar(255)         DEFAULT NULL COMMENT '备注',
+    `createBySid`     varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid`     varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `typeState`       varchar(64)          DEFAULT NULL COMMENT '结清类型key',
+    `typeStateValue`  varchar(64)          DEFAULT NULL COMMENT '结清类型value',
+    `useOrgName`      varchar(64)          DEFAULT NULL COMMENT '分公司',
+    `useOrgSid`       varchar(64)          DEFAULT NULL COMMENT '分公司sid',
+    `createDept`      varchar(64)          DEFAULT NULL COMMENT '销售部门',
+    `createDeptSid`   varchar(64)          DEFAULT NULL COMMENT '销售部门sid',
+    `orgSidPath`      text                 DEFAULT NULL COMMENT '组织机构全路径sid',
+    `loanContractNo`  varchar(64)          DEFAULT NULL COMMENT '贷款合同编号',
+    `vinNo`           varchar(64)          DEFAULT NULL COMMENT '车架号',
+    `busVinSid`       varchar(64)          DEFAULT NULL COMMENT '销售订单车辆sid',
+    `vehMark`         varchar(64)          DEFAULT NULL COMMENT '车牌号',
+    `loanName`        varchar(64)          DEFAULT NULL COMMENT '贷款人',
+    `loanSid`         varchar(64)          DEFAULT NULL COMMENT '贷款人sid',
+    `peroid`          varchar(64)          DEFAULT NULL COMMENT '期数',
+    `settingDate`     varchar(64)          DEFAULT NULL COMMENT '结清日期',
+    `bankSettlePrice` decimal(10, 2)       DEFAULT NULL COMMENT '资方结清金额',
+    `settleAll`       decimal(10, 2)       DEFAULT NULL COMMENT '公司正常结清合计',
+    `amountTo`        decimal(10, 2)       DEFAULT NULL COMMENT '公司减免后结清合计',
+    `profit`          decimal(10, 2)       DEFAULT NULL COMMENT '结清利润',
+    PRIMARY KEY (`id`),
+    KEY `id` (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8 COMMENT ='结清车辆台账';
+
+