Merge remote-tracking branch 'origin/master'

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

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

@@ -75,6 +75,8 @@ public enum ProcDefEnum {
     LOANSUBLETAPPLY("交回车辆二次转租申请", "process_lu7pdwzs:1:7940004"),
     LOANOUTBOUNDVEHAPPLY("交回车辆出库申请", "process_14spbdx8:1:7982504"),
     LOANSECONDSALEAPPLY("交车车辆二次销售申请", "process_6kb1z0pe:4:8110004"),
+    LOANSETTLEAPPLY("结清申请", ""),
+    LOANREPURCHASEAPPLY("回购申请", "process_1ozjarxl:1:8207504"),
     LOANCASEAPPEALAPPLY("案件上诉申请", "process_0r2ruoxm:1:8215004"),
 
     /******************************测试流程id*********************************************/

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanlawsuitapply/LoanLawsuitApply.java

@@ -0,0 +1,63 @@
+package com.yxt.anrui.riskcenter.api.loanlawsuitapply;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/16 14:34
+ */
+@Data
+@ApiModel(value = "诉讼案件管理", description = "诉讼案件管理")
+@TableName("loan_lawsuit_apply")
+public class LoanLawsuitApply extends BaseEntity {
+    @ApiModelProperty("申请部门")
+    private String createDept;
+    @ApiModelProperty("申请部门sid")
+    private String createDeptSid;
+    @ApiModelProperty("申请人")
+    private String createByName;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("贷款人")
+    private String loanName;
+    @ApiModelProperty("贷款合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("资方")
+    private String bankName;
+    @ApiModelProperty("资方合同编号")
+    private String bankContractNo;
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+    @ApiModelProperty("办结日期")
+    private Date closeDate;
+    @ApiModelProperty("实例id")
+    private String procInstId;
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+    @ApiModelProperty("环节id")
+    private String taskDefKey;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName;
+    @ApiModelProperty("使用组织全路径")
+    private String orgSidPath;
+    @ApiModelProperty("诉讼主体")
+    private String lawsuitSubject;
+    @ApiModelProperty("销售订单sid")
+    private String salesOrderSid;
+    @ApiModelProperty("申请日期")
+    private Date applyDate;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanlawsuitapply/LoanLawsuitApplyDetailsVo.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.riskcenter.api.loanlawsuitapply;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/21 9:13
+ */
+@Data
+public class LoanLawsuitApplyDetailsVo implements Vo {
+    private String sid;
+    private String remarks;
+    private String userSid;
+    @ApiModelProperty("参数编码")
+    private String parameterNo;
+    @ApiModelProperty("参数名称")
+    private String parameterName;
+    @ApiModelProperty("参数值")
+    private String parameterValue;
+    @ApiModelProperty("使用组织全路径")
+    private String orgPath;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanlawsuitapply/LoanLawsuitApplyDto.java

@@ -0,0 +1,27 @@
+package com.yxt.anrui.riskcenter.api.loanlawsuitapply;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/21 9:12
+ */
+@Data
+public class LoanLawsuitApplyDto implements Dto {
+
+    private String sid;
+    private String remarks;
+    private String userSid;
+    @ApiModelProperty("参数编码")
+    private String parameterNo;
+    @ApiModelProperty("参数名称")
+    private String parameterName;
+    @ApiModelProperty("参数值")
+    private String parameterValue;
+    @ApiModelProperty("使用组织全路径")
+    private String orgPath;
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanlawsuitapply/LoanLawsuitApplyFeign.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.riskcenter.api.loanlawsuitapply;
+
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+
+
+/**
+ * @description: 诉讼案件管理
+ * @author: fan
+ * @date: 2023/7/6
+ **/
+@Api(tags = "诉讼案件管理")
+@FeignClient(
+        contextId = "anrui-riskcenter-LoanLawsuitApply",
+        name = "anrui-riskcenter",
+        path = "v1/LoanLawsuitApply",
+        fallback = LoanLawsuitApplyFeignFallback.class)
+public interface LoanLawsuitApplyFeign {
+
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanlawsuitapply/LoanLawsuitApplyFeignFallback.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.riskcenter.api.loanlawsuitapply;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/16 14:36
+ */
+@Component
+public class LoanLawsuitApplyFeignFallback implements LoanLawsuitApplyFeign {
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanlawsuitapply/LoanLawsuitApplyQuery.java

@@ -0,0 +1,29 @@
+package com.yxt.anrui.riskcenter.api.loanlawsuitapply;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/16 15:05
+ */
+@Data
+public class LoanLawsuitApplyQuery implements Query {
+
+    @ApiModelProperty("参数编码")
+    private String parameterNo;
+    @ApiModelProperty("参数名称")
+    private String parameterName;
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
+    @ApiModelProperty("菜单sid")
+    private String menuSid;
+    @ApiModelProperty("菜单url")
+    private String menuUrl;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanlawsuitapply/LoanLawsuitApplyVo.java

@@ -0,0 +1,23 @@
+package com.yxt.anrui.riskcenter.api.loanlawsuitapply;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/16 15:04
+ */
+@Data
+public class LoanLawsuitApplyVo implements Vo {
+    private String sid;
+    @ApiModelProperty("参数编码")
+    private String parameterNo;
+    @ApiModelProperty("参数名称")
+    private String parameterName;
+    @ApiModelProperty("参数值")
+    private String parameterValue;
+    @ApiModelProperty("备注")
+    private String remarks;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanlawsuitveh/LoanLawsuitVeh.java

@@ -0,0 +1,57 @@
+package com.yxt.anrui.riskcenter.api.loanlawsuitveh;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/16 14:34
+ */
+@Data
+@ApiModel(value = "诉讼案件管理-车辆", description = "诉讼案件管理-车辆")
+@TableName("loan_lawsuit_veh")
+public class LoanLawsuitVeh extends BaseEntity {
+    @ApiModelProperty("主表sid")
+    private String mainSid;
+    @ApiModelProperty("销售订单车辆sid")
+    private String busVinSid;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("已还金额")
+    private BigDecimal alRepaidMoney;
+    @ApiModelProperty("当前逾期金额")
+    private BigDecimal currentBeMoney;
+    @ApiModelProperty("其中资金占用费")
+    private BigDecimal wheFundOccMoney;
+    @ApiModelProperty("未到期金额")
+    private BigDecimal unexpiredMoney;
+    @ApiModelProperty("总期数")
+    private BigDecimal nper;
+    @ApiModelProperty("当前期数")
+    private BigDecimal currentPeriod;
+    @ApiModelProperty("已还金额换算期数")
+    private BigDecimal alRepaidMoneyConPeriod;
+    @ApiModelProperty("逾期金额换算期数")
+    private BigDecimal beOverdueMoneyAndPeriod;
+    @ApiModelProperty("垫资方月还")
+    private BigDecimal price;
+    @ApiModelProperty("垫资方逾期利息")
+    private BigDecimal bankInterest;
+    @ApiModelProperty("车辆处置金额")
+    private BigDecimal amount;
+    @ApiModelProperty("欠款小计")
+    private BigDecimal owedTotal;
+    @ApiModelProperty("贷款保证金")
+    private BigDecimal deposit;
+    @ApiModelProperty("是否回购")
+    private String repo;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanlawsuitveh/LoanLawsuitVehFeign.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.riskcenter.api.loanlawsuitveh;
+
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+
+
+/**
+ * @description: 诉讼案件管理
+ * @author: fan
+ * @date: 2023/7/6
+ **/
+@Api(tags = "诉讼案件管理-车辆")
+@FeignClient(
+        contextId = "anrui-riskcenter-LoanLawsuitVeh",
+        name = "anrui-riskcenter",
+        path = "v1/LoanLawsuitVeh",
+        fallback = LoanLawsuitVehFeignFallback.class)
+public interface LoanLawsuitVehFeign {
+
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanlawsuitveh/LoanLawsuitVehFeignFallback.java

@@ -0,0 +1,13 @@
+package com.yxt.anrui.riskcenter.api.loanlawsuitveh;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/16 14:36
+ */
+@Component
+public class LoanLawsuitVehFeignFallback implements LoanLawsuitVehFeign {
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApply.java

@@ -0,0 +1,85 @@
+package com.yxt.anrui.riskcenter.api.loanrepurchaseapply;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/16 14:34
+ */
+@Data
+@ApiModel(value = "回购申请", description = "回购申请")
+@TableName("loan_repurchase_apply")
+public class LoanRepurchaseApply extends BaseEntity {
+    @ApiModelProperty("销售订单sid")
+    private String salesOrderSid;
+    @ApiModelProperty("申请日期")
+    private Date applyDate;
+    @ApiModelProperty("申请部门")
+    private String createDept;
+    @ApiModelProperty("申请部门sid")
+    private String createDeptSid;
+    @ApiModelProperty("申请人")
+    private String createByName;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("贷款人")
+    private String loanName;
+    @ApiModelProperty("贷款合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("资方")
+    private String bankName;
+    @ApiModelProperty("资方合同编号")
+    private String bankContractNo;
+    @ApiModelProperty("销售订单车辆sid")
+    private String busVinSid;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("预计结清日期")
+    private Date prepareDate;
+    @ApiModelProperty("回购金额")
+    private BigDecimal amount;
+    @ApiModelProperty("公司当前逾期金额月还")
+    private BigDecimal nowLateMoney;
+    @ApiModelProperty("公司当前未到期月还")
+    private BigDecimal nowNoLateMoney;
+    @ApiModelProperty("公司未到期金额")
+    private BigDecimal noLateMoney;
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+    @ApiModelProperty("办结日期")
+    private Date closeDate;
+    @ApiModelProperty("实例id")
+    private String procInstId;
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+    @ApiModelProperty("环节id")
+    private String taskDefKey;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName;
+    @ApiModelProperty("使用组织全路径")
+    private String orgSidPath;
+    @ApiModelProperty("回购原因")
+    private String buybacksReason;
+    @ApiModelProperty("资方收款账户")
+    private String bankReceivingAccount;
+    @ApiModelProperty("资方收款账号")
+    private String bankAccountNo;
+    @ApiModelProperty("付款时需备注内容")
+    private String payRemarks;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyDetailsVo.java

@@ -0,0 +1,52 @@
+package com.yxt.anrui.riskcenter.api.loanrepurchaseapply;
+
+import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanSolutionsDetailsssVo;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/21 9:13
+ */
+@Data
+public class LoanRepurchaseApplyDetailsVo implements Vo {
+    private String sid;
+    private String userSid;
+    @ApiModelProperty("使用组织全路径")
+    private String orgPath;
+    private LoanRepurchaseSolutionsDetailsssVo solutionsDetailsssVo;
+    @ApiModelProperty("贷款保证金")
+    private String loanDeposit;
+    @ApiModelProperty("公司逾期月还")
+    private String overduePrice;
+    @ApiModelProperty("垫资方逾期利息")
+    private String putBankInterest;
+    @ApiModelProperty("资金占用费")
+    private String funfCost;
+    @ApiModelProperty("资方逾期利息")
+    private String bankOverInterest;
+    @ApiModelProperty("公司当期未到期月还")
+    private String companyCurrentNotPrice;
+    @ApiModelProperty("资方未到期金额")
+    private String bankNotPrice;
+    @ApiModelProperty("贷款保证金扣罚金额")
+    private String deductionAmount;
+    @ApiModelProperty("名义价")
+    private String companyNominalPrice;
+    @ApiModelProperty("合同违约金")
+    private String contractLiquidated;
+    @ApiModelProperty("公司其他费用")
+    private String companyOtherPrice;
+    @ApiModelProperty("其他费用说明")
+    private String otherCostRemarks;
+    @ApiModelProperty("公司正常结清合计")
+    private String settleAll;
+    @ApiModelProperty("结清利润")
+    private String profit;
+
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyDto.java

@@ -0,0 +1,27 @@
+package com.yxt.anrui.riskcenter.api.loanrepurchaseapply;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/21 9:12
+ */
+@Data
+public class LoanRepurchaseApplyDto implements Dto {
+
+    private String sid;
+    private String remarks;
+    private String userSid;
+    @ApiModelProperty("参数编码")
+    private String parameterNo;
+    @ApiModelProperty("参数名称")
+    private String parameterName;
+    @ApiModelProperty("参数值")
+    private String parameterValue;
+    @ApiModelProperty("使用组织全路径")
+    private String orgPath;
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyFeign.java

@@ -0,0 +1,64 @@
+package com.yxt.anrui.riskcenter.api.loanrepurchaseapply;
+
+import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterQuery;
+import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * @description: 回购申请
+ * @author: fan
+ * @date: 2023/7/6
+ **/
+@Api(tags = "回购申请")
+@FeignClient(
+        contextId = "anrui-riskcenter-LoanRepurchaseApply",
+        name = "anrui-riskcenter",
+        path = "v1/loanrepurchaseapply",
+        fallback = LoanRepurchaseApplyFeignFallback.class)
+public interface LoanRepurchaseApplyFeign {
+
+    /**
+     * 根据条件分页查询数据的列表（已测试）
+     *
+     * @param pq
+     */
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<LoanRepurchaseApplyVo>> listPage(@RequestBody PagerQuery<LoanRepurchaseApplyQuery> pq);
+
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<LoanRepurchaseApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+
+//
+//
+//    @ApiOperation("新增或修改")
+//    @PostMapping("/saveOrUpdate")
+//    @ResponseBody
+//    public ResultBean saveOrUpdateParameter(@RequestBody LoanParameterDto dto);
+//
+//    @ApiOperation("批量删除")
+//    @DeleteMapping("/deleteBySids")
+//    @ResponseBody
+//    public ResultBean deleteBySids(@RequestBody String[] sids);
+//
+//
+//    @ApiOperation("根据参数编码查询参数值")
+//    @PostMapping("/fetchByParNo")
+//    @ResponseBody
+//    ResultBean<String> fetchByParNo(@RequestParam("parNo") String parNo);
+//
+//    @ApiOperation("根据参数编码查询记录")
+//    @PostMapping("/fetchOneByParNo")
+//    @ResponseBody
+//    ResultBean<LoanParameter> fetchOneByParNo(@RequestParam("parNo") String parNo);
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyFeignFallback.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.riskcenter.api.loanrepurchaseapply;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/16 14:36
+ */
+@Component
+public class LoanRepurchaseApplyFeignFallback implements LoanRepurchaseApplyFeign {
+
+    @Override
+    public ResultBean<PagerVo<LoanRepurchaseApplyVo>> listPage(PagerQuery<LoanRepurchaseApplyQuery> pq) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<LoanRepurchaseApplyDetailsVo> fetchDetailsBySid(String sid) {
+        return null;
+    }
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyQuery.java

@@ -0,0 +1,57 @@
+package com.yxt.anrui.riskcenter.api.loanrepurchaseapply;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/16 15:05
+ */
+@Data
+public class LoanRepurchaseApplyQuery implements Query {
+
+    @ApiModelProperty("申请部门")
+    private String createDept;
+    @ApiModelProperty("申请开始日期")
+    private String applyStartDate;
+    @ApiModelProperty("申请结束日期")
+    private String applyEndDate;
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName;
+    @ApiModelProperty("申请人")
+    private String createByName;
+    @ApiModelProperty("办结开始日期")
+    private String closeStartDate;
+    @ApiModelProperty("办结结束日期")
+    private String closeEndDate;
+    @ApiModelProperty("贷款合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("资方")
+    private String bankName;
+    @ApiModelProperty("资方合同编号")
+    private String bankContractNo;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("贷款人")
+    private String loanName;
+    @ApiModelProperty("预计结清开始日期")
+    private String prepareStartDate;
+    @ApiModelProperty("预计结清结束日期")
+    private String prepareEndDate;
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
+    @ApiModelProperty("菜单sid")
+    private String menuSid;
+    @ApiModelProperty("菜单url")
+    private String menuUrl;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyVo.java

@@ -0,0 +1,51 @@
+package com.yxt.anrui.riskcenter.api.loanrepurchaseapply;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/16 15:04
+ */
+@Data
+public class LoanRepurchaseApplyVo implements Vo {
+    private String sid;
+    @ApiModelProperty("申请部门")
+    private String createDept;
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName;
+    @ApiModelProperty("申请日期")
+    private String applyDate;
+    @ApiModelProperty("申请人")
+    private String createByName;
+    @ApiModelProperty("办结日期")
+    private String closeDate;
+    @ApiModelProperty("贷款合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("资方")
+    private String bankName;
+    @ApiModelProperty("资方合同编号")
+    private String bankContractNo;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("贷款人")
+    private String loanName;
+    @ApiModelProperty("预计结清日期")
+    private String prepareDate;
+    @ApiModelProperty("回购金额")
+    private String amount;
+    @ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+    @ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseSolutionsDetailsssVo.java

@@ -0,0 +1,170 @@
+package com.yxt.anrui.riskcenter.api.loanrepurchaseapply;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/2/6 11:22
+ */
+@Data
+public class LoanRepurchaseSolutionsDetailsssVo {
+
+    @JsonProperty("isShowMore")
+    private boolean isShowMore;
+    @ApiModelProperty("销售订单sid")
+    private String salesOrderSid;
+
+    //金融方案主表
+
+    @ApiModelProperty("类型：01自营非担保，02外部金融")
+    private String type;
+    @ApiModelProperty("类型：01自营非担保，02外部金融")
+    private String typeKey;
+    private String isPack;
+    @ApiModelProperty("产品政策名称")
+    private String policyName;
+    @ApiModelProperty("产品政策sid")
+    private String policySid;
+    @ApiModelProperty("融资项目总额")
+    private String loanTotal;
+    @ApiModelProperty("主车发票价")
+    private String mainVehicleAmount;
+    @ApiModelProperty("融资票据")
+    private String accessoriesAmount;
+    @ApiModelProperty("挂车金额")
+    private String trailerAmount;
+    @ApiModelProperty("购置税")
+    private String purchaseTax;
+    @ApiModelProperty("保险金额")
+    private String premium;
+    @ApiModelProperty("车损上浮")
+    private String vehDamageFloat;
+    @ApiModelProperty("首付款比例")
+    private String downPayRatio;
+    @ApiModelProperty("首付金额")
+    private String downPayAmount;
+    @ApiModelProperty("贷款金额")
+    private String loanAmount;
+    @ApiModelProperty("贷款期数")
+    private String loanPeriod;
+    @ApiModelProperty("保证金比例")
+    private String bondRatio;
+    @ApiModelProperty("保证金金额")
+    private String bondAmount;
+    @ApiModelProperty("厂家贴息")
+    private String factoryDiscount;
+    @ApiModelProperty("厂家贴息用途")
+    private String factoryDiscountUse;
+    @ApiModelProperty("年利率")
+    private String policyYearRatio;
+    @ApiModelProperty("贷款月还")
+    private String loanPayMoney;
+    @ApiModelProperty("贷款利息")
+    private String loanInterest;
+    @ApiModelProperty("是否有融资票据")
+    private boolean accessoriesAmountCb;
+    @ApiModelProperty("是否有挂车")
+    private boolean trailerAmountCb;
+    @ApiModelProperty("是否有购置税")
+    private boolean purchaseTaxCb;
+    @ApiModelProperty("是否有保险")
+    private boolean premiumCb;
+    @ApiModelProperty("是否有车损上浮")
+    private boolean vehDamageFloatCb;
+    @ApiModelProperty("是否勾选其它融")
+    private boolean otherPolicyState;
+    private String discountCar;
+
+    //其他融
+
+    @ApiModelProperty("其它融名称")
+    private String otherPolicyName;
+    private String otherPolicySid;
+    @ApiModelProperty("其它融金额")
+    private String otherPolicyAmount;
+    @ApiModelProperty("其它融期数")
+    private String otherPolicyPeriod;
+    @ApiModelProperty("其它融月还")
+    private String otherPolicyMonthlyRepay;
+    @ApiModelProperty("其它融利息总额")
+    private String otherPolicyInterest;
+    @ApiModelProperty("其它融年利率")
+    private String otherPolicyYearRatio;
+
+    @ApiModelProperty("'融资首付")
+    private String loanDownPay;
+    @ApiModelProperty("总贷款金额")
+    private String loanAmountTotal;
+    @ApiModelProperty("期数")
+    private String period;
+    @ApiModelProperty("月还金额")
+    private String monthlyRepay;
+    @ApiModelProperty("利息总额")
+    private String interest;
+    @ApiModelProperty("预计首期还款日")
+    private String returnTime;
+
+
+    //金融方案费用明细
+
+    @ApiModelProperty("融资首付")
+    private String downPayAmounts;
+    @ApiModelProperty("贷款保证金")
+    private String bondAmounts;
+    @ApiModelProperty("保险保证金")
+    private String depositPremium;
+    @ApiModelProperty("落户保证金")
+    private String depositSettle;
+    @ApiModelProperty("服务费")
+    private String serviceAmount;
+    @ApiModelProperty("代收意外险")
+    private String proxyAccidentPremium;
+    @ApiModelProperty("上牌费")
+    private String registerAmount;
+    @ApiModelProperty("运管费")
+    private String operationAmount;
+    @ApiModelProperty("补车价")
+    private String vehOtherPrice;
+    @ApiModelProperty("其它费用")
+    private String otherAmount;
+    @ApiModelProperty("其它费用说明")
+    private String otherAmountRemark;
+    @ApiModelProperty("办理方式选择")
+    private String dealWay;
+    @ApiModelProperty("办理方式选择key")
+    private String dealWayKey;
+    @ApiModelProperty("代收合计")
+    private String proxyTotal;
+    @ApiModelProperty("代收首年保险费")
+    private String proxyPremium;
+    @ApiModelProperty("代收购置费")
+    private String proxyPurchasetax;
+    @ApiModelProperty("抵顶首年保险费")
+    private String offsetPremium;
+    @ApiModelProperty("抵顶购置税")
+    private String offsetPurchasetax;
+    @ApiModelProperty("抵顶费用合计")
+    private String offsetTotal;
+    @ApiModelProperty("应收合计")
+    private String receivableTotal;
+    @ApiModelProperty("实收合计")
+    private String realTotal;
+    @ApiModelProperty("车辆总价")
+    private String vehTotalPrice;
+    @ApiModelProperty("名义留购价")
+    private String nominalPrice;
+
+    @ApiModelProperty("单台成交价")
+    private String finalPrice;
+    @ApiModelProperty("挂车价格")
+    private String gcPrice;
+    @ApiModelProperty("上装成交价")
+    private String szPrice;
+
+    @ApiModelProperty("实际首付比例")
+    private String downPayAmountsRatio;
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchasecompanycost/LoanRepurchaseCompanyCost.java

@@ -0,0 +1,50 @@
+package com.yxt.anrui.riskcenter.api.loanrepurchasecompanycost;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/16 14:34
+ */
+@Data
+@ApiModel(value = "回购-公司结清费用", description = "回购-公司结清费用")
+@TableName("loan_repurchase_company_cost")
+public class LoanRepurchaseCompanyCost extends BaseEntity {
+    @ApiModelProperty("主表sid")
+    private String mainSid;
+    @ApiModelProperty("贷款保证金")
+    private BigDecimal loanDeposit;
+    @ApiModelProperty("公司逾期月还")
+    private BigDecimal overduePrice;
+    @ApiModelProperty("垫资方逾期利息")
+    private BigDecimal putBankInterest;
+    @ApiModelProperty("资金占用费")
+    private BigDecimal funfCost;
+    @ApiModelProperty("资方逾期利息")
+    private BigDecimal bankOverInterest;
+    @ApiModelProperty("公司当期未到期月还")
+    private BigDecimal companyCurrentNotPrice;
+    @ApiModelProperty("资方未到期金额")
+    private BigDecimal bankNotPrice;
+    @ApiModelProperty("贷款保证金扣罚金额")
+    private BigDecimal deductionAmount;
+    @ApiModelProperty("名义价")
+    private BigDecimal companyNominalPrice;
+    @ApiModelProperty("合同违约金")
+    private BigDecimal contractLiquidated;
+    @ApiModelProperty("公司其他费用")
+    private BigDecimal companyOtherPrice;
+    @ApiModelProperty("其他费用说明")
+    private String otherCostRemarks;
+    @ApiModelProperty("公司正常结清合计")
+    private BigDecimal settleAll;
+    @ApiModelProperty("结清利润")
+    private BigDecimal profit;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchasecompanycost/LoanRepurchaseCompanyCostFeign.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.riskcenter.api.loanrepurchasecompanycost;
+
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+
+
+/**
+ * @description: 回购-公司结清费用
+ * @author: fan
+ * @date: 2023/7/6
+ **/
+@Api(tags = "回购-公司结清费用")
+@FeignClient(
+        contextId = "anrui-riskcenter-LoanRepurchaseCompanyCost",
+        name = "anrui-riskcenter",
+        path = "v1/LoanRepurchaseCompanyCost",
+        fallback = LoanRepurchaseCompanyCostFeignFallback.class)
+public interface LoanRepurchaseCompanyCostFeign {
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchasecompanycost/LoanRepurchaseCompanyCostFeignFallback.java

@@ -0,0 +1,13 @@
+package com.yxt.anrui.riskcenter.api.loanrepurchasecompanycost;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/16 14:36
+ */
+@Component
+public class LoanRepurchaseCompanyCostFeignFallback implements LoanRepurchaseCompanyCostFeign {
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchasecost/LoanRepurchaseCost.java

@@ -0,0 +1,41 @@
+package com.yxt.anrui.riskcenter.api.loanrepurchasecost;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/16 14:34
+ */
+@Data
+@ApiModel(value = "回购-资方结清费用", description = "回购-资方结清费用")
+@TableName("loan_repurchase_cost")
+public class LoanRepurchaseCost extends BaseEntity {
+    @ApiModelProperty("主表sid")
+    private String mainSid;
+    @ApiModelProperty("资方逾期月还")
+    private BigDecimal price;
+    @ApiModelProperty("资方当期未到期月还")
+    private BigDecimal currentNotDuePrice;
+    @ApiModelProperty("资方未到期金额")
+    private BigDecimal notDuePrice;
+    @ApiModelProperty("资方逾期利息")
+    private BigDecimal bankInterest;
+    @ApiModelProperty("资方名义价")
+    private BigDecimal bankNominalPrice;
+    @ApiModelProperty("资方合同违约金")
+    private BigDecimal bankContractLiquidated;
+    @ApiModelProperty("资方其他应收")
+    private BigDecimal bankOtherReceivable;
+    @ApiModelProperty("其他应收说明")
+    private String otherReceivableRemarks;
+    @ApiModelProperty("资方结清金额")
+    private BigDecimal bankSettlePrice;
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchasecost/LoanRepurchaseCostFeign.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.riskcenter.api.loanrepurchasecost;
+
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+
+
+/**
+ * @description: 风控参数
+ * @author: fan
+ * @date: 2023/7/6
+ **/
+@Api(tags = "回购-资方结清费用")
+@FeignClient(
+        contextId = "anrui-riskcenter-LoanRepurchaseCost",
+        name = "anrui-riskcenter",
+        path = "v1/LoanRepurchaseCost",
+        fallback = LoanRepurchaseCostFeignFallback.class)
+public interface LoanRepurchaseCostFeign {
+
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchasecost/LoanRepurchaseCostFeignFallback.java

@@ -0,0 +1,13 @@
+package com.yxt.anrui.riskcenter.api.loanrepurchasecost;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/16 14:36
+ */
+@Component
+public class LoanRepurchaseCostFeignFallback implements LoanRepurchaseCostFeign {
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyDetailsVo.java

@@ -97,5 +97,8 @@ public class LoanSecondarySalesApplyDetailsVo {
     @ApiModelProperty("有效期")
     private String validityDate;
 
+    @ApiModelProperty("是否显示竞价按钮")
+    private boolean validate;
+
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesveh/SalesVehVo.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.riskcenter.api.loansecondarysalesveh;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/6
+ **/
+@Data
+public class SalesVehVo {
+    @ApiModelProperty("车辆台账sid")
+    private String ledgerSid;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("类型")
+    private String vehType;
+    @ApiModelProperty("车型名称")
+    private String vehModel;
+    @ApiModelProperty("销售订单车辆sid")
+    private String busVinSid;
+}

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

@@ -0,0 +1,72 @@
+package com.yxt.anrui.riskcenter.api.loansettleapply;
+
+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/5
+ **/
+@Data
+public class LoanSettleApply extends BaseEntity {
+    private static final long serialVersionUID = -7535762549485962120L;
+    @ApiModelProperty("申请人")
+    private String createByName;
+    @ApiModelProperty("申请部门")
+    private String createDept;
+    @ApiModelProperty("申请部门sid")
+    private String createDeptSid;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("销售订单车辆sid")
+    private String busVinSid;
+    @ApiModelProperty("销售订单sid")
+    private String saleOrderSid;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("贷款人")
+    private String loanName;
+    @ApiModelProperty("贷款人sid")
+    private String loanSid;
+    @ApiModelProperty("贷款合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("资方")
+    private String bankName;
+    @ApiModelProperty("资方合同编号")
+    private String bankContractNo;
+    @ApiModelProperty("结清日期")
+    private String settingDate;
+    @ApiModelProperty("公司当前逾期月还")
+    private BigDecimal overdueMonthPrice;
+    @ApiModelProperty("公司当期未到期月还")
+    private BigDecimal currentNotDuePrice;
+    @ApiModelProperty("公司未到期月还")
+    private BigDecimal notDuePrice;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+    @ApiModelProperty("分公司")
+    private String useOrgName;
+    @ApiModelProperty("机构全路径四大")
+    private String orgSidPath;
+    @ApiModelProperty("办结日期")
+    private String closeDate;
+    @ApiModelProperty("实例id")
+    private String procInstId;
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+    @ApiModelProperty("环节id")
+    private String taskDefKey;
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+
+}

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

@@ -0,0 +1,14 @@
+package com.yxt.anrui.riskcenter.api.loansettleapply;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/6
+ **/
+@Data
+public class LoanSettleApplyDetailsQuery {
+
+    private String sid;
+}

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

@@ -0,0 +1,12 @@
+package com.yxt.anrui.riskcenter.api.loansettleapply;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/6
+ **/
+@Data
+public class LoanSettleApplyDetailsVo {
+}

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

@@ -0,0 +1,17 @@
+package com.yxt.anrui.riskcenter.api.loansettleapply;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/6
+ **/
+@Data
+public class LoanSettleApplyDto {
+
+
+    private String sid;
+    private String userSid;
+    private String orgPath;
+}

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

@@ -0,0 +1,78 @@
+package com.yxt.anrui.riskcenter.api.loansettleapply;
+
+import com.yxt.anrui.riskcenter.api.loansettleapply.flowable.*;
+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.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/5
+ **/
+@FeignClient(
+        contextId = "anrui-riskcenter-LoanSettleApply",
+        name = "anrui-riskcenter",
+        path = "v1/LoanSettleApply",
+        fallback = LoanSettleApplyFeignFallback.class)
+public interface LoanSettleApplyFeign {
+
+    @ApiOperation("分页列表")
+    @PostMapping("/listPage")
+    ResultBean<PagerVo<LoanSettleApplyVo>> listPage(@RequestBody PagerQuery<LoanSettleApplyQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/saveOrUpdate")
+    ResultBean<String> saveOrUpdate(@RequestBody LoanSettleApplyDto dto);
+
+    @ApiOperation("详情初始化")
+    @PostMapping("/details")
+    ResultBean<LoanSettleApplyDetailsVo> details(@RequestBody LoanSettleApplyDetailsQuery query);
+
+    @ApiOperation("删除/批量删除")
+    @DeleteMapping("/delBySids")
+    ResultBean delBySids(@RequestBody String[] sids);
+
+    @ApiOperation("提交")
+    @PostMapping("/submitApply")
+    public ResultBean submitApply(@Valid @RequestBody SubmitSettleApplyDto dto);
+
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/complete")
+    public ResultBean complete(@Valid @RequestBody CompleteLoanSettleApplyDto query);
+
+    @ApiOperation(value = "获取上一个环节")
+    @GetMapping(value = "/getPreviousNodesForReject")
+    ResultBean<List<LoanSettleApplyNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap LoanSettleApplyNodeQuery query);
+
+    @ApiOperation(value = "获取下一个环节")
+    @GetMapping(value = "/getNextNodesForSubmit")
+    ResultBean<List<LoanSettleApplyNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap LoanSettleApplyNodeQuery query);
+
+    @ApiOperation(value = "驳回任务")
+    @PostMapping(value = "/reject")
+    public ResultBean taskReject(@Valid @RequestBody LoanSettleApplyTaskQuery query);
+
+    @ApiOperation(value = "撤回流程")
+    @PostMapping(value = "/revokeProcess")
+    public ResultBean revokeProcess(@Valid @RequestBody LoanSettleApplyTaskQuery query);
+
+    @ApiOperation(value = "终止任务")
+    @PostMapping(value = "/breakProcess")
+    public ResultBean breakProcess(@Valid @RequestBody LoanSettleApplyTaskQuery query);
+
+    @ApiOperation(value = "加签")
+    @PostMapping(value = "/delegate")
+    public ResultBean delegate(@RequestBody LoanSettleApplyDelegateQuery query);
+
+    @ApiOperation(value = "移动端详情")
+    @PostMapping(value = "/getAppDetails")
+    ResultBean<SettleApplyAppVo> getAppDetails(@RequestParam("sid") String sid);
+}

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

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

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

@@ -0,0 +1,20 @@
+package com.yxt.anrui.riskcenter.api.loansettleapply;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/6
+ **/
+@Data
+public class LoanSettleApplyQuery implements Query {
+    private static final long serialVersionUID = 3208806288091280521L;
+
+    private String menuUrl;
+
+    private String orgPath;
+
+    private String userSid;
+}

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

@@ -0,0 +1,16 @@
+package com.yxt.anrui.riskcenter.api.loansettleapply;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/6
+ **/
+@Data
+public class LoanSettleApplyVo {
+
+    private String createBySid;
+
+    private boolean allowModify;
+}

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

@@ -0,0 +1,12 @@
+package com.yxt.anrui.riskcenter.api.loansettleapply;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/6
+ **/
+@Data
+public class SettleApplyAppVo {
+}

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

@@ -0,0 +1,35 @@
+package com.yxt.anrui.riskcenter.api.loansettleapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/5
+ **/
+@Data
+public class CompleteLoanSettleApplyDto {
+
+    @ApiModelProperty(value = "用户sid")
+    @NotBlank(message = "参数错误：userSid")
+    private String userSid;
+    @ApiModelProperty(value = "用户全路径sid")
+    private String orgSidPath;
+    @ApiModelProperty(value = "节点id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+    @ApiModelProperty(value = "任务id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    @ApiModelProperty(value = "流程id")
+    @NotBlank(message = "参数错误：instanceId")
+    private String instanceId;
+    @ApiModelProperty(value = "意见")
+    private String comment;
+    @ApiModelProperty(value = "业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+}

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

@@ -0,0 +1,26 @@
+package com.yxt.anrui.riskcenter.api.loansettleapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/5
+ **/
+@Data
+public class LoanSettleApplyDelegateQuery {
+    
+    @ApiModelProperty
+    private String userSid;
+    @ApiModelProperty("流程实例id")
+//    @JsonProperty("procInsId")
+    private String instanceId;
+    @ApiModelProperty("任务Id")
+    private String taskId;
+    @ApiModelProperty("审批人sid")
+    private String assignee;
+    @ApiModelProperty("填写意见")
+    private String views;
+
+}

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

@@ -0,0 +1,18 @@
+package com.yxt.anrui.riskcenter.api.loansettleapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/5
+ **/
+@Data
+public class LoanSettleApplyNodeQuery {
+
+    @ApiModelProperty(value = "环节定义id")
+    private String taskDefKey;
+    @ApiModelProperty(value = "业务sid")
+    private String businessSid;
+}

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

@@ -0,0 +1,24 @@
+package com.yxt.anrui.riskcenter.api.loansettleapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/5
+ **/
+@Data
+public class LoanSettleApplyNodeVo {
+
+    @ApiModelProperty(value = "节点名称")
+    private String name;
+    @ApiModelProperty(value = "节点id")
+    private String id;
+    @ApiModelProperty(value = "审批组")
+    private List<String> candidateGroups;
+    @ApiModelProperty(value = "是否是最后环节")
+    private String endTask;
+}

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

@@ -0,0 +1,43 @@
+package com.yxt.anrui.riskcenter.api.loansettleapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/5
+ **/
+@Data
+public class LoanSettleApplyTaskQuery {
+
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("任务Id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    /**
+     * 终止、驳回
+     */
+    @ApiModelProperty("任务意见")
+    private String comment;
+    /**
+     * 终止、撤回、驳回
+     */
+    @ApiModelProperty("用户Sid")
+    private String userSid;
+    /**
+     * 终止
+     */
+    @ApiModelProperty("流程实例Id")
+    private String instanceId;
+}

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

@@ -0,0 +1,20 @@
+package com.yxt.anrui.riskcenter.api.loansettleapply.flowable;
+
+import com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApplyDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/6
+ **/
+@Data
+public class SubmitSettleApplyDto extends LoanSettleApplyDto {
+
+    @ApiModelProperty("流程实例id")
+    private String instanceId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlebankcost/LoanSettleBankCost.java

@@ -0,0 +1,39 @@
+package com.yxt.anrui.riskcenter.api.loansettlebankcost;
+
+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/6
+ **/
+@Data
+public class LoanSettleBankCost extends BaseEntity {
+    private static final long serialVersionUID = 1761408170453018031L;
+
+    private String mainSid;
+    @ApiModelProperty("资方逾期月还")
+    private BigDecimal price;
+    @ApiModelProperty("资方当期未到期月还")
+    private BigDecimal currentNotDuePrice;
+    @ApiModelProperty("资方未到期金额")
+    private BigDecimal notDuePrice;
+    @ApiModelProperty("资方逾期利息")
+    private BigDecimal bankInterest;
+    @ApiModelProperty("资方名义价")
+    private BigDecimal bankNominalPrice;
+    @ApiModelProperty("资方合同违约金")
+    private BigDecimal bankContractLiquidated;
+    @ApiModelProperty("资方其他应收")
+    private BigDecimal bankOtherReceivable;
+    @ApiModelProperty("其他应收说明")
+    private String otherReceivableRemarks;
+    @ApiModelProperty("资方结清金额")
+    private BigDecimal bankSettlePrice;
+    @ApiModelProperty("附件")
+    private String files;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanycost/LoanSettleCompanyCost.java

@@ -0,0 +1,47 @@
+package com.yxt.anrui.riskcenter.api.loansettlecompanycost;
+
+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/6
+ **/
+@Data
+public class LoanSettleCompanyCost extends BaseEntity {
+    private static final long serialVersionUID = 2861377535077166030L;
+
+    private String mainSid;
+    @ApiModelProperty("贷款保证金")
+    private BigDecimal loanDeposit;
+    @ApiModelProperty("公司逾期月还")
+    private BigDecimal overduePrice;
+    @ApiModelProperty("垫资方逾期利息")
+    private BigDecimal putBankInterest;
+    @ApiModelProperty("资金占用费")
+    private BigDecimal funfCost;
+    @ApiModelProperty("资方逾期利息")
+    private BigDecimal bankOverInterest;
+    @ApiModelProperty("公司当期未到期月还")
+    private BigDecimal companyCurrentNotPrice;
+    @ApiModelProperty("资方未到期金额")
+    private BigDecimal bankNotPrice;
+    @ApiModelProperty("贷款保证金扣罚金额")
+    private BigDecimal deductionAmount;
+    @ApiModelProperty("名义价")
+    private BigDecimal companyNominalPrice;
+    @ApiModelProperty("合同违约金")
+    private BigDecimal contractLiquidated;
+    @ApiModelProperty("公司其他费用")
+    private BigDecimal companyOtherPrice;
+    @ApiModelProperty("其他费用说明")
+    private String otherCostRemarks;
+    @ApiModelProperty("公司正常结清合计")
+    private BigDecimal settleAll;
+
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanyreduction/LoanSettleCompanyReduction.java

@@ -0,0 +1,30 @@
+package com.yxt.anrui.riskcenter.api.loansettlecompanyreduction;
+
+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/6
+ **/
+@Data
+public class LoanSettleCompanyReduction extends BaseEntity {
+    private static final long serialVersionUID = -4762360887901381444L;
+
+    private String mainSid;
+    @ApiModelProperty("资金占用费减免")
+    private BigDecimal fundPenalty;
+    @ApiModelProperty("贷款保证金扣罚减免")
+    private BigDecimal depositPenalty;
+    @ApiModelProperty("其他费用减免")
+    private BigDecimal otherCost;
+    @ApiModelProperty("公司减免后结清合计")
+    private BigDecimal amountTo;
+    @ApiModelProperty("结清利润")
+    private BigDecimal profit;
+
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyMapper.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.riskcenter.biz.loanlawsuitapply;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.riskcenter.api.loanlawsuitapply.LoanLawsuitApply;
+import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply;
+import org.apache.ibatis.annotations.Mapper;
+
+
+/**
+ * @description:
+ * @author: fan
+ * @date: 2023/8/21
+ **/
+@Mapper
+public interface LoanLawsuitApplyMapper extends BaseMapper<LoanLawsuitApply> {
+
+
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyMapper.xml

@@ -0,0 +1,5 @@
+<?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.loanlawsuitapply.LoanLawsuitApplyMapper">
+
+</mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyRest.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.riskcenter.biz.loanlawsuitapply;
+
+
+import com.yxt.anrui.riskcenter.api.loanlawsuitapply.LoanLawsuitApplyFeign;
+import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyFeign;
+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: fan
+ * @date: 2023/8/21
+ **/
+@Api(tags = "诉讼案件管理")
+@RestController
+@RequestMapping("v1/LoanLawsuitApply")
+public class LoanLawsuitApplyRest implements LoanLawsuitApplyFeign {
+
+    @Autowired
+    private LoanLawsuitApplyService loanLawsuitApplyService;
+
+
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java

@@ -0,0 +1,29 @@
+package com.yxt.anrui.riskcenter.biz.loanlawsuitapply;
+
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.riskcenter.api.loanlawsuitapply.LoanLawsuitApply;
+import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @description:
+ * @author: fan
+ * @date: 2023/8/21
+ **/
+@Service
+public class LoanLawsuitApplyService extends MybatisBaseService<LoanLawsuitApplyMapper, LoanLawsuitApply> {
+
+    @Autowired
+    private SysUserFeign sysUserFeign;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
+
+
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitveh/LoanLawsuitVehMapper.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.riskcenter.biz.loanlawsuitveh;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.riskcenter.api.loanlawsuitveh.LoanLawsuitVeh;
+import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply;
+import org.apache.ibatis.annotations.Mapper;
+
+
+/**
+ * @description:
+ * @author: fan
+ * @date: 2023/8/21
+ **/
+@Mapper
+public interface LoanLawsuitVehMapper extends BaseMapper<LoanLawsuitVeh> {
+
+
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitveh/LoanLawsuitVehMapper.xml

@@ -0,0 +1,5 @@
+<?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.loanlawsuitveh.LoanLawsuitVehMapper">
+
+</mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitveh/LoanLawsuitVehRest.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.riskcenter.biz.loanlawsuitveh;
+
+
+import com.yxt.anrui.riskcenter.api.loanlawsuitveh.LoanLawsuitVehFeign;
+import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyFeign;
+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: fan
+ * @date: 2023/8/21
+ **/
+@Api(tags = "诉讼案件管理-车辆")
+@RestController
+@RequestMapping("v1/LoanLawsuitVeh")
+public class LoanLawsuitVehRest implements LoanLawsuitVehFeign {
+
+    @Autowired
+    private LoanLawsuitVehService loanLawsuitVehService;
+
+
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitveh/LoanLawsuitVehService.java

@@ -0,0 +1,29 @@
+package com.yxt.anrui.riskcenter.biz.loanlawsuitveh;
+
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.riskcenter.api.loanlawsuitveh.LoanLawsuitVeh;
+import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @description:
+ * @author: fan
+ * @date: 2023/8/21
+ **/
+@Service
+public class LoanLawsuitVehService extends MybatisBaseService<LoanLawsuitVehMapper, LoanLawsuitVeh> {
+
+    @Autowired
+    private SysUserFeign sysUserFeign;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
+
+
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.riskcenter.biz.loanrepurchaseapply;
+
+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.loanparameter.LoanParameter;
+import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo;
+import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply;
+import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+
+/**
+ * @description:
+ * @author: fan
+ * @date: 2023/8/21
+ **/
+@Mapper
+public interface LoanRepurchaseApplyMapper extends BaseMapper<LoanRepurchaseApply> {
+
+
+    IPage<LoanRepurchaseApplyVo> listPage(IPage<LoanRepurchaseApply> page, @Param(Constants.WRAPPER) QueryWrapper<LoanRepurchaseApply> qw);
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.xml

@@ -0,0 +1,31 @@
+<?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.loanrepurchaseapply.LoanRepurchaseApplyMapper">
+
+    <select id="listPage" resultType="com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyVo">
+        SELECT
+        sid,
+        nodeState,
+        useOrgName,
+        createDept,
+        createByName,
+        date_format(applyDate, '%Y-%m-%d' ) AS applyDate,
+        procDefId,
+        procInstId,
+        date_format(closeDate, '%Y-%m-%d' ) AS closeDate,
+        loanContractNo,
+        vinNo,
+        vehMark,
+        bankName,
+        bankContractNo,
+        loanName,
+        customerName,
+        amount,
+        date_format(prepareDate, '%Y-%m-%d' ) AS prepareDate
+        FROM
+        loan_repurchase_apply
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+</mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyRest.java

@@ -0,0 +1,43 @@
+package com.yxt.anrui.riskcenter.biz.loanrepurchaseapply;
+
+
+import com.yxt.anrui.riskcenter.api.loanparameter.*;
+import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyFeign;
+import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyQuery;
+import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyVo;
+import com.yxt.anrui.riskcenter.api.loansubletapply.LoanSubletApplyVo;
+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: fan
+ * @date: 2023/8/21
+ **/
+@Api(tags = "回购申请")
+@RestController
+@RequestMapping("v1/loanrepurchaseapply")
+public class LoanRepurchaseApplyRest implements LoanRepurchaseApplyFeign {
+
+    @Autowired
+    private LoanRepurchaseApplyService loanRepurchaseApplyService;
+
+
+    @Override
+    public ResultBean<PagerVo<LoanRepurchaseApplyVo>> listPage(PagerQuery<LoanRepurchaseApplyQuery> pq) {
+        ResultBean<PagerVo<LoanRepurchaseApplyVo>> rb = ResultBean.fireFail();
+        PagerVo<LoanRepurchaseApplyVo> pv = loanRepurchaseApplyService.listPage(pq);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    public ResultBean<LoanRepurchaseApplyDetailsVo> fetchDetailsBySid(String sid) {
+        return loanRepurchaseApplyService.fetchDetailsBySid(sid);
+    }
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java

@@ -0,0 +1,154 @@
+package com.yxt.anrui.riskcenter.biz.loanrepurchaseapply;
+
+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.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.riskcenter.api.loanparameter.*;
+import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply;
+import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyQuery;
+import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyVo;
+import com.yxt.anrui.riskcenter.api.loansubletapply.LoanSubletApply;
+import com.yxt.anrui.riskcenter.api.loansubletapply.LoanSubletApplyQuery;
+import com.yxt.anrui.riskcenter.api.loansubletapply.LoanSubletApplyVo;
+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;
+
+
+/**
+ * @description:
+ * @author: fan
+ * @date: 2023/8/21
+ **/
+@Service
+public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchaseApplyMapper, LoanRepurchaseApply> {
+
+    @Autowired
+    private SysUserFeign sysUserFeign;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
+
+
+    public PagerVo<LoanRepurchaseApplyVo> listPage(PagerQuery<LoanRepurchaseApplyQuery> pq) {
+        IPage<LoanRepurchaseApply> page = PagerUtil.queryToPage(pq);
+        LoanRepurchaseApplyQuery pagerQuery = pq.getParams();
+        QueryWrapper<LoanRepurchaseApply> qw = new QueryWrapper<>();
+        //=======================
+        PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+        privilegeQuery.setOrgPath(pagerQuery.getOrgPath());
+        privilegeQuery.setMenuSid(pagerQuery.getMenuSid());
+        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("orgSidPath", orgSidPath);
+            } else if ("2".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i2);
+                qw.like("orgSidPath", orgSidPath);
+            } else if ("3".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i3);
+                qw.like("orgSidPath", orgSidPath);
+            } else if ("4".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i4);
+                qw.like("orgSidPath", orgSidPath);
+            } else if ("5".equals(orgLevelKey)) {
+                qw.eq("createBySid", pagerQuery.getUserSid());
+            } else {
+                PagerVo<LoanRepurchaseApplyVo> p = new PagerVo<>();
+                return p;
+            }
+        } else {
+            PagerVo<LoanRepurchaseApplyVo> p = new PagerVo<>();
+            return p;
+        }
+        //=======================
+        //分公司
+        if (StringUtils.isNotBlank(pagerQuery.getUseOrgName())) {
+            qw.like("useOrgName", pagerQuery.getUseOrgName());
+        }
+        //申请人
+        if (StringUtils.isNotBlank(pagerQuery.getCreateByName())) {
+            qw.like("createByName", pagerQuery.getCreateByName());
+        }
+        //申请部门
+        if (StringUtils.isNotBlank(pagerQuery.getCreateDept())) {
+            qw.like("createDept", pagerQuery.getCreateDept());
+        }
+        //消贷合同号
+        if (StringUtils.isNotBlank(pagerQuery.getLoanContractNo())) {
+            qw.like("loanContractNo", pagerQuery.getLoanContractNo());
+        }
+        //资方
+        if (StringUtils.isNotBlank(pagerQuery.getBankName())) {
+            qw.like("bankName", pagerQuery.getBankName());
+        }
+        //资方合同号
+        if (StringUtils.isNotBlank(pagerQuery.getBankContractNo())) {
+            qw.like("bankContractNo", pagerQuery.getBankContractNo());
+        }
+        //客户名称
+        if (StringUtils.isNotBlank(pagerQuery.getCustomerName())) {
+            qw.like("customerName", pagerQuery.getCustomerName());
+        }
+        //贷款人
+        if (StringUtils.isNotBlank(pagerQuery.getLoanName())) {
+            qw.like("loanName", pagerQuery.getLoanName());
+        }
+        //车架号
+        if (StringUtils.isNotBlank(pagerQuery.getVinNo())) {
+            qw.like("vinNo", pagerQuery.getVinNo());
+        }
+        //车牌号
+        if (StringUtils.isNotBlank(pagerQuery.getVehMark())) {
+            qw.like("vehMark", pagerQuery.getVehMark());
+        }
+
+        String applyStartTime = pagerQuery.getApplyStartDate();
+        String applyEndTime = pagerQuery.getApplyEndDate();
+        qw.apply(StringUtils.isNotEmpty(applyStartTime), "date_format (applyDate,'%Y-%m-%d') >= date_format('" + applyStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(applyEndTime), "date_format (applyDate,'%Y-%m-%d') <= date_format('" + applyEndTime + "','%Y-%m-%d')"
+                );
+        String closingStartDate = pagerQuery.getCloseEndDate();
+        String closingEndDate = pagerQuery.getCloseEndDate();
+        qw.apply(StringUtils.isNotEmpty(closingStartDate), "date_format (closeDate,'%Y-%m-%d') >= date_format('" + closingStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(closingEndDate), "date_format (closeDate,'%Y-%m-%d') <= date_format('" + closingEndDate + "','%Y-%m-%d')"
+                );
+        String prepareStartDate = pagerQuery.getPrepareStartDate();
+        String prepareEndDate = pagerQuery.getPrepareEndDate();
+        qw.apply(StringUtils.isNotEmpty(prepareStartDate), "date_format (prepareDate,'%Y-%m-%d') >= date_format('" + prepareStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(prepareEndDate), "date_format (prepareDate,'%Y-%m-%d') <= date_format('" + prepareEndDate + "','%Y-%m-%d')"
+                );
+        qw.eq("isDelete", 0);
+        qw.orderByDesc("applyDate");
+        IPage<LoanRepurchaseApplyVo> pagging = baseMapper.listPage(page, qw);
+        PagerVo<LoanRepurchaseApplyVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public ResultBean<LoanRepurchaseApplyDetailsVo> fetchDetailsBySid(String sid) {
+        return null;
+    }
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchasecompanycost/LoanRepurchaseCompanyCostMapper.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.riskcenter.biz.loanrepurchasecompanycost;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply;
+import com.yxt.anrui.riskcenter.api.loanrepurchasecompanycost.LoanRepurchaseCompanyCost;
+import org.apache.ibatis.annotations.Mapper;
+
+
+/**
+ * @description:
+ * @author: fan
+ * @date: 2023/8/21
+ **/
+@Mapper
+public interface LoanRepurchaseCompanyCostMapper extends BaseMapper<LoanRepurchaseCompanyCost> {
+
+
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchasecompanycost/LoanRepurchaseCompanyCostMapper.xml

@@ -0,0 +1,5 @@
+<?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.loanrepurchasecompanycost.LoanRepurchaseCompanyCostMapper">
+
+</mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchasecompanycost/LoanRepurchaseCompanyCostRest.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.riskcenter.biz.loanrepurchasecompanycost;
+
+
+import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyFeign;
+import com.yxt.anrui.riskcenter.api.loanrepurchasecompanycost.LoanRepurchaseCompanyCostFeign;
+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: fan
+ * @date: 2023/8/21
+ **/
+@Api(tags = "回购-公司结清费用")
+@RestController
+@RequestMapping("v1/LoanRepurchaseCompanyCost")
+public class LoanRepurchaseCompanyCostRest implements LoanRepurchaseCompanyCostFeign {
+
+    @Autowired
+    private LoanRepurchaseCompanyCostService loanRepurchaseCompanyCostService;
+
+
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchasecompanycost/LoanRepurchaseCompanyCostService.java

@@ -0,0 +1,29 @@
+package com.yxt.anrui.riskcenter.biz.loanrepurchasecompanycost;
+
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply;
+import com.yxt.anrui.riskcenter.api.loanrepurchasecompanycost.LoanRepurchaseCompanyCost;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @description:
+ * @author: fan
+ * @date: 2023/8/21
+ **/
+@Service
+public class LoanRepurchaseCompanyCostService extends MybatisBaseService<LoanRepurchaseCompanyCostMapper, LoanRepurchaseCompanyCost> {
+
+    @Autowired
+    private SysUserFeign sysUserFeign;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
+
+
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchasecost/LoanRepurchaseCostMapper.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.riskcenter.biz.loanrepurchasecost;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.riskcenter.api.loanrepurchasecompanycost.LoanRepurchaseCompanyCost;
+import com.yxt.anrui.riskcenter.api.loanrepurchasecost.LoanRepurchaseCost;
+import org.apache.ibatis.annotations.Mapper;
+
+
+/**
+ * @description:
+ * @author: fan
+ * @date: 2023/8/21
+ **/
+@Mapper
+public interface LoanRepurchaseCostMapper extends BaseMapper<LoanRepurchaseCost> {
+
+
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchasecost/LoanRepurchaseCostMapper.xml

@@ -0,0 +1,5 @@
+<?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.loanrepurchasecost.LoanRepurchaseCostMapper">
+
+</mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchasecost/LoanRepurchaseCostRest.java

@@ -0,0 +1,24 @@
+package com.yxt.anrui.riskcenter.biz.loanrepurchasecost;
+
+
+import com.yxt.anrui.riskcenter.api.loanrepurchasecost.LoanRepurchaseCostFeign;
+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: fan
+ * @date: 2023/8/21
+ **/
+@Api(tags = "回购-资方结清费用")
+@RestController
+@RequestMapping("v1/LoanRepurchaseCost")
+public class LoanRepurchaseCostRest implements LoanRepurchaseCostFeign {
+
+    @Autowired
+    private LoanRepurchaseCostService loanRepurchaseCostService;
+
+
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchasecost/LoanRepurchaseCostService.java

@@ -0,0 +1,29 @@
+package com.yxt.anrui.riskcenter.biz.loanrepurchasecost;
+
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.riskcenter.api.loanrepurchasecompanycost.LoanRepurchaseCompanyCost;
+import com.yxt.anrui.riskcenter.api.loanrepurchasecost.LoanRepurchaseCost;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @description:
+ * @author: fan
+ * @date: 2023/8/21
+ **/
+@Service
+public class LoanRepurchaseCostService extends MybatisBaseService<LoanRepurchaseCostMapper, LoanRepurchaseCost> {
+
+    @Autowired
+    private SysUserFeign sysUserFeign;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
+
+
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyMapper.java

@@ -4,6 +4,7 @@ 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.loanreturnvehledger.LoanReturnVehLedger;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApply;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApplyDetailsVo;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApplyVo;
@@ -29,4 +30,6 @@ public interface LoanSecondarySalesApplyMapper extends BaseMapper<LoanSecondaryS
     LoanSecondarySalesApplyDetailsVo selectDetails(String sid);
 
     SecondarySalesAppVo getAppDetails(String sid);
+
+    LoanReturnVehLedger selVehLedgerBySid(String ledgerSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyMapper.xml

@@ -135,4 +135,10 @@
         from loan_secondary_sales_apply la
         where sid = #{sid}
     </select>
+
+    <select id="selVehLedgerBySid" resultType="com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger">
+        select *
+        from loan_return_veh_ledger
+        where sid = #{ledgerSid}
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java

@@ -26,6 +26,8 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.riskcenter.api.loanoutboundapply.LoanOutboundApplyDto;
+import com.yxt.anrui.riskcenter.api.loanoutboundapply.OutboundVinListDto;
 import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
 import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo;
 import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApply;
@@ -43,8 +45,12 @@ import com.yxt.anrui.riskcenter.api.loansecondarysalescost.LoanSecondarySalesCos
 import com.yxt.anrui.riskcenter.api.loansecondarysalescost.LoanSecondarySalesCostVo;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.LoanSecondarySalesVeh;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.LoanSecondarySalesVehVo;
+import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.SalesVehVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail;
+import com.yxt.anrui.riskcenter.api.loansubletapply.LoanSubletApply;
+import com.yxt.anrui.riskcenter.api.loansubletapply.SubletVinList;
+import com.yxt.anrui.riskcenter.biz.loanoutboundapply.LoanOutboundApplyService;
 import com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyService;
 import com.yxt.anrui.riskcenter.biz.loanreturninboundapply.LoanReturnInboundApplyService;
 import com.yxt.anrui.riskcenter.biz.loanreturnvehledger.LoanReturnVehLedgerService;
@@ -121,6 +127,8 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
     private SysNoticeFeign sysNoticeFeign;
     @Autowired
     private LoanSecondarySalesBiddingService loanSecondarySalesBiddingService;
+    @Autowired
+    private LoanOutboundApplyService loanOutboundApplyService;
 
     public PagerVo<LoanSecondarySalesApplyVo> listPageVo(PagerQuery<LoanSecondarySalesApplyQuery> pq) {
         LoanSecondarySalesApplyQuery query = pq.getParams();
@@ -480,6 +488,17 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 loanSecondarySalesApply = fetchBySid(businessSid);
                 loanSecondarySalesApply.setCloseDate(DateUtil.today());
+                List<LoanSecondarySalesVeh> list = loanSecondarySalesVehService.selectByMainSids(businessSid);
+                list.removeAll(Collections.singleton(null));
+                if (!list.isEmpty()) {
+                    for (int i = 0; i < list.size(); i++) {
+                        LoanSecondarySalesVeh loanSecondarySalesVeh = list.get(i);
+                        LoanReturnVehLedger loanReturnVehLedger = loanReturnVehLedgerService.fetchBySid(loanSecondarySalesVeh.getBusSid());
+                        loanReturnVehLedger.setDisposal("二次销售");
+                        loanReturnVehLedger.setDisposalKey("03");
+                        loanReturnVehLedgerService.updateById(loanReturnVehLedger);
+                    }
+                }
 
                 DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
                 String closeDates = "";
@@ -518,11 +537,14 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
                 BigDecimal prices = BigDecimal.ZERO;
                 if (loanSecondarySalesCost.getVehPrice().compareTo(loanSecondarySalesCost.getVehicleEvaluation()) > 0) {
                     prices = loanSecondarySalesCost.getVehPrice();
+                } else {
+                    prices = loanSecondarySalesCost.getVehicleEvaluation();
                 }
                 loanSecondarySalesBiddingDto.setPrice(prices.toString());
                 loanSecondarySalesBiddingDto.setUserSid(loanSecondarySalesApply.getCreateBySid());
                 loanSecondarySalesBiddingDto.setOrgPath(loanSecondarySalesApply.getOrgSidPath());
                 ResultBean resultBean1 = loanSecondarySalesBiddingService.saveBidding(loanSecondarySalesBiddingDto);
+//                pushVehOutBound(loanSecondarySalesApply);
             } else {
                 //极光推送
                 loanSecondarySalesApply = fetchBySid(businessSid);
@@ -545,6 +567,34 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
         }
     }
 
+   /* private void pushVehOutBound(LoanSecondarySalesApply loanSecondarySalesApply) {
+        LoanOutboundApplyDto dto = new LoanOutboundApplyDto();
+        List<OutboundVinListDto> vinList = new ArrayList<>();
+        BeanUtil.copyProperties(loanSecondarySalesApply, dto);
+        dto.setApplySid(loanSecondarySalesApply.getSid());
+        dto.setBorrowerName(loanSecondarySalesApply.getLoanName());
+        dto.setBorrowerSid(loanSecondarySalesApply.getLoanSid());
+        dto.setCustomer(loanSecondarySalesApply.getCustomerName());
+        dto.setDisposalKey("03");
+        dto.setDisposal("二次销售");
+        List<SalesVehVo> vinLists = loanSecondarySalesVehService.selByMainSid(loanSecondarySalesApply.getSid());
+        if (!vinLists.isEmpty()) {
+            vinLists.forEach(v -> {
+                OutboundVinListDto outboundVinListDto = new OutboundVinListDto();
+                BeanUtil.copyProperties(v, outboundVinListDto);
+                LoanReturnVehLedger loanReturnVehLedger = baseMapper.selVehLedgerBySid(v.getLedgerSid());
+                if (null != loanReturnVehLedger) {
+                    if (StringUtils.isNotBlank(loanReturnVehLedger.getLocation())) {
+                        outboundVinListDto.setLocation(loanReturnVehLedger.getLocation());
+                    }
+                }
+                vinList.add(outboundVinListDto);
+            });
+        }
+        dto.setVinList(vinList);
+        loanOutboundApplyService.saveOutbound(dto);
+    }*/
+
     public ResultBean submitApply(SubmitLoanSecondarySalesApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         LoanSecondarySalesApply loanSecondarySalesApply = fetchBySid(dto.getSid());
@@ -861,7 +911,7 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
                         loanSecondarySalesVehVo.setVehMark(loanReturnVehLedgerT.getVehMark());
                         loanSecondarySalesVehVo.setVinNo(loanReturnVehLedgerT.getVinNo());
                         loanSecondarySalesVehVo.setModelName(loanReturnVehLedgerT.getVehModel());
-                        loanSecondarySalesVehVo.setBusSid(s);
+                        loanSecondarySalesVehVo.setBusSid(loanReturnVehLedgerT.getSid());
                         loanSecondarySalesVehVoList.add(loanSecondarySalesVehVo);
                     }
 
@@ -874,7 +924,7 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
                         loanSecondarySalesVehVo.setVehMark(loanReturnVehLedger.getVehMark());
                         loanSecondarySalesVehVo.setVinNo(loanReturnVehLedger.getVinNo());
                         loanSecondarySalesVehVo.setModelName(loanReturnVehLedger.getVehModel());
-                        loanSecondarySalesVehVo.setBusSid(s);
+                        loanSecondarySalesVehVo.setBusSid(loanReturnVehLedger.getSid());
                         loanSecondarySalesVehVoList.add(loanSecondarySalesVehVo);
                         loanSecondarySalesApplyDetailsVo.setCustomerName(loanReturnVehLedger.getCustomer());
                         loanSecondarySalesApplyDetailsVo.setLoanName(loanReturnVehLedger.getBorrowerName());
@@ -980,6 +1030,23 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
                 }
             }
             loanSecondarySalesApplyDetailsVo.setLoanSecondarySalesCost(loanSecondarySalesCost);
+            if (StringUtils.isNotBlank(loanSecondarySalesApply.getValidityDate())) {
+                DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                DateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
+                Date date = new Date();
+                String nowtime = sdf.format(date);//当前时间
+                String endtime = loanSecondarySalesApply.getValidityDate();   //到期时间
+                try {
+                    if (sdf.parse(nowtime).getTime() > sdf1.parse(endtime).getTime()) {//转成long类型比较
+                        loanSecondarySalesApplyDetailsVo.setValidate(false);
+                    } else if (sdf.parse(nowtime).getTime() <= sdf1.parse(endtime).getTime()) {
+                        loanSecondarySalesApplyDetailsVo.setValidate(true);
+                    }
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                }
+            }
+
         }
         return rb.success().setData(loanSecondarySalesApplyDetailsVo);
     }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingService.java

@@ -111,14 +111,16 @@ public class LoanSecondarySalesBiddingService extends MybatisBaseService<LoanSec
         String vinNo = baseMapper.getVinNo(sid);
         salesBiddingVo.setVinNo(vinNo);
         DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        DateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
         Date date = new Date();
         String nowtime = sdf.format(date);//当前时间
         LoanSecondarySalesApply loanSecondarySalesApply = loanSecondarySalesApplyService.fetchBySid(sid);
         String endtime = loanSecondarySalesApply.getValidityDate();   //到期时间
+
         try {
-            if (sdf.parse(nowtime).getTime() > sdf.parse(endtime).getTime()) {//转成long类型比较
+            if (sdf.parse(nowtime).getTime() > sdf1.parse(endtime).getTime()) {//转成long类型比较
                 salesBiddingVo.setValidate(false);
-            } else if (sdf.parse(nowtime).getTime() <= sdf.parse(endtime).getTime()) {
+            } else if (sdf.parse(nowtime).getTime() <= sdf1.parse(endtime).getTime()) {
                 salesBiddingVo.setValidate(true);
             }
         } catch (ParseException e) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesveh/LoanSecondarySalesVehMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesVehAppVo;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.LoanSecondarySalesVeh;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.LoanSecondarySalesVehVo;
+import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.SalesVehVo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -20,4 +21,8 @@ public interface LoanSecondarySalesVehMapper extends BaseMapper<LoanSecondarySal
     List<LoanSecondarySalesVehVo> selectByMainSid(String sid);
 
     List<LoanSecondarySalesVehAppVo> selectByMainSidApp(String sid);
+
+    List<SalesVehVo> selByMainSid(String sid);
+
+    List<LoanSecondarySalesVeh> selectByMainSids(String businessSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesveh/LoanSecondarySalesVehMapper.xml

@@ -18,7 +18,7 @@
                lv.configSid,
                lv.busSid
         from loan_secondary_sales_veh lv
-        where mainSid = #{sid}
+        where lv.mainSid = #{sid}
     </select>
 
     <select id="selectByMainSidApp"
@@ -28,6 +28,23 @@
                lv.vehType,
                lv.modelName
         from loan_secondary_sales_veh lv
-        where mainSid = #{sid}
+        where lv.mainSid = #{sid}
+    </select>
+
+    <select id="selByMainSid" resultType="com.yxt.anrui.riskcenter.api.loansecondarysalesveh.SalesVehVo">
+        select lv.busSid    ledgerSid,
+               lv.vinNo,
+               lv.vehMark,
+               lv.vehType,
+               lv.modelName vehModel,
+               lv.busVinSid
+        from loan_secondary_sales_veh lv
+        where lv.mainSid = #{sid}
+    </select>
+
+    <select id="selectByMainSids" resultType="com.yxt.anrui.riskcenter.api.loansecondarysalesveh.LoanSecondarySalesVeh">
+        select *
+        from loan_secondary_sales_veh
+        where mainSid = #{businessSid}
     </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesveh/LoanSecondarySalesVehService.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesVehAppVo;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.LoanSecondarySalesVeh;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.LoanSecondarySalesVehVo;
+import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.SalesVehVo;
 import com.yxt.common.base.service.MybatisBaseService;
 import org.springframework.stereotype.Service;
 
@@ -40,4 +41,12 @@ public class LoanSecondarySalesVehService extends MybatisBaseService<LoanSeconda
     public List<LoanSecondarySalesVehAppVo> selectByMainSidApp(String sid) {
         return baseMapper.selectByMainSidApp(sid);
     }
+
+    public List<SalesVehVo> selByMainSid(String sid) {
+        return baseMapper.selByMainSid(sid);
+    }
+
+    public List<LoanSecondarySalesVeh> selectByMainSids(String businessSid) {
+        return baseMapper.selectByMainSids(businessSid);
+    }
 }

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

@@ -0,0 +1,26 @@
+package com.yxt.anrui.riskcenter.biz.loansettleapply;
+
+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.loansettleapply.LoanSettleApply;
+import com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApplyVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/5
+ **/
+@Mapper
+public interface LoanSettleApplyMapper extends BaseMapper<LoanSettleApply> {
+    int updateFlowFiled(Map<String, Object> beanToMap);
+
+    IPage<LoanSettleApplyVo> selectPageVo(IPage<LoanSettleApply> page, @Param(Constants.WRAPPER) QueryWrapper<LoanSettleApply> qw);
+
+    int selectBySid(String join);
+}

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

@@ -0,0 +1,31 @@
+<?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.loansettleapply.LoanSettleApplyMapper">
+    <update id="updateFlowFiled">
+        UPDATE loan_settle_apply
+        SET nodeState=#{nodeState}
+        <if test="taskDefKey != null and taskDefKey != ''">
+            , taskDefKey=#{taskDefKey}
+        </if>
+        <if test="procDefId != null and procDefId != ''">
+            , procDefId=#{procDefId}
+        </if>
+        <if test="procInsId != null and procInsId != ''">
+            , procInstId=#{procInsId}
+        </if>
+        <if test="taskId != null and taskId != ''">
+            , taskId=#{taskId}
+        </if>
+        WHERE sid = #{sid}
+    </update>
+
+    <select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApplyVo">
+    </select>
+
+    <select id="selectBySid" resultType="int">
+        select count(*)
+        from loan_settle_apply
+        where length(nodeState) > 0
+          and find_in_set(sid, #{list})
+    </select>
+</mapper>

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

@@ -0,0 +1,100 @@
+package com.yxt.anrui.riskcenter.biz.loansettleapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApplyVo;
+import com.yxt.anrui.riskcenter.api.loansettleapply.*;
+import com.yxt.anrui.riskcenter.api.loansettleapply.flowable.*;
+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;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/5
+ **/
+@RestController
+@RequestMapping("v1/LoanSettleApply")
+@Api(tags = "结清申请")
+public class LoanSettleApplyRest implements LoanSettleApplyFeign {
+
+    @Autowired
+    private LoanSettleApplyService loanSettleApplyService;
+
+    @Override
+    public ResultBean<PagerVo<LoanSettleApplyVo>> listPage(PagerQuery<LoanSettleApplyQuery> pq) {
+        ResultBean<PagerVo<LoanSettleApplyVo>> rb = ResultBean.fireFail();
+        PagerVo<LoanSettleApplyVo> pv = loanSettleApplyService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    public ResultBean<String> saveOrUpdate(LoanSettleApplyDto dto) {
+        return loanSettleApplyService.saveOrUpdateSettleApply(dto);
+    }
+
+    @Override
+    public ResultBean<LoanSettleApplyDetailsVo> details(LoanSettleApplyDetailsQuery query) {
+        return loanSettleApplyService.details(query);
+    }
+
+    @Override
+    public ResultBean delBySids(String[] sids) {
+        return loanSettleApplyService.delAllBySids(sids);
+    }
+
+    @Override
+    public ResultBean submitApply(SubmitSettleApplyDto dto) {
+        return loanSettleApplyService.submitApply(dto);
+    }
+
+    @Override
+    public ResultBean complete(CompleteLoanSettleApplyDto query) {
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        bv.setModelId("");
+        return loanSettleApplyService.complete(bv);
+    }
+
+    @Override
+    public ResultBean<List<LoanSettleApplyNodeVo>> getPreviousNodesForReject(LoanSettleApplyNodeQuery query) {
+        return loanSettleApplyService.getPreviousNodesForReject(query);
+    }
+
+    @Override
+    public ResultBean<List<LoanSettleApplyNodeVo>> getNextNodesForSubmit(LoanSettleApplyNodeQuery query) {
+        return loanSettleApplyService.getNextNodesForSubmit(query);
+    }
+
+    @Override
+    public ResultBean taskReject(LoanSettleApplyTaskQuery query) {
+        return loanSettleApplyService.taskReject(query);
+    }
+
+    @Override
+    public ResultBean revokeProcess(LoanSettleApplyTaskQuery query) {
+        return loanSettleApplyService.revokeProcess(query);
+    }
+
+    @Override
+    public ResultBean breakProcess(LoanSettleApplyTaskQuery query) {
+        return loanSettleApplyService.breakProcess(query);
+    }
+
+    @Override
+    public ResultBean delegate(LoanSettleApplyDelegateQuery query) {
+        return loanSettleApplyService.delegate(query);
+    }
+
+    @Override
+    public ResultBean<SettleApplyAppVo> getAppDetails(String sid) {
+        return loanSettleApplyService.getAppDetails(sid);
+    }
+}

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

@@ -0,0 +1,480 @@
+package com.yxt.anrui.riskcenter.biz.loansettleapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.yxt.anrui.flowable.api.flow.FlowableFeign;
+import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
+import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery;
+import com.yxt.anrui.flowable.api.flow2.FlowFeign;
+import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
+import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
+import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
+import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger;
+import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApply;
+import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApplyQuery;
+import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApplyVo;
+import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.LoanSecondarySalesVehVo;
+import com.yxt.anrui.riskcenter.api.loansettleapply.*;
+import com.yxt.anrui.riskcenter.api.loansettleapply.flowable.*;
+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 com.yxt.messagecenter.api.message.MessageFeign;
+import com.yxt.messagecenter.api.message.MessageFlowVo;
+import com.yxt.messagecenter.api.message.MessageFlowableQuery;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.tomcat.util.threads.ThreadPoolExecutor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.stream.Collectors;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/5
+ **/
+@Service
+public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMapper, LoanSettleApply> {
+
+    @Autowired
+    private FlowFeign flowFeign;
+    @Autowired
+    private MessageFeign messageFeign;
+    @Autowired
+    private FlowTaskFeign flowTaskFeign;
+    @Autowired
+    private FlowableFeign flowableFeign;
+    @Autowired
+    private SysUserFeign sysUserFeign;
+
+
+    public PagerVo<LoanSettleApplyVo> listPageVo(PagerQuery<LoanSettleApplyQuery> pq) {
+        LoanSettleApplyQuery query = pq.getParams();
+        QueryWrapper<LoanSettleApply> qw = new QueryWrapper<>();
+        if (query != null) {
+            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("la.orgSidPath", orgSidPath);
+                    } else if ("2".equals(orgLevelKey)) {
+                        orgSidPath = orgSidPath.substring(0, i2);
+                        qw.like("la.orgSidPath", orgSidPath);
+                    } else if ("3".equals(orgLevelKey)) {
+                        orgSidPath = orgSidPath.substring(0, i3);
+                        qw.like("la.orgSidPath", orgSidPath);
+                    } else if ("4".equals(orgLevelKey)) {
+                        orgSidPath = orgSidPath.substring(0, i4);
+                        qw.like("la.orgSidPath", orgSidPath);
+                    } else if ("5".equals(orgLevelKey)) {
+                        qw.eq("la.createBySid", query.getUserSid());
+                    } else {
+                        PagerVo<LoanSettleApplyVo> p = new PagerVo<>();
+                        return p;
+                    }
+                } else {
+                    PagerVo<LoanSettleApplyVo> p = new PagerVo<>();
+                    return p;
+                }
+            }
+        }
+        IPage<LoanSettleApply> page = PagerUtil.queryToPage(pq);
+        IPage<LoanSettleApplyVo> pagging = baseMapper.selectPageVo(page, qw);
+        List<LoanSettleApplyVo> paggingRecords = pagging.getRecords();
+        paggingRecords.removeAll(Collections.singleton(null));
+        if (!paggingRecords.isEmpty()) {
+            for (LoanSettleApplyVo record : pagging.getRecords()) {
+                if (query.getUserSid().equals(record.getCreateBySid())) {
+                    record.setAllowModify(true);
+                } else {
+                    record.setAllowModify(false);
+                }
+            }
+        }
+        PagerVo<LoanSettleApplyVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public ResultBean<String> saveOrUpdateSettleApply(LoanSettleApplyDto dto) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        String sid = dto.getSid();
+        if (StringUtils.isBlank(sid)) {//新增
+
+        } else {//修改
+
+        }
+        return rb.success().setData(sid);
+    }
+
+    public ResultBean<LoanSettleApplyDetailsVo> details(LoanSettleApplyDetailsQuery query) {
+        ResultBean<LoanSettleApplyDetailsVo> rb = ResultBean.fireFail();
+        String sid = query.getSid();
+        if (StringUtils.isBlank(sid)) {//新增初始化
+
+        } else {//编辑初始化
+            LoanSettleApply loanSettleApply = fetchBySid(sid);
+            if (loanSettleApply == null) {
+                return rb.setMsg("该申请不存在");
+            }
+
+        }
+
+        return null;
+    }
+
+    public ResultBean delAllBySids(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        //查询该sid中是否有流程不是待提交的
+        int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
+        if (count > 0) {
+            return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败");
+        }
+        List<String> sidss = Arrays.asList(sids);
+        for (int i = 0; i < sidss.size(); i++) {//删除相关表
+
+        }
+        delBySids(sids);
+        return rb.success().setMsg("删除成功");
+    }
+
+    public ResultBean submitApply(SubmitSettleApplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanSettleApply loanSettleApply = fetchBySid(dto.getSid());
+        int r = submitBusinessData(dto, loanSettleApply);
+        if (r == 3) {
+            return rb.setMsg("该申请不存在");
+        }
+        if (r == 0) {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
+        ResultBean<String> resultBean = saveOrUpdateSettleApply(dto);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        String businessSid = resultBean.getData();
+        loanSettleApply = fetchBySid(businessSid);
+        //创建BusinessVariables实体对象
+        BusinessVariables bv = new BusinessVariables();
+        //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
+        Map<String, Object> variables = new HashMap<>();
+        Map<String, Object> appMap = new HashMap<>();
+        appMap.put("sid", businessSid);
+        variables.put("app", appMap);
+        //用户的部门全路径sid
+        bv.setOrgSidPath(loanSettleApply.getOrgSidPath());
+        bv.setBusinessSid(businessSid);
+        bv.setUserSid(dto.getUserSid());
+        bv.setFormVariables(variables);
+        if (r == 1) {
+            //ToDo:流程定义id
+            bv.setModelId(ProcDefEnum.LOANSETTLEAPPLY.getProDefId());
+            ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
+            if (!voResultBean.getSuccess()) {
+                return rb.setMsg(voResultBean.getMsg());
+            }
+            UpdateFlowFieldVo ufVo = voResultBean.getData();
+            updateFlowFiled(BeanUtil.beanToMap(ufVo));
+            loanSettleApply = fetchBySid(businessSid);
+            //==================================添加线程
+            try {
+                ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                        .setNameFormat("demo-pool-%d").build();
+                ExecutorService pool = new ThreadPoolExecutor(2, 100,
+                        0L, TimeUnit.MILLISECONDS,
+                        new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                LoanSettleApply finalLoanSettleApply = loanSettleApply;
+                Future future1 = pool.submit(() -> {
+                    //极光推送
+                    MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                    MessageFlowVo messageFlowVo = new MessageFlowVo();
+                    BeanUtil.copyProperties(ufVo, messageFlowVo);
+                    messageFlowableQuery.setUfVo(messageFlowVo);
+                    messageFlowableQuery.setAppMap(appMap);
+                    messageFlowableQuery.setBusinessSid(businessSid);
+                    messageFlowableQuery.setModuleName("结清申请");
+                    messageFlowableQuery.setMsgContent(finalLoanSettleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                    messageFlowableQuery.setMsgTitle("结清申请");
+                    ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+                });
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            //==================================添加线程
+            return voResultBean;
+        }
+        if (r == 2) {
+            // ToDo:驳回到发起人后再次提交
+            if (StringUtils.isBlank(dto.getInstanceId())) {
+                return rb.setMsg("参数错误：instanceId");
+            }
+            bv.setTaskId(loanSettleApply.getTaskId());
+            bv.setTaskDefKey(loanSettleApply.getTaskDefKey());
+            bv.setComment("重新提交");
+            bv.setInstanceId(dto.getInstanceId());
+            return complete(bv);
+        }
+        return rb;
+    }
+
+    private int submitBusinessData(SubmitSettleApplyDto dto, LoanSettleApply loanSettleApply) {
+        int r = 0;
+        if (StringUtils.isBlank(dto.getSid())) {
+            r = 1;
+        } else {
+            if (loanSettleApply != null) {
+                String businessTaskId = loanSettleApply.getTaskId();
+                if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) {
+                    //新提交
+                    r = 1;
+                } else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) {
+                    //二次提交//只有数据一致的时候才能进行下一步
+                    r = 2;
+                }
+            } else {
+                r = 3;
+            }
+        }
+        return r;
+    }
+
+    public ResultBean complete(BusinessVariables bv) {
+        ResultBean rb = ResultBean.fireFail();
+        String businessSid = bv.getBusinessSid();
+        LoanSettleApply loanSettleApply = fetchBySid(businessSid);
+        Map<String, Object> variables = new HashMap<>();
+        Map<String, Object> appMap = new HashMap<>();
+        appMap.put("sid", businessSid);
+        variables.put("app", appMap);
+        bv.setFormVariables(variables);
+        bv.setOrgSidPath(loanSettleApply.getOrgSidPath());
+        bv.setModelId(loanSettleApply.getProcDefId());
+        if (bv.getTaskId().equals(loanSettleApply.getTaskId())) {
+            ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
+            if (!resultBean.getSuccess()) {
+                return rb.setMsg(resultBean.getMsg());
+            }
+            UpdateFlowFieldVo ufVo = resultBean.getData();
+            updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+            if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+                loanSettleApply = fetchBySid(businessSid);
+                loanSettleApply.setCloseDate(DateUtil.today());
+                baseMapper.updateById(loanSettleApply);
+            } else {
+                //极光推送
+                loanSettleApply = fetchBySid(businessSid);
+                MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                MessageFlowVo messageFlowVo = new MessageFlowVo();
+                BeanUtil.copyProperties(ufVo, messageFlowVo);
+                messageFlowVo.setProcDefId(loanSettleApply.getProcDefId());
+                messageFlowVo.setProcInsId(loanSettleApply.getProcInstId());
+                messageFlowableQuery.setUfVo(messageFlowVo);
+                messageFlowableQuery.setAppMap(appMap);
+                messageFlowableQuery.setBusinessSid(businessSid);
+                messageFlowableQuery.setModuleName("结清申请");
+                messageFlowableQuery.setMsgContent(loanSettleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                messageFlowableQuery.setMsgTitle("结清申请");
+                ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+            }
+            return rb.success().setData(resultBean.getData());
+        } else {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
+    }
+
+    private int updateFlowFiled(Map<String, Object> beanToMap) {
+        return baseMapper.updateFlowFiled(beanToMap);
+    }
+
+    public ResultBean<List<LoanSettleApplyNodeVo>> getPreviousNodesForReject(LoanSettleApplyNodeQuery query) {
+        ResultBean<List<LoanSettleApplyNodeVo>> rb = ResultBean.fireFail();
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        LoanSettleApply loanSettleApply = fetchBySid(query.getBusinessSid());
+        bv.setModelId(loanSettleApply.getProcDefId());
+        ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
+        //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo
+        List<LoanSettleApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), LoanSettleApplyNodeVo.class)).collect(Collectors.toList());
+        return rb.success().setData(voList);
+    }
+
+    public ResultBean<List<LoanSettleApplyNodeVo>> getNextNodesForSubmit(LoanSettleApplyNodeQuery query) {
+        ResultBean<List<LoanSettleApplyNodeVo>> rb = ResultBean.fireFail();
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        LoanSettleApply loanSettleApply = fetchBySid(query.getBusinessSid());
+        bv.setModelId(loanSettleApply.getProcDefId());
+        ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
+        //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo
+        List<LoanSettleApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), LoanSettleApplyNodeVo.class)).collect(Collectors.toList());
+        return rb.success().setData(voList);
+    }
+
+    public ResultBean taskReject(LoanSettleApplyTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        String businessSid = query.getBusinessSid();
+        LoanSettleApply loanSettleApply = fetchBySid(businessSid);
+        if (loanSettleApply == null) {
+            return rb.setMsg("该申请不存在");
+        }
+        String businessTaskId = loanSettleApply.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (businessTaskId.equals(query.getTaskId())) {
+                if (StringUtils.isBlank(query.getComment())) {
+                    return rb.setMsg("请填写意见");
+                }
+                if (StringUtils.isBlank(query.getUserSid())) {
+                    return rb.setMsg("参数错误：userSid");
+                }
+                FlowTaskVo flowTaskVo = new FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                Map<String, Object> variables = new HashMap<>();
+                Map<String, Object> appMap = new HashMap<>();
+                appMap.put("sid", businessSid);
+                variables.put("app", appMap);
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                UpdateFlowFieldVo ufVo = resultBean.getData();
+                Map<String, Object> map = BeanUtil.beanToMap(ufVo);
+                //更新业务中的流程相关的参数
+                updateFlowFiled(map);
+                //极光推送
+                loanSettleApply = fetchBySid(businessSid);
+                MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                MessageFlowVo messageFlowVo = new MessageFlowVo();
+                BeanUtil.copyProperties(ufVo, messageFlowVo);
+                String procId = loanSettleApply.getProcInstId();
+                messageFlowVo.setProcInsId(procId);
+                messageFlowVo.setProcDefId(loanSettleApply.getProcDefId());
+                messageFlowableQuery.setUfVo(messageFlowVo);
+                messageFlowableQuery.setAppMap(appMap);
+                messageFlowableQuery.setBusinessSid(businessSid);
+                messageFlowableQuery.setModuleName("结清申请");
+                ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
+                String nextName = listResultBean.getData().get(0).getName_();
+                String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+                if ("发起申请".equals(nextName)) {
+                    messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
+                } else {
+                    messageFlowableQuery.setMsgContent(loanSettleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                }
+
+                messageFlowableQuery.setMsgTitle("结清申请");
+                ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+                return rb.success();
+            }
+        }
+        return rb.setMsg("操作失败!提交的数据不一致!");
+    }
+
+    public ResultBean revokeProcess(LoanSettleApplyTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(query.getUserSid())) {
+            return rb.setMsg("参数错误：userSid");
+        }
+        LoanSettleApply loanSettleApply = fetchBySid(query.getBusinessSid());
+        String businessTaskId = loanSettleApply.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (businessTaskId.equals(query.getTaskId())) {
+                FlowTaskVo flowTaskVo = new FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+                return rb.success().setData(resultBean.getData());
+            }
+        }
+        return rb.setMsg("操作失败，提交的数据不一致!");
+    }
+
+    public ResultBean breakProcess(LoanSettleApplyTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(query.getInstanceId())) {
+            return rb.setMsg("参数错误：instanceId");
+        }
+        if (StringUtils.isBlank(query.getUserSid())) {
+            return rb.setMsg("参数错误：userSid");
+        }
+        if (StringUtils.isBlank(query.getComment())) {
+            return rb.setMsg("请填写意见");
+        }
+        LoanSettleApply loanSettleApply = fetchBySid(query.getBusinessSid());
+        String businessTaskId = loanSettleApply.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (query.getUserSid().equals(loanSettleApply.getCreateBySid())) {
+                FlowTaskVo flowTaskVo = new FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
+                updateFlowFiled(map);
+                return rb.success().setData(resultBean.getData());
+            } else {
+                if (businessTaskId.equals(query.getTaskId())) {
+                    FlowTaskVo flowTaskVo = new FlowTaskVo();
+                    BeanUtil.copyProperties(query, flowTaskVo);
+                    ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+                    if (!resultBean.getSuccess()) {
+                        return rb.setMsg(resultBean.getMsg());
+                    }
+                    Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
+                    updateFlowFiled(map);
+                    return rb.success().setData(resultBean.getData());
+                }
+            }
+        }
+        return rb.setMsg("操作失败!提交的数据不一致!");
+    }
+
+    public ResultBean delegate(LoanSettleApplyDelegateQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        FlowDelegateQuery delegateQuery = new FlowDelegateQuery();
+        BeanUtil.copyProperties(query, delegateQuery);
+        flowFeign.delegate(delegateQuery);
+        return rb.success();
+    }
+
+    public ResultBean<SettleApplyAppVo> getAppDetails(String sid) {
+        ResultBean<SettleApplyAppVo> rb = ResultBean.fireFail();
+        LoanSettleApply loanSettleApply = fetchBySid(sid);
+        if (loanSettleApply == null) {
+            return rb.setMsg("该申请不存在");
+        }
+        return null;
+    }
+
+
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlebankcost/LoanSettleBankCostMapper.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.riskcenter.biz.loansettlebankcost;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.riskcenter.api.loansettlebankcost.LoanSettleBankCost;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/6
+ **/
+@Mapper
+public interface LoanSettleBankCostMapper extends BaseMapper<LoanSettleBankCost> {
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlebankcost/LoanSettleBankCostMapper.xml

@@ -0,0 +1,4 @@
+<?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.loansettlebankcost.LoanSettleBankCostMapper">
+</mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlebankcost/LoanSettleBankCostService.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.riskcenter.biz.loansettlebankcost;
+
+import com.yxt.anrui.riskcenter.api.loansettlebankcost.LoanSettleBankCost;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/6
+ **/
+@Service
+public class LoanSettleBankCostService extends MybatisBaseService<LoanSettleBankCostMapper, LoanSettleBankCost> {
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanycost/LoanSettleCompanyCostMapper.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.riskcenter.biz.loansettlecompanycost;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.riskcenter.api.loansettlecompanycost.LoanSettleCompanyCost;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/6
+ **/
+@Mapper
+public interface LoanSettleCompanyCostMapper extends BaseMapper<LoanSettleCompanyCost> {
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanycost/LoanSettleCompanyCostMapper.xml

@@ -0,0 +1,4 @@
+<?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.loansettlecompanycost.LoanSettleCompanyCostMapper">
+</mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanycost/LoanSettleCompanyCostService.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.riskcenter.biz.loansettlecompanycost;
+
+import com.yxt.anrui.riskcenter.api.loansettlecompanycost.LoanSettleCompanyCost;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/6
+ **/
+@Service
+public class LoanSettleCompanyCostService extends MybatisBaseService<LoanSettleCompanyCostMapper, LoanSettleCompanyCost> {
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanyreduction/LoanSettleCompanyReductionMapper.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.riskcenter.biz.loansettlecompanyreduction;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.riskcenter.api.loansettlecompanyreduction.LoanSettleCompanyReduction;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/6
+ **/
+@Mapper
+public interface LoanSettleCompanyReductionMapper extends BaseMapper<LoanSettleCompanyReduction> {
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanyreduction/LoanSettleCompanyReductionMapper.xml

@@ -0,0 +1,4 @@
+<?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.loansettlecompanyreduction.LoanSettleCompanyReductionMapper">
+</mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanyreduction/LoanSettleCompanyReductionService.java

@@ -0,0 +1,15 @@
+package com.yxt.anrui.riskcenter.biz.loansettlecompanyreduction;
+
+import com.yxt.anrui.riskcenter.api.loansettlecompanyreduction.LoanSettleCompanyReduction;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.core.domain.BaseEntity;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/2/6
+ **/
+@Service
+public class LoanSettleCompanyReductionService extends MybatisBaseService<LoanSettleCompanyReductionMapper, LoanSettleCompanyReduction> {
+}

anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js

@@ -529,13 +529,13 @@ const codemenu = [
       {
         path: '/specialrebate/specialrebatecheck',
         component: () => import('@/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue'),
-        name: 'specialrebatetobechecked',
+        name: 'SpecialRebateToBeChecked',
         meta: { title: '专项返利核对', noCache: true }
       },
       {
         path: '/specialrebate/specialrebatedistribution',
         component: () => import('@/views/specialrebate/specialrebatedistribution/specialrebatetobeallocated.vue'),
-        name: 'specialrebatetobeallocated',
+        name: 'SpecialRebateToBeAllocated',
         meta: { title: '专项返利分配', noCache: true }
       }
     ]
@@ -551,25 +551,25 @@ const codemenu = [
       {
         path: '/huikuanguanli/collectionrebatemanagement',
         component: () => import('@/views/manufacturerrebates/huikuanguanli/collectionrebatemanagement.vue'),
-        name: 'huikuanfanliguanli',
+        name: 'HuiKuanFanLiGuanLi',
         meta: { title: '厂家回款返利管理', noCache: true }
       },
       {
         path: '/huikuanyuti/collectionrebatewithholding',
         component: () => import('@/views/manufacturerrebates/huikuanyuti/collectionrebatewithholding.vue'),
-        name: 'huikuanfanliyutigaunli',
+        name: 'HuiKuanFanLiYuYiGuanLi',
         meta: { title: '厂家回款返利预提', noCache: true }
       },
       {
         path: '/huikuanhedui/collectionrebatetobechecked',
         component: () => import('@/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue'),
-        name: 'huikuanfanlidaihedui',
+        name: 'HuiKuanFanLiDaiHeDui',
         meta: { title: '厂家回款返利核对', noCache: true }
       },
       {
         path: '/huikuanfenpei/collectionrebateallot',
         component: () => import('@/views/manufacturerrebates/huikuanfenpei/collectionrebateallot.vue'),
-        name: 'huikuanfanlidaifenpei',
+        name: 'HuiKuanFanliFenPei',
         meta: { title: '厂家回款返利分配', noCache: true }
       }
     ]
@@ -1118,42 +1118,42 @@ const codemenu = [
     path: '/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiDaiBanInfo',
     component: () =>
       import('@/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiDaiBanInfo.vue'),
-    name: 'zhuanxiangfanliyutiDaiBanInfo'
+    name: 'ZhuanXiangFanLiYuTiDaiBanInfo'
   },
   // 专项返利预提详情
   {
     path: '/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiYiBanInfo',
     component: () =>
       import('@/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiYiBanInfo.vue'),
-    name: 'zhuanxiangfanliyutiYiBanInfo'
+    name: 'ZhuanXiangFanLiYuTiYiBanInfo'
   },
   // 专项返利预提办理
   {
     path: '/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiEdit',
     component: () =>
       import('@/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiEdit.vue'),
-    name: 'zhuanxiangfanliyutiEdit'
+    name: 'ZhuanXiangFanLiYuTiEdit'
   },
   // 专项返利核对申请详情页面
   {
     path: '/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo',
     component: () =>
       import('@/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue'),
-    name: 'zhuanxiangfanliheduiDaiBanInfo'
+    name: 'ZhuanXiangFanLiHeDuiDaiBanInfo'
   },
   // 专项返利核对详情
   {
     path: '/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo',
     component: () =>
       import('@/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo.vue'),
-    name: 'zhuanxiangfanliheduiYiBanInfo'
+    name: 'ZhuanXiangFanLiHeDuiYiBanInfo'
   },
   // 专项返利核对办理
   {
     path: '/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit',
     component: () =>
       import('@/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue'),
-    name: 'zhuanxiangfanliheduiEdit'
+    name: 'ZhuanXiangFanLiHeDuiEdit'
   },
 
   // 专项返利分配申请详情页面
@@ -1161,21 +1161,21 @@ const codemenu = [
     path: '/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiDaiBanInfo',
     component: () =>
       import('@/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiDaiBanInfo.vue'),
-    name: 'zhuanxiangfanlifenpeiDaiBanInfo'
+    name: 'ZhuanXiangFanLiFenPeiDaiBanInfo'
   },
   // 专项返利分配详情
   {
     path: '/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiYiBanInfo',
     component: () =>
       import('@/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiYiBanInfo.vue'),
-    name: 'zhuanxiangfanlifenpeiYiBanInfo'
+    name: 'ZhuanXiangFanLiFenPeiYiBanInfo'
   },
   // 专项返利分配办理
   {
     path: '/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiEdit',
     component: () =>
       import('@/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiEdit.vue'),
-    name: 'zhuanxiangfanlifenpeiEdit'
+    name: 'ZhuanXiangFanLiFenPeiEdit'
   },
 
   // 回款返利预提申请待办详情页面
@@ -1183,21 +1183,21 @@ const codemenu = [
     path: '/huikuanfanliyutiFlow/huikuanfanliyutiDanBanInfo',
     component: () =>
       import('@/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiDanBanInfo.vue'),
-    name: 'huikuanfanliyutiDanBanInfo'
+    name: 'HuiKuanFanLiYuTiDanBanInfo'
   },
   // 回款返利预提已办详情
   {
     path: '/huikuanfanliyutiFlow/huikuanfanliyutiYiBanInfo',
     component: () =>
       import('@/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiYiBanInfo.vue'),
-    name: 'huikuanfanliyutiYiBanInfo'
+    name: 'HuiKuanFanLiYuTiYiBanInfo'
   },
   // 回款返利预提办理
   {
     path: '/huikuanfanliyutiFlow/huikuanfanliyutiEdit',
     component: () =>
       import('@/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiEdit.vue'),
-    name: 'huikuanfanliyutiEdit'
+    name: 'HuiKuanFanLiYuTiEdit'
   },
 
   // 回款返利核对申请待办详情页面
@@ -1205,21 +1205,21 @@ const codemenu = [
     path: '/huikuanfanliheduiFlow/huikuanfanliheduiDanBanInfo',
     component: () =>
       import('@/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiDanBanInfo.vue'),
-    name: 'huikuanfanliheduiDanBanInfo'
+    name: 'HuiKuanFanLiHeDuiDanBanInfo'
   },
   // 回款返利核对已办详情
   {
     path: '/huikuanfanliheduiYiBanInfo/huikuanfanliheduiYiBanInfo',
     component: () =>
       import('@/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiYiBanInfo.vue'),
-    name: 'huikuanfanliheduiYiBanInfo'
+    name: 'HuiKuanFanLiHeDuiYiBanInfo'
   },
   // 回款返利核对办理
   {
     path: '/huikuanfanliheduiYiBanInfo/huikuanfanliheduiEdit',
     component: () =>
       import('@/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiEdit.vue'),
-    name: 'huikuanfanliheduiEdit'
+    name: 'HuiKuanFanLiHeDuiEdit'
   },
 
   // 挂车出库申请待办详情页面

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallot.vue

@@ -29,7 +29,7 @@
           </div>
         </div>
         <div class="listtop">
-          <div class="tit">回款返利预提申请列表</div>
+          <div class="tit">回款返利分配申请列表</div>
           <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
         </div>
         <div class="">
@@ -115,7 +115,7 @@ import collectionrebateallotByVehicleAdd from './collectionrebateallotByVehicleA
 import collectionrebateallotInfo from './collectionrebateallotInfo'
 
 export default {
-  name: 'huikuanfanlifenpei',
+  name: 'HuiKuanFanLiFenPei',
   components: {
     Pagination,
     pageye,
@@ -150,7 +150,10 @@ export default {
           createOrgSid: '',
           createStartTime: '',
           createEndTime: '',
-          withholdingApply: ''
+          withholdingApply: '',
+          orgPath: '',
+          userSid: '',
+          menuUrl: ''
         },
         current: 1,
         size: 5,
@@ -208,6 +211,9 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.listQuery.params.menuUrl = this.$route.path
       req.listPage(this.listQuery).then((response) => {
         console.log('列表查询结果：', response)
         this.listLoading = false
@@ -232,7 +238,10 @@ export default {
           createOrgSid: '',
           createStartTime: '',
           createEndTime: '',
-          withholdingApply: ''
+          withholdingApply: '',
+          orgPath: '',
+          userSid: '',
+          menuUrl: ''
         },
         current: 1,
         size: 5,

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallotAdd.vue

@@ -116,7 +116,7 @@
 import req from '@/api/manufacturerrebates/collectionrebateallot'
 
 export default {
-  name: 'collectionrebateallotAdd',
+  name: 'HuiKuanFanLiFenPeiAdd',
   data() {
     return {
       viewTitle: '',
@@ -141,6 +141,7 @@ export default {
         createOrgName: '',
         createOrgSid: '',
         withholdingApply: '',
+        orgPath: '',
         scmCollectionRebateDistributionVehs: []
       },
       rules: {},
@@ -237,6 +238,7 @@ export default {
         useOrgSid: '',
         createOrgName: '',
         createOrgSid: '',
+        orgPath: '',
         scmCollectionRebateDistributionVehs: []
       }
       this.submitdisabled = false

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallotByVehicleAdd.vue

@@ -104,7 +104,7 @@ import collectionrebateallotSelectVehicle from './relation/collectionrebateallot
 import collectionrebateallotAdd from './collectionrebateallotAdd'
 
 export default {
-  name: 'collectionrebateallotByVehicleAdd',
+  name: 'HuiKuanFanLiFenPeiByVehicleAdd',
   components: {
     collectionrebateallotSelectVehicle,
     collectionrebateallotAdd

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallotInfo.vue

@@ -110,7 +110,7 @@
 import req from '@/api/manufacturerrebates/collectionrebateallot'
 
 export default {
-  name: 'collectionrebateallotInfo',
+  name: 'HuiKuanFanLiFenPeiInfo',
   data() {
     return {
       viewTitle: '',

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagement.vue

@@ -137,7 +137,7 @@ import collectionrebatemanagementAdd from './collectionrebatemanagementAdd'
 import collectionrebatemanagementInfo from './collectionrebatemanagementInfo'
 
 export default {
-  name: 'huikuanfanliguanli',
+  name: 'HuiKuanFanLiGuanLi',
   components: {
     Pagination,
     pageye,
@@ -176,6 +176,9 @@ export default {
           collectionStartDate: '',
           collectionEndDate: '',
           state: '',
+          orgPath: '',
+          userSid: '',
+          menuUrl: '',
           sidList: []
         },
         current: 1,
@@ -242,6 +245,9 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.listQuery.params.menuUrl = this.$route.path
       req.listPage(this.listQuery).then((response) => {
         console.log('列表查询结果：', response)
         this.listLoading = false
@@ -269,6 +275,9 @@ export default {
           collectionStartDate: '',
           collectionEndDate: '',
           state: '',
+          orgPath: '',
+          userSid: '',
+          menuUrl: '',
           sidList: []
         },
         current: 1,

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagementAdd.vue

@@ -118,7 +118,7 @@ import req from '@/api/manufacturerrebates/collectionrebatemanagement'
 import { fetchBySid } from '@/api/cheliang/dictcommons'
 
 export default {
-  name: 'huikuanfanliguanliAdd',
+  name: 'HuiKuanFanLiGuanLiAdd',
   data() {
     return {
       viewTitle: '',
@@ -151,6 +151,7 @@ export default {
         createOrgName: '',
         createOrgSid: '',
         withholdingDate: '',
+        orgPath: '',
         scmCollectionRebateVehs: []
       },
       rules: {},
@@ -283,6 +284,7 @@ export default {
         createOrgName: '',
         createOrgSid: '',
         withholdingDate: '',
+        orgPath: '',
         scmCollectionRebateVehs: []
       }
       this.submitdisabled = false

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagementInfo.vue

@@ -98,7 +98,7 @@
 import req from '@/api/manufacturerrebates/collectionrebatemanagement'
 
 export default {
-  name: 'huikuanfanliguanliInfo',
+  name: 'HuiKuanFanLiGuanLiInfo',
   data() {
     return {
       viewTitle: '',

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatechecked.vue

@@ -121,10 +121,10 @@ import ButtonBar from '@/components/ButtonBar'
 import { brandDown, getOrgSidByPath } from '@/api/cheliang/dictcommons'
 import collectionrebatecheckedAdd from './collectionrebatecheckedAdd'
 import collectionrebatecheckedInfo from './collectionrebatecheckedInfo'
-import {getStorage} from '@/utils/auth'
+import { getStorage } from '@/utils/auth'
 
 export default {
-  name: 'huikuanfanlihedui',
+  name: 'HuiKuanFanLiHeDui',
   components: {
     Pagination,
     pageye,
@@ -170,7 +170,10 @@ export default {
           checkApply: '',
           createOrgSid: '',
           createEndTime: '',
-          createStartTime: ''
+          createStartTime: '',
+          orgPath: '',
+          userSid: '',
+          menuUrl: ''
         },
         current: 1,
         size: 5,
@@ -270,6 +273,9 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.listQuery.params.menuUrl = this.$route.path
       req.pagelist(this.listQuery).then((response) => {
         console.log('列表查询结果：', response)
         this.listLoading = false
@@ -294,7 +300,10 @@ export default {
           checkApply: '',
           createOrgSid: '',
           createEndTime: '',
-          createStartTime: ''
+          createStartTime: '',
+          orgPath: '',
+          userSid: '',
+          menuUrl: ''
         },
         current: 1,
         size: 5,

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedAdd.vue

@@ -126,7 +126,7 @@ import yiheduihiukuanfanli from './relation/yiheduihiukuanfanli'
 import heduishenpiAdd from './relation/heduishenpiAdd'
 
 export default {
-  name: 'collectionrebatecheckAdd',
+  name: 'HuiKuanFanLiHeDuiAdd',
   components: {
     yiheduihiukuanfanli,
     heduishenpiAdd
@@ -155,6 +155,7 @@ export default {
         remarks: '',
         instanceId: '', // 流程实例ID
         taskId: '', // 任务ID
+        orgPath: '',
         scmWhenCollectionrebateCheckapplydetailDetails: [],
         scmLastCollectionrebateCheckapplydetailDetails: []
       },
@@ -194,6 +195,7 @@ export default {
       this.formobj.useOrgSid = createOrgSid
       this.formobj.createByName = window.sessionStorage.getItem('name')
       this.formobj.createBySid = window.sessionStorage.getItem('userSid')
+      this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
       this.viewTitle = '【新增】回款返利核对审核申请'
     },
     showEdit(row) {
@@ -428,6 +430,7 @@ export default {
         remarks: '',
         instanceId: '', // 流程实例ID
         taskId: '', // 任务ID
+        orgPath: '',
         scmWhenCollectionrebateCheckapplydetailDetails: [],
         scmLastCollectionrebateCheckapplydetailDetails: []
       }

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedInfo.vue

@@ -114,7 +114,7 @@ import req from '@/api/manufacturerrebates/collectionrebatecheck'
 import heduishenpiInfo from './relation/heduishenpiInfo'
 
 export default {
-  name: 'collectionrebatecheckInfo',
+  name: 'HuiKuanFanLiHeDuiInfo',
   components: {
     heduishenpiInfo
   },

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue

@@ -149,7 +149,7 @@ import collectionrebatetobecheckedInfo from './collectionrebatetobecheckedInfo'
 import { getOrgSidByPath, typeValues } from '@/api/cheliang/dictcommons'
 
 export default {
-  name: 'huikuanfanlidaihedui',
+  name: 'HuiKuanFanLiDaiHeDui',
   components: {
     Pagination,
     ButtonBar,
@@ -205,6 +205,9 @@ export default {
           collectionTypeKey: '',
           createOrgSid: '',
           state: '',
+          orgPath: '',
+          userSid: '',
+          menuUrl: '',
           sidList: []
         },
         current: 1,
@@ -282,6 +285,9 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.listQuery.params.menuUrl = this.$route.path
       req.listPage(this.listQuery).then((response) => {
         console.log('列表查询结果：', response)
         this.listLoading = false
@@ -310,6 +316,9 @@ export default {
           collectionTypeKey: '',
           createOrgSid: '',
           state: '',
+          orgPath: '',
+          userSid: '',
+          menuUrl: '',
           sidList: []
         },
         current: 1,

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue

@@ -129,7 +129,7 @@
 import req from '@/api/manufacturerrebates/collectionrebatemanagement'
 
 export default {
-  name: 'huikuanfanlidaiheduiAdd',
+  name: 'HuiKuanFanLiDaiHeDuiAdd',
   data() {
     return {
       viewTitle: '',

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedInfo.vue

@@ -118,7 +118,7 @@
 import req from '@/api/manufacturerrebates/collectionrebatemanagement'
 
 export default {
-  name: 'huikuanfanlidaiheduiInfo',
+  name: 'HuiKuanFanLiDaiHeDuiInfo',
   data() {
     return {
       viewTitle: '',

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/relation/heduishenpiAdd.vue

@@ -90,7 +90,7 @@
 import req from '@/api/manufacturerrebates/collectionrebatecheck'
 
 export default {
-  name: 'heduishenpiAdd',
+  name: 'HeDuiShenPiAdd',
   data() {
     return {
       viewTitle: '',