Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java

@@ -72,6 +72,12 @@ public interface FinPaymentrecordFeign {
     @ResponseBody
     public ResultBean save(@RequestBody FinPaymentrecordDto dto);
 
+    @ApiOperation("新增")
+    @PostMapping("/saveReturnSid")
+    @ResponseBody
+    public ResultBean<String> saveReturnSid(@RequestBody FinPaymentrecordDto dto);
+
+
     @ApiOperation("修改")
     @PostMapping("/update")
     @ResponseBody

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java

@@ -66,6 +66,11 @@ public class FinPaymentrecordFeignFallback implements FinPaymentrecordFeign {
         return ResultBean.fireFail().setMsg("接口anrui-fin/finpaymentrecord/save无法访问");
     }
 
+    @Override
+    public ResultBean<String> saveReturnSid(FinPaymentrecordDto dto) {
+        return null;
+    }
+
     @Override
     public ResultBean update(FinPaymentrecordUpdateDto dto) {
         return null;

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java

@@ -77,6 +77,11 @@ public class FinPaymentrecordRest implements FinPaymentrecordFeign {
         return finPaymentrecordService.saveDto(dto);
     }
 
+    @Override
+    public ResultBean<String> saveReturnSid(FinPaymentrecordDto dto) {
+        return finPaymentrecordService.saveReturnSid(dto);
+    }
+
     @Override
     public ResultBean update(FinPaymentrecordUpdateDto dto) {
         return finPaymentrecordService.updateAll(dto);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -330,6 +330,14 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         return rb.success();
     }
 
+    public ResultBean<String> saveReturnSid(FinPaymentrecordDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        FinPaymentrecord finPaymentrecord = new FinPaymentrecord();
+        BeanUtil.copyProperties(dto, finPaymentrecord, "sid");
+        baseMapper.insert(finPaymentrecord);
+        return rb.success().setData(finPaymentrecord.getSid());
+    }
+
     public ResultBean updateAll(FinPaymentrecordUpdateDto dto) {
         ResultBean rb = ResultBean.fireFail();
         List<String> sids = dto.getSids();
@@ -390,7 +398,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 }
             }
             FinPaymentrecord finPaymentrecordOne = null;
-            if (new BigDecimal(dto.getCost()).compareTo(finPaymentrecord.getAccountsReceive())<0) {//实收金额小于应收金额
+            if (new BigDecimal(dto.getCost()).compareTo(finPaymentrecord.getAccountsReceive()) < 0) {//实收金额小于应收金额
                 finPaymentrecordOne = new FinPaymentrecord();
                 BeanUtil.copyProperties(finPaymentrecord, finPaymentrecordOne, "sid");
                 finPaymentrecordOne.setAccountsReceive(finPaymentrecord.getAccountsReceive().subtract(new BigDecimal(dto.getCost())));
@@ -566,7 +574,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         }
         List<ApPayBill.FPAYBILLENTRY> FPAYBILLENTRYs = new ArrayList<>();
         if (finPaymentrecord.getCost() != null
-                && finPaymentrecord.getCost().compareTo(BigDecimal.ZERO)>0) {
+                && finPaymentrecord.getCost().compareTo(BigDecimal.ZERO) > 0) {
             ApPayBill.FPAYBILLENTRY fpaybillentry = new ApPayBill.FPAYBILLENTRY();
             //应付金额
             fpaybillentry.setFPAYTOTALAMOUNTFOR(finPaymentrecord.getCost().doubleValue());
@@ -1072,4 +1080,6 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         }
         return rb.success();
     }
+
+
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistoryQuery.java

@@ -56,4 +56,5 @@ public class LoanRepaymentHistoryQuery implements Query {
     private String menuUrl;
     @ApiModelProperty("用户sid")
     private String userSid;
+    private String change; //需调整按钮查询 0/1 “1”时生效
 }

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

@@ -0,0 +1,96 @@
+package com.yxt.anrui.riskcenter.api.loansecondarysalesapply;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/23
+ **/
+@Data
+public class LoanSecondarySalesApply extends BaseEntity {
+    private static final long serialVersionUID = -5059711246737148960L;
+
+    @ApiModelProperty("申请部门")
+    private String createDept;
+    @ApiModelProperty("申请部门sid")
+    private String createDeptSid;
+    @ApiModelProperty("申请人")
+    private String createByName;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("贷款人sid")
+    private String loanSid;
+    @ApiModelProperty("贷款人")
+    private String loanName;
+    @ApiModelProperty("贷款合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("资方")
+    private String bankName;
+    @ApiModelProperty("资方合同编号")
+    private String bankContractNo;
+    @ApiModelProperty("停放地点")
+    private String locationName;
+    @ApiModelProperty("停放地点sid")
+    private String locationSid;
+    @ApiModelProperty("是否年检")
+    private String inspect;
+    @ApiModelProperty("年检情况")
+    private String inspectSituation;
+    @ApiModelProperty("是否已出保")
+    private String guaranteed;
+    @ApiModelProperty("保险情况")
+    private String insuranceSituation;
+    @ApiModelProperty("首次登记日期")
+    private String firstDate;
+    @ApiModelProperty("当前行驶公里数")
+    private String kilometerDriven;
+    @ApiModelProperty("其他车况说明")
+    private String illustrate;
+    @ApiModelProperty("车辆照片")
+    private String files;
+    @ApiModelProperty("已还金额")
+    private BigDecimal alRepaidMoney;
+    @ApiModelProperty("当前逾期金额")
+    private BigDecimal currentBeMoney;
+    @ApiModelProperty("其中资金占用费")
+    private BigDecimal wheFundOccMoney;
+    @ApiModelProperty("未到期金额")
+    private BigDecimal unexpiredMoney;
+    @ApiModelProperty("总期数")
+    private String nper;
+    @ApiModelProperty("当前期数")
+    private String currentPeriod;
+    @ApiModelProperty("已还金额换算期数")
+    private String alRepaidMoneyConPeriod;
+    @ApiModelProperty("逾期金额换算期数")
+    private String beOverdueMoneyAndPeriod;
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+    @ApiModelProperty("实例iD")
+    private String procInstId;
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+    @ApiModelProperty("任务iD")
+    private String taskId;
+    @ApiModelProperty("环节id")
+    private String taskDefKey;
+    @ApiModelProperty("办结日期")
+    private String closeDate;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+    @ApiModelProperty("机构全路径sid")
+    private String orgSidPath;
+    @ApiModelProperty("销售订单sid")
+    private String salesOrderSid;
+
+
+}

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

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

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

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

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

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

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

@@ -0,0 +1,84 @@
+package com.yxt.anrui.riskcenter.api.loansecondarysalesapply;
+
+import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApplyDto;
+import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApplyFeignFallback;
+import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApplyQuery;
+import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApplyVo;
+import com.yxt.anrui.riskcenter.api.loanreturninboundapply.flowable.*;
+import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.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.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/23
+ **/
+@FeignClient(
+        contextId = "anrui-riskcenter-LoanSecondarySalesApply",
+        name = "anrui-riskcenter",
+        path = "v1/LoanSecondarySalesApply",
+        fallback = LoanSecondarySalesApplyFeignFallback.class)
+public interface LoanSecondarySalesApplyFeign {
+
+    @ApiOperation("分页列表")
+    @PostMapping("/listPage")
+    ResultBean<PagerVo<LoanSecondarySalesApplyVo>> listPage(@RequestBody PagerQuery<LoanSecondarySalesApplyQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/saveOrUpdate")
+    ResultBean<String> saveOrUpdate(@RequestBody LoanSecondarySalesApplyDto dto);
+
+    @ApiOperation("详情初始化")
+    @PostMapping("/details")
+    ResultBean<LoanSecondarySalesApplyDetailsVo> details(LoanSecondarySalesApplyDetailsQuery query);
+
+    @ApiOperation("删除/批量删除")
+    @DeleteMapping("/delBySids")
+    ResultBean delBySids(@RequestBody String[] sids);
+
+    @ApiOperation("提交")
+    @PostMapping("/submitApply")
+    public ResultBean submitApply(@Valid @RequestBody SubmitLoanSecondarySalesApplyDto dto);
+
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/complete")
+    public ResultBean complete(@Valid @RequestBody CompleteLoanSecondarySalesApplyDto query);
+
+    @ApiOperation(value = "获取上一个环节")
+    @GetMapping(value = "/getPreviousNodesForReject")
+    ResultBean<List<LoanSecondarySalesApplyNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap LoanSecondarySalesApplyNodeQuery query);
+
+    @ApiOperation(value = "获取下一个环节")
+    @GetMapping(value = "/getNextNodesForSubmit")
+    ResultBean<List<LoanSecondarySalesApplyNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap LoanSecondarySalesApplyNodeQuery query);
+
+    @ApiOperation(value = "驳回任务")
+    @PostMapping(value = "/reject")
+    public ResultBean taskReject(@Valid @RequestBody LoanSecondarySalesApplyTaskQuery query);
+
+    @ApiOperation(value = "撤回流程")
+    @PostMapping(value = "/revokeProcess")
+    public ResultBean revokeProcess(@Valid @RequestBody LoanSecondarySalesApplyTaskQuery query);
+
+    @ApiOperation(value = "终止任务")
+    @PostMapping(value = "/breakProcess")
+    public ResultBean breakProcess(@Valid @RequestBody LoanSecondarySalesApplyTaskQuery query);
+
+    @ApiOperation(value = "加签")
+    @PostMapping(value = "/delegate")
+    public ResultBean delegate(@RequestBody LoanSecondarySalesApplyDelegateQuery query);
+
+
+}

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

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

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

@@ -0,0 +1,14 @@
+package com.yxt.anrui.riskcenter.api.loansecondarysalesapply;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/23
+ **/
+@Data
+public class LoanSecondarySalesApplyQuery implements Query {
+    private static final long serialVersionUID = -8173091575102397453L;
+}

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

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

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

@@ -0,0 +1,12 @@
+package com.yxt.anrui.riskcenter.api.loansecondarysalesapply.flowable;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/23
+ **/
+@Data
+public class CompleteLoanSecondarySalesApplyDto {
+}

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

@@ -0,0 +1,12 @@
+package com.yxt.anrui.riskcenter.api.loansecondarysalesapply.flowable;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/23
+ **/
+@Data
+public class LoanSecondarySalesApplyDelegateQuery {
+}

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

@@ -0,0 +1,12 @@
+package com.yxt.anrui.riskcenter.api.loansecondarysalesapply.flowable;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/23
+ **/
+@Data
+public class LoanSecondarySalesApplyNodeQuery {
+}

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

@@ -0,0 +1,12 @@
+package com.yxt.anrui.riskcenter.api.loansecondarysalesapply.flowable;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/23
+ **/
+@Data
+public class LoanSecondarySalesApplyNodeVo {
+}

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

@@ -0,0 +1,12 @@
+package com.yxt.anrui.riskcenter.api.loansecondarysalesapply.flowable;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/23
+ **/
+@Data
+public class LoanSecondarySalesApplyTaskQuery {
+}

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

@@ -0,0 +1,11 @@
+package com.yxt.anrui.riskcenter.api.loansecondarysalesapply.flowable;
+
+import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApplyDto;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/23
+ **/
+public class SubmitLoanSecondarySalesApplyDto extends LoanSecondarySalesApplyDto {
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalescost/LoanSecondarySalesCost.java

@@ -0,0 +1,66 @@
+package com.yxt.anrui.riskcenter.api.loansecondarysalescost;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/23
+ **/
+
+@Data
+public class LoanSecondarySalesCost extends BaseEntity {
+    private static final long serialVersionUID = -6585421519539995802L;
+
+    private String mainSid;
+    @ApiModelProperty("欠款合计")
+    private BigDecimal arrearsAll;
+    @ApiModelProperty("贷款保证金")
+    private BigDecimal loanDeposit;
+    @ApiModelProperty("车辆售价")
+    private BigDecimal vehPrice;
+    @ApiModelProperty("催收费用")
+    private BigDecimal collectionCost;
+    @ApiModelProperty("资方结清费用")
+    private BigDecimal bankSettleCost;
+    @ApiModelProperty("资方结清费用承担方")
+    private String bankSettleCostAssume;
+    @ApiModelProperty("车辆违章费用")
+    private BigDecimal vehicleViolationCost;
+    @ApiModelProperty("车辆违章费用承担方")
+    private String vehicleViolationCostAssume;
+    @ApiModelProperty("年检费")
+    private BigDecimal inspectYearCost;
+    @ApiModelProperty("年检费承担方")
+    private String inspectYearCostAssume;
+    @ApiModelProperty("保险费")
+    private BigDecimal insureCost;
+    @ApiModelProperty("保险费承担方")
+    private String insureCostAssume;
+    @ApiModelProperty("过户费")
+    private BigDecimal ownershipCost;
+    @ApiModelProperty("过户费承担方")
+    private String ownershipCostAssume;
+    @ApiModelProperty("停车费")
+    private BigDecimal stopCost;
+    @ApiModelProperty("停车费承担方")
+    private String stopCostAssume;
+    @ApiModelProperty("其他费用")
+    private BigDecimal otherCost;
+    @ApiModelProperty("其他费用承担方")
+    private String otherCostAssume;
+    @ApiModelProperty("费用说明")
+    private String costDescription;
+    @ApiModelProperty("预计亏损金额")
+    private BigDecimal lossPrice;
+    @ApiModelProperty("后续欠款处置方向")
+    private String debtDisposal;
+    @ApiModelProperty("附件")
+    private String files;
+
+
+}

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

@@ -0,0 +1,32 @@
+package com.yxt.anrui.riskcenter.api.loansecondarysalesveh;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/23
+ **/
+@Data
+public class LoanSecondarySalesVeh extends BaseEntity {
+    private static final long serialVersionUID = -6185503408818867800L;
+
+
+    private String mainSid;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("车辆类型")
+    private String vehType;
+    @ApiModelProperty("车型")
+    private String modelName;
+
+    private String busVinSid;
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+    @ApiModelProperty("配置sid")
+    private String configSid;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentrecord/LoanTransferPaymentRecord.java

@@ -39,4 +39,7 @@ public class LoanTransferPaymentRecord extends BaseEntity {
     private String accountNumber;
     @ApiModelProperty("资方合同号")
     private String bankContractNo;
+    @ApiModelProperty("出纳代付款列表sid")
+    private String paySid;
+
 }

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

@@ -72,4 +72,6 @@ public interface LoanBeCollectionApplyMapper extends BaseMapper<LoanBeCollection
 
     @Update("update loan_be_collection_veh set lockCarState = #{lockCarState} where mainSid = #{applySid} and saleVehSid = #{saleVehSid}")
     void saveLockCarState(@Param("applySid") String applySid, @Param("saleVehSid") String saleVehSid, @Param("lockCarState") String lockCarState);
+
+    int selectBySid(String join);
 }

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

@@ -40,4 +40,11 @@
         </if>
         WHERE sid=#{sid}
     </update>
+
+    <select id="selectBySid" resultType="int">
+        SELECT COUNT(*)
+        FROM loan_be_collection_apply
+        WHERE nodeState != '待提交'
+		  and find_in_set(sid, #{list})
+    </select>
 </mapper>

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

@@ -89,9 +89,7 @@ public class LoanBeCollectionApplyRest implements LoanBeCollectionApplyFeign {
 	@ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		loanBeCollectionApplyService.delBySids(sids);
-		return rb.success();
+		return loanBeCollectionApplyService.delAllBySids(sids);
 	}
 
 	@Override

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

@@ -825,4 +825,18 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
     public void saveLockCarState(String applySid, String saleVehSid, String lockCarState) {
         baseMapper.saveLockCarState(applySid, saleVehSid, lockCarState);
     }
+
+    public ResultBean delAllBySids(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        //查询该sid中是否有流程不是待提交的
+        int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
+        if (count > 0) {
+            return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败");
+        }
+        delBySids(sids);
+        for (String sid : sids) {
+            loanBeCollectionVehService.delByMainSid(sid);
+        }
+        return rb.success();
+    }
 }

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

@@ -77,4 +77,7 @@ public interface LoanBeCollectionVehMapper extends BaseMapper<LoanBeCollectionVe
 
 	@Select("select sid from loan_be_collection_veh where saleVehSid = #{saleVehSid} and lockCarState = #{c}")
 	String selSidBySaleVehSidAndLockState(@Param("saleVehSid") String saleVehSid,@Param("c") String c);
+
+	@Update("update loan_be_collection_veh set lockCarState = #{s} where saleVehSid = #{saleVehSid} and lockCarState = #{x}")
+    void updateLockState(@Param("saleVehSid") String saleVehSid,@Param("s") String s,@Param("x") String x);
 }

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

@@ -266,4 +266,8 @@ public class LoanBeCollectionVehService extends MybatisBaseService<LoanBeCollect
     public String selSidBySaleVehSidAndLockState(String saleVehSid, String c) {
         return baseMapper.selSidBySaleVehSidAndLockState(saleVehSid,c);
     }
+
+    public void updateLockState(String saleVehSid, String s,String x) {
+        baseMapper.updateLockState(saleVehSid,s,x);
+    }
 }

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

@@ -119,9 +119,7 @@ public class LoanBePadsincereApplyRest implements LoanBePadsincereApplyFeign {
 	@ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		loanBePadsincereApplyService.delAll(sids);
-		return rb.success();
+		return loanBePadsincereApplyService.delAllBySids(sids);
 	}
 
 	@Override

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

@@ -1040,4 +1040,17 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
     }
 
 
+    public ResultBean delAllBySids(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        //查询该sid中是否有流程不是待提交的
+        int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
+        if (count > 0) {
+            return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败");
+        }
+        delBySids(sids);
+        for (String sid : sids) {
+            loanBePadsincereVehService.delByMainSid(sid);
+        }
+        return rb.success();
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyMapper.java

@@ -12,6 +12,7 @@ import com.yxt.anrui.riskcenter.api.loansubletapply.VehDisposal;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 
@@ -24,7 +25,7 @@ public interface LoanRedemptionApplyMapper extends BaseMapper<LoanRedemptionAppl
 
     RedemptionInitVo redemptionInit(@Param("ledgerSid") String ledgerSid);
 
-    RedemptionVinList selTrailerByLedgerSid(@Param("ledgerSid") String ledgerSid);
+    List<RedemptionVinList> selTrailerByLedgerSid(@Param("ledgerSid") String ledgerSid);
 
     int updateFlowFiled(Map<String, Object> map);
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyMapper.xml

@@ -97,6 +97,8 @@
                sid as ledgerSid
         FROM loan_return_veh_ledger as t
         WHERE t.pSid = #{ledgerSid}
+          and t.disposal = '未处置'
+          and t.stockState = '库存'
     </select>
     <select id="selTrailerByMainLedgerSid" resultType="java.lang.String">
         SELECT sid

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java

@@ -323,9 +323,11 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
             mainVeh.setLedgerSid(ledgerSid);
             vinList.add(mainVeh);
             if (StringUtils.isNotBlank(redemptionInitVo.getLedgerSid())) {
-                RedemptionVinList trailerVeh = baseMapper.selTrailerByLedgerSid(redemptionInitVo.getLedgerSid());
-                if (null != trailerVeh) {
-                    vinList.add(trailerVeh);
+                List<RedemptionVinList> trailerVeh = baseMapper.selTrailerByLedgerSid(redemptionInitVo.getLedgerSid());
+                if (!trailerVeh.isEmpty()) {
+                    trailerVeh.stream().forEach(t -> {
+                        vinList.add(t);
+                    });
                 }
             }
             vo.setVinList(vinList);

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

@@ -38,7 +38,7 @@
     </select>
     <select id="monthListPage"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistoryVo">
-        SELECT
+        SELECT m.* FROM (SELECT
         h.sid,
         p.loanContractNo,
         p.vinNo,
@@ -50,19 +50,77 @@
         p.dueDate,
         p.dueMoney,
         h.actualDate,
-        date_format(h.dataTime, '%Y-%m-%d') as dataTime,
+        date_format( h.dataTime, '%Y-%m-%d' ) AS dataTime,
         h.actualMoney,
         h.buckle,
         h.returnWay,
+        h.returnWayKey,
+        h.buckleKey,
         h.planDetailSid,
-        CASE h.updateState
-        WHEN '0' THEN '未更新'
-        WHEN '1' THEN '已更新'
+        t.outstandingMoney,
+        t.repaidMoney,
+        p.orgSidPath,
+        p.salesUserSid,
+        CASE
+        h.updateState
+        WHEN '0' THEN
+        '未更新'
+        WHEN '1' THEN
+        '已更新'
         END AS updateState,
-        date_format(h.updateTime, '%Y-%m-%d') as updateTime
+        date_format( h.updateTime, '%Y-%m-%d' ) AS updateTime
         FROM
         loan_repayment_history AS h
         LEFT JOIN loan_repayment_plan_details AS p ON h.planDetailSid = p.sid
+        LEFT JOIN (
+        SELECT
+        p.sid,
+        IFNULL((SELECT
+        SUM(
+        IFNULL( h.actualMoney, 0 ))
+        FROM
+        loan_repayment_history AS h
+        WHERE
+        h.planDetailSid = p.sid
+        AND h.updateState = '1'),0) as repaidMoney
+        ,
+        IFNULL(
+        (p.dueMoney - IFNULL((SELECT
+        SUM(IFNULL( h.actualMoney, 0 ))
+        FROM
+        loan_repayment_history AS h
+        WHERE
+        h.planDetailSid = p.sid
+        AND h.updateState = '1'
+        ),0)),0) AS outstandingMoney
+        FROM
+        loan_repayment_plan_details AS p
+        ) AS t ON p.sid = t.sid) as m
+--         SELECT
+--         h.sid,
+--         p.loanContractNo,
+--         p.vinNo,
+--         p.bankContractNo,
+--         p.bankName,
+--         p.customer,
+--         p.period,
+--         p.borrowerName,
+--         p.dueDate,
+--         p.dueMoney,
+--         h.actualDate,
+--         date_format(h.dataTime, '%Y-%m-%d') as dataTime,
+--         h.actualMoney,
+--         h.buckle,
+--         h.returnWay,
+--         h.planDetailSid,
+--         CASE h.updateState
+--         WHEN '0' THEN '未更新'
+--         WHEN '1' THEN '已更新'
+--         END AS updateState,
+--         date_format(h.updateTime, '%Y-%m-%d') as updateTime
+--         FROM
+--         loan_repayment_history AS h
+--         LEFT JOIN loan_repayment_plan_details AS p ON h.planDetailSid = p.sid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -100,7 +158,7 @@
         select *
         from loan_repayment_history
         where planDetailSid = #{planSid}
-          and returnWayKey != '02'
+--           and returnWayKey != '02'
         and updateState = '1'
     </select>
     <select id="selUpdateStateList" resultType="java.lang.String">

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

@@ -468,18 +468,18 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
             String orgLevelKey = defaultIdReltBean.getData();
             if ("1".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i1);
-                qw.like("p.orgSidPath", orgSidPath);
+                qw.like("m.orgSidPath", orgSidPath);
             } else if ("2".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i2);
-                qw.like("p.orgSidPath", orgSidPath);
+                qw.like("m.orgSidPath", orgSidPath);
             } else if ("3".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i3);
-                qw.like("p.orgSidPath", orgSidPath);
+                qw.like("m.orgSidPath", orgSidPath);
             } else if ("4".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i4);
-                qw.like("p.orgSidPath", orgSidPath);
+                qw.like("m.orgSidPath", orgSidPath);
             } else if ("5".equals(orgLevelKey)) {
-                qw.eq("p.salesUserSid", pagerQuery.getUserSid());
+                qw.eq("m.salesUserSid", pagerQuery.getUserSid());
             } else {
                 PagerVo<LoanRepaymentHistoryVo> p = new PagerVo<>();
                 return p;
@@ -490,132 +490,79 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         }
         //=======================
         if (StringUtils.isNotBlank(pagerQuery.getLoanContractNo())) {
-            qw.like("p.loanContractNo", pagerQuery.getLoanContractNo());
+            qw.like("m.loanContractNo", pagerQuery.getLoanContractNo());
         }
         if (StringUtils.isNotBlank(pagerQuery.getVinNo())) {
-            qw.like("p.vinNo", pagerQuery.getVinNo());
+            qw.like("m.vinNo", pagerQuery.getVinNo());
         }
         if (StringUtils.isNotBlank(pagerQuery.getBankName())) {
-            qw.like("p.bankName", pagerQuery.getBankName());
+            qw.like("m.bankName", pagerQuery.getBankName());
         }
         if (StringUtils.isNotBlank(pagerQuery.getBankContractNo())) {
-            qw.like("p.bankContractNo", pagerQuery.getBankContractNo());
+            qw.like("m.bankContractNo", pagerQuery.getBankContractNo());
         }
         if (StringUtils.isNotBlank(pagerQuery.getCustomer())) {
-            qw.like("p.customer", pagerQuery.getCustomer());
+            qw.like("m.customer", pagerQuery.getCustomer());
         }
         if (StringUtils.isNotBlank(pagerQuery.getBorrowerName())) {
-            qw.like("p.borrowerName", pagerQuery.getBorrowerName());
+            qw.like("m.borrowerName", pagerQuery.getBorrowerName());
         }
         if (StringUtils.isNotBlank(pagerQuery.getPeriod())) {
-            qw.like("p.period", pagerQuery.getPeriod());
+            qw.like("m.period", pagerQuery.getPeriod());
         }
         if (StringUtils.isNotBlank(pagerQuery.getReturnWayKey())) {
-            qw.eq("h.returnWayKey", pagerQuery.getReturnWayKey());
+            qw.eq("m.returnWayKey", pagerQuery.getReturnWayKey());
         }
         if (StringUtils.isNotBlank(pagerQuery.getBuckleKey())) {
-            qw.eq("h.buckleKey", pagerQuery.getBuckleKey());
+            qw.eq("m.buckleKey", pagerQuery.getBuckleKey());
         } else {
-            qw.ne("h.buckleKey", "002");
-            qw.ne("h.buckleKey", "003");
+            qw.ne("m.buckleKey", "002");
+            qw.ne("m.buckleKey", "003");
         }
-        qw.ne("h.returnWayKey", "02");
+        qw.ne("m.returnWayKey", "02");
         String dueStartDate = pagerQuery.getDueStartDate();
         String dueEndDate = pagerQuery.getDueEndDate();
-        qw.apply(StringUtils.isNotEmpty(dueStartDate), "date_format (p.dueDate,'%Y-%m-%d') >= date_format('" + dueStartDate + "','%Y-%m-%d')").
-                apply(StringUtils.isNotEmpty(dueEndDate), "date_format (p.dueDate,'%Y-%m-%d') <= date_format('" + dueEndDate + "','%Y-%m-%d')"
+        qw.apply(StringUtils.isNotEmpty(dueStartDate), "date_format (m.dueDate,'%Y-%m-%d') >= date_format('" + dueStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(dueEndDate), "date_format (m.dueDate,'%Y-%m-%d') <= date_format('" + dueEndDate + "','%Y-%m-%d')"
                 );
-//        List<String> monthHeadAndLast = getMonthHeadAndLast(new Date());
-//        String head = monthHeadAndLast.get(0);
-//        String last = monthHeadAndLast.get(1);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         String actualStartDate = pagerQuery.getActualStartDate();
         String actualEndDate = pagerQuery.getActualEndDate();
-        qw.apply(StringUtils.isNotEmpty(actualStartDate), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + actualStartDate + "','%Y-%m-%d')").
-                apply(StringUtils.isNotEmpty(actualEndDate), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + actualEndDate + "','%Y-%m-%d')"
+        qw.apply(StringUtils.isNotEmpty(actualStartDate), "date_format (m.actualDate,'%Y-%m-%d') >= date_format('" + actualStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(actualEndDate), "date_format (m.actualDate,'%Y-%m-%d') <= date_format('" + actualEndDate + "','%Y-%m-%d')"
                 );
-//        try {
-//            Date headT = sdf.parse(head);
-//            Date lastT = sdf.parse(last);
-//            Date ast = null;
-//            Date aed = null;
-//            if (StringUtils.isNotBlank(actualStartDate)) {
-//                ast = sdf.parse(actualStartDate);
-//            }
-//            if (StringUtils.isNotBlank(actualEndDate)) {
-//                aed = sdf.parse(actualEndDate);
-//            }
-//
-//            if (StringUtils.isBlank(actualStartDate) && StringUtils.isNotBlank(actualEndDate)) {
-//                if (aed.before(lastT)) {
-//                    qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')").
-//                            apply(StringUtils.isNotEmpty(actualEndDate), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + actualEndDate + "','%Y-%m-%d')"
-//                            );
-//                } else {
-//                    qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')").
-//                            apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')"
-//                            );
-//                }
-//            } else if (StringUtils.isBlank(actualEndDate) && StringUtils.isNotBlank(actualStartDate)) {
-//                if (headT.before(ast)) {
-//                    qw.apply(StringUtils.isNotEmpty(actualStartDate), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + actualStartDate + "','%Y-%m-%d')").
-//                            apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')"
-//                            );
-//                } else {
-//                    qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')").
-//                            apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')"
-//                            );
-//                }
-//            } else if (StringUtils.isNotBlank(actualStartDate) && StringUtils.isNotBlank(actualEndDate)) {
-//                if (headT.before(ast) && aed.before(lastT)) {
-//                    qw.apply(StringUtils.isNotEmpty(actualStartDate), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + actualStartDate + "','%Y-%m-%d')").
-//                            apply(StringUtils.isNotEmpty(actualEndDate), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + actualEndDate + "','%Y-%m-%d')"
-//                            );
-//                } else if (headT.before(ast) && !aed.before(lastT)) {
-//                    qw.apply(StringUtils.isNotEmpty(actualStartDate), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + actualStartDate + "','%Y-%m-%d')").
-//                            apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + lastT + "','%Y-%m-%d')"
-//                            );
-//                } else if (!headT.before(ast) && aed.before(lastT)) {
-//                    qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')").
-//                            apply(StringUtils.isNotEmpty(actualEndDate), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + actualEndDate + "','%Y-%m-%d')"
-//                            );
-//                } else if (!headT.before(ast) && !aed.before(lastT)) {
-//                    qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')").
-//                            apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')"
-//                            );
-//                }
-//            }
-//        } catch (ParseException e) {
-//            e.printStackTrace();
-//        }
-
         String dataStartTime = pagerQuery.getDataStartTime();
         String dataEndTime = pagerQuery.getDataEndTime();
-        qw.apply(StringUtils.isNotEmpty(dataStartTime), "date_format (h.dataTime,'%Y-%m-%d') >= date_format('" + dataStartTime + "','%Y-%m-%d')").
-                apply(StringUtils.isNotEmpty(dataEndTime), "date_format (h.dataTime,'%Y-%m-%d') <= date_format('" + dataEndTime + "','%Y-%m-%d')"
+        qw.apply(StringUtils.isNotEmpty(dataStartTime), "date_format (m.dataTime,'%Y-%m-%d') >= date_format('" + dataStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(dataEndTime), "date_format (m.dataTime,'%Y-%m-%d') <= date_format('" + dataEndTime + "','%Y-%m-%d')"
                 );
-        qw.orderByDesc("h.dataTime");
-        IPage<LoanRepaymentHistoryVo> pagging = baseMapper.monthListPage(page, qw);
-        List<LoanRepaymentHistoryVo> records = pagging.getRecords();
-        records.removeAll(Collections.singleton(null));
-        if (!records.isEmpty()) {
-            for (LoanRepaymentHistoryVo record : records) {
-                String planDetailSid = record.getPlanDetailSid();
-                List<LoanRepaymentHistory> histories = baseMapper.selByPlanSid(planDetailSid);
-                BigDecimal returned = new BigDecimal(0);
-                if (!histories.isEmpty()) {
-                    for (LoanRepaymentHistory history : histories) {
-                        returned = history.getActualMoney().add(returned);
-                    }
-                }
-                LoanRepaymentPlanDetails loanRepaymentPlanDetails = loanRepaymentPlanDetailsService.fetchBySid(record.getPlanDetailSid());
-                if (null != loanRepaymentPlanDetails) {
-                    BigDecimal dueMoney = loanRepaymentPlanDetails.getDueMoney();
-                    BigDecimal subtract = dueMoney.subtract(returned);
-                    record.setOutstandingMoney(String.valueOf(subtract));
-                }
+        if (StringUtils.isNotBlank(pagerQuery.getChange())) {
+            if (pagerQuery.getChange().equals("1")) {
+                qw.apply("((SELECT l.vehCount FROM anrui_buscenter.bus_sales_order_loancontract as l WHERE l.loanContractNo = m.loanContractNo and l.isDelete = 0) > 1 and m.outstandingMoney != m.actualMoney and returnWay = '直还')");
             }
         }
+        qw.orderByDesc("m.dataTime");
+        IPage<LoanRepaymentHistoryVo> pagging = baseMapper.monthListPage(page, qw);
+//        List<LoanRepaymentHistoryVo> records = pagging.getRecords();
+//        records.removeAll(Collections.singleton(null));
+//        if (!records.isEmpty()) {
+//            for (LoanRepaymentHistoryVo record : records) {
+//                String planDetailSid = record.getPlanDetailSid();
+//                List<LoanRepaymentHistory> histories = baseMapper.selByPlanSid(planDetailSid);
+//                BigDecimal returned = new BigDecimal(0);
+//                if (!histories.isEmpty()) {
+//                    for (LoanRepaymentHistory history : histories) {
+//                        returned = history.getActualMoney().add(returned);
+//                    }
+//                }
+//                LoanRepaymentPlanDetails loanRepaymentPlanDetails = loanRepaymentPlanDetailsService.fetchBySid(record.getPlanDetailSid());
+//                if (null != loanRepaymentPlanDetails) {
+//                    BigDecimal dueMoney = loanRepaymentPlanDetails.getDueMoney();
+//                    BigDecimal subtract = dueMoney.subtract(returned);
+//                    record.setOutstandingMoney(String.valueOf(subtract));
+//                }
+//            }
+//        }
         PagerVo<LoanRepaymentHistoryVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -704,10 +651,14 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         return rb.success().setData(vo);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public ResultBean deleteBySids(String[] sids) {
         ResultBean rb = ResultBean.fireFail();
         for (String sid : sids) {
             LoanRepaymentHistory repaymentHistory = fetchBySid(sid);
+            if (repaymentHistory.getReturnWay().equals("转付")) {
+                return rb.setMsg("转付记录无法删除");
+            }
             baseMapper.deleteById(repaymentHistory);
         }
         return rb.success().setMsg("删除成功");

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.java

@@ -83,4 +83,6 @@ public interface LoanRestoreReportApplyMapper extends BaseMapper<LoanRestoreRepo
 	String getQzzjzyf(String saleVehSid);
 
 	String getYqjehsqs(String saleVehSid);
+
+    int selectBySid(String join);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.xml

@@ -197,4 +197,11 @@
 		AND lrpd.`busVinSid` = #{saleVehSid}
 		GROUP BY lrpd.`sid`) ss
 	</select>
+
+	<select id="selectBySid" resultType="int">
+		SELECT COUNT(*)
+		FROM loan_restore_report_apply
+		WHERE nodeState != '待提交'
+		  and find_in_set(sid, #{list})
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyRest.java

@@ -83,9 +83,7 @@ public class LoanRestoreReportApplyRest implements LoanRestoreReportApplyFeign {
     @ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids) {
-        ResultBean rb = ResultBean.fireFail();
-        loanRestoreReportApplyService.delBySids(sids);
-        return rb.success();
+        return loanRestoreReportApplyService.delAllBySids(sids);
     }
 
     @Override

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java

@@ -685,4 +685,15 @@ public class LoanRestoreReportApplyService extends MybatisBaseService<LoanRestor
         alrepaidAndArrVo.setBeOverdueMoneyAndPeriod(yqjehsqs);
         return alrepaidAndArrVo;
     }
+
+    public ResultBean delAllBySids(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        //查询该sid中是否有流程不是待提交的
+        int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
+        if (count > 0) {
+            return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败");
+        }
+        delBySids(sids);
+        return rb.success();
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyMapper.xml

@@ -200,7 +200,9 @@
                la.alRepaidMoneyConPeriod,
                la.beOverdueMoneyAndPeriod,
                la.files,
-               la.remarks
+               la.remarks,
+               la.procInstId,
+               la.taskId,la.orgSidPath orgPath
         from loan_return_inbound_apply la
         where sid = #{sid}
     </select>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java

@@ -663,18 +663,18 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
         }
         LoanReturnInboundApply loanReturnInboundApply = fetchBySid(query.getBusinessSid());
         String businessTaskId = loanReturnInboundApply.getTaskId();
-        if (StringUtils.isNotBlank(businessTaskId)) {
-            if (query.getUserSid().equals(loanReturnInboundApply.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 (query.getUserSid().equals(loanReturnInboundApply.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 (StringUtils.isNotBlank(businessTaskId)) {
                 if (businessTaskId.equals(query.getTaskId())) {
                     FlowTaskVo flowTaskVo = new FlowTaskVo();
                     BeanUtil.copyProperties(query, flowTaskVo);
@@ -688,6 +688,7 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
                 }
             }
         }
+
         return rb.setMsg("操作失败!提交的数据不一致!");
     }
 

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

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

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyMapper.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.loansecondarysalesapply.LoanSecondarySalesApplyMapper">
+</mapper>

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

@@ -0,0 +1,82 @@
+package com.yxt.anrui.riskcenter.biz.loansecondarysalesapply;
+
+import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.*;
+import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.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.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/23
+ **/
+@RestController
+@RequestMapping("v1/LoanSecondarySalesApply")
+@Api(tags = "二次销售")
+public class LoanSecondarySalesApplyRest implements LoanSecondarySalesApplyFeign {
+    @Override
+    public ResultBean<PagerVo<LoanSecondarySalesApplyVo>> listPage(PagerQuery<LoanSecondarySalesApplyQuery> pq) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<String> saveOrUpdate(LoanSecondarySalesApplyDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<LoanSecondarySalesApplyDetailsVo> details(LoanSecondarySalesApplyDetailsQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean delBySids(String[] sids) {
+        return null;
+    }
+
+    @Override
+    public ResultBean submitApply(SubmitLoanSecondarySalesApplyDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean complete(CompleteLoanSecondarySalesApplyDto query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<LoanSecondarySalesApplyNodeVo>> getPreviousNodesForReject(LoanSecondarySalesApplyNodeQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<LoanSecondarySalesApplyNodeVo>> getNextNodesForSubmit(LoanSecondarySalesApplyNodeQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean taskReject(LoanSecondarySalesApplyTaskQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean revokeProcess(LoanSecondarySalesApplyTaskQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean breakProcess(LoanSecondarySalesApplyTaskQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean delegate(LoanSecondarySalesApplyDelegateQuery query) {
+        return null;
+    }
+}

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

@@ -0,0 +1,14 @@
+package com.yxt.anrui.riskcenter.biz.loansecondarysalesapply;
+
+import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApply;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/23
+ **/
+@Service
+public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecondarySalesApplyMapper, LoanSecondarySalesApply> {
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescost/LoanSecondarySalesCostMapper.java

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

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescost/LoanSecondarySalesCostMapper.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.loansecondarysalescost.LoanSecondarySalesCostMapper">
+</mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescost/LoanSecondarySalesCostService.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.riskcenter.biz.loansecondarysalescost;
+
+import com.yxt.anrui.riskcenter.api.loansecondarysalescost.LoanSecondarySalesCost;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/23
+ **/
+@Service
+public class LoanSecondarySalesCostService extends MybatisBaseService<LoanSecondarySalesCostMapper, LoanSecondarySalesCost> {
+}

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

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

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesveh/LoanSecondarySalesVehMapper.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.loansecondarysalesveh.LoanSecondarySalesVehMapper">
+</mapper>

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

@@ -0,0 +1,14 @@
+package com.yxt.anrui.riskcenter.biz.loansecondarysalesveh;
+
+import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.LoanSecondarySalesVeh;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/23
+ **/
+@Service
+public class LoanSecondarySalesVehService extends MybatisBaseService<LoanSecondarySalesVehMapper, LoanSecondarySalesVeh> {
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansubletapply/LoanSubletApplyMapper.java

@@ -33,7 +33,7 @@ public interface LoanSubletApplyMapper extends BaseMapper<LoanSubletApply> {
 
     SubletVinList selReturnVinLegerBySid(@Param("ledgerSid") String ledgerSid);
 
-    SubletVinList selReturnTrVinLegerByPSid(@Param("ledgerSid")String ledgerSid);
+    List<SubletVinList>  selReturnTrVinLegerByPSid(@Param("ledgerSid")String ledgerSid);
 
     SubletInitVo selLoanInfoByTrVeh(@Param("ledgerSid")String ledgerSid);
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansubletapply/LoanSubletApplyMapper.xml

@@ -156,6 +156,7 @@
           and disposal = '未处置'
           and stockState = '库存'
     </select>
+
     <select id="selLoanInfoByTrVeh" resultType="com.yxt.anrui.riskcenter.api.loansubletapply.SubletInitVo">
         SELECT l.bankName,
                l.bankContractNo,
@@ -205,4 +206,5 @@
         FROM loan_return_veh_ledger
         WHERE sid = #{ledgerSid}
     </select>
+
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansubletapply/LoanSubletApplyService.java

@@ -285,9 +285,11 @@ public class LoanSubletApplyService extends MybatisBaseService<LoanSubletApplyMa
                     if (null != mVeh) {
                         vinList.add(mVeh);
                     }
-                    SubletVinList tVeh = baseMapper.selReturnTrVinLegerByPSid(ledgerSid);
-                    if (null != tVeh) {
-                        vinList.add(tVeh);
+                    List<SubletVinList> tVeh = baseMapper.selReturnTrVinLegerByPSid(ledgerSid);
+                    if (!tVeh.isEmpty()) {
+                        tVeh.stream().forEach(t -> {
+                            vinList.add(t);
+                        });
                     }
                     vo.setVinList(vinList);
                 } else if (vehType.equals("挂车")) {
@@ -743,6 +745,9 @@ public class LoanSubletApplyService extends MybatisBaseService<LoanSubletApplyMa
         dto.setApplySid(subletApply.getSid());
         dto.setDisposalKey("04");
         dto.setDisposal("二次转租");
+        if (StringUtils.isNotBlank(subletApply.getVinOwner())) {
+            dto.setNewCustomer(subletApply.getVinOwner());
+        }
         List<SubletVinList> vinLists = loanSubletVehService.selByMainSid(subletApply.getSid());
         if (!vinLists.isEmpty()) {
             vinLists.forEach(v -> {
@@ -1063,6 +1068,9 @@ public class LoanSubletApplyService extends MybatisBaseService<LoanSubletApplyMa
             if (StringUtils.isNotBlank(entity.getBankContractNo())) {
                 vo.setBankContractNo(entity.getBankContractNo());
             }
+            if (StringUtils.isNotBlank(entity.getLoanContractNo())) {
+                vo.setLoanContractNo(entity.getLoanContractNo());
+            }
             if (StringUtils.isNotBlank(entity.getPlan())) {
                 vo.setPlan(entity.getPlan());
             }

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

@@ -371,7 +371,7 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
             List<LoanTransferPaymentRecordVo> recordList = new ArrayList<>();
             if (!records.isEmpty()) {
                 for (LoanTransferPaymentRecord record : records) {
-                  //  String historySid = record.getRepaymentHistorySid();
+                    //  String historySid = record.getRepaymentHistorySid();
                     LoanTransferPaymentRecordVo recordVo = baseMapper.paymentDetails(record.getSid());
                     recordList.add(recordVo);
                 }
@@ -629,34 +629,34 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
                     Set<String> setConOrNumber = new HashSet<>();
                     for (LoanTransferPaymentRecord applyRecord : loanTransferPaymentRecords) {
                         LoanRepaymentHistory repaymentHistory = loanRepaymentHistoryService.fetchBySid(applyRecord.getRepaymentHistorySid());
-                        if (null != repaymentHistory) {
-                            repaymentHistory.setPaymentStateKey("003");
-                            repaymentHistory.setPaymentState("已转付");
-                            repaymentHistory.setTransferDate(new DateTime());
-                            loanRepaymentHistoryService.updateById(repaymentHistory);
-                            //推送转付还款记录
-                            LoanRepaymentHistory transfer = new LoanRepaymentHistory();
-                            transfer.setScheduleSid(repaymentHistory.getScheduleSid());
-                            transfer.setPlanDetailSid(repaymentHistory.getPlanDetailSid());
-                            transfer.setReturnWay("转付");
-                            transfer.setReturnWayKey("03");
-                            transfer.setActualDate(new Date());
-                            transfer.setDataTime(new DateTime());
-                            transfer.setBuckleKey("001");
-                            transfer.setBuckle("未申请");
-                            transfer.setUpdateState("1");
-                            transfer.setUpdateTime(new DateTime());
-                            BigDecimal money = new BigDecimal(0);
-                            if (null != applyRecord.getTransferPrincipal()) {
-                                money = applyRecord.getTransferPrincipal();
-                            }
-                            if (null != applyRecord.getDefaultInterest()) {
-                                money = applyRecord.getDefaultInterest().add(money);
-                            }
-                            String amount = String.valueOf(money);
-                            transfer.setActualMoney(new BigDecimal("-" + amount));
-                            loanRepaymentHistoryService.insert(transfer);
-                        }
+//                        if (null != repaymentHistory) {
+//                            repaymentHistory.setPaymentStateKey("003");
+//                            repaymentHistory.setPaymentState("已转付");
+//                            repaymentHistory.setTransferDate(new DateTime());
+//                            loanRepaymentHistoryService.updateById(repaymentHistory);
+//                            //推送转付还款记录
+//                            LoanRepaymentHistory transfer = new LoanRepaymentHistory();
+//                            transfer.setScheduleSid(repaymentHistory.getScheduleSid());
+//                            transfer.setPlanDetailSid(repaymentHistory.getPlanDetailSid());
+//                            transfer.setReturnWay("转付");
+//                            transfer.setReturnWayKey("03");
+//                            transfer.setActualDate(new Date());
+//                            transfer.setDataTime(new DateTime());
+//                            transfer.setBuckleKey("001");
+//                            transfer.setBuckle("未申请");
+//                            transfer.setUpdateState("1");
+//                            transfer.setUpdateTime(new DateTime());
+//                            BigDecimal money = new BigDecimal(0);
+//                            if (null != applyRecord.getTransferPrincipal()) {
+//                                money = applyRecord.getTransferPrincipal();
+//                            }
+//                            if (null != applyRecord.getDefaultInterest()) {
+//                                money = applyRecord.getDefaultInterest().add(money);
+//                            }
+//                            String amount = String.valueOf(money);
+//                            transfer.setActualMoney(new BigDecimal("-" + amount));
+//                            loanRepaymentHistoryService.insert(transfer);
+//                        }
                         if (payFormKey.equals("01")) {
                             if (StringUtils.isNotBlank(applyRecord.getBankContractNo())) {
                                 setConOrNumber.add(applyRecord.getBankContractNo());
@@ -752,26 +752,34 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
                                         payDto.setReceiveCompany(paymentRecord.getAccount());
                                     }
                                 }
-                                finPaymentrecordFeign.save(payDto);
+                                String paySid = finPaymentrecordFeign.saveReturnSid(payDto).getData();
+                                if (StringUtils.isNotBlank(paySid)) {
+                                    if (!collect.isEmpty()) {
+                                        collect.stream().forEach(c -> {
+                                            c.setPaySid(paySid);
+                                            loanTransferPaymentRecordService.updateById(c);
+                                        });
+                                    }
+                                }
                             }
                         }
                     }
                 }
-                try {
-                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
-                            .setNameFormat("demo-pool-%d").build();
-                    ExecutorService pool = new org.apache.tomcat.util.threads.ThreadPoolExecutor(1, 10,
-                            1000, TimeUnit.MILLISECONDS,
-                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new org.apache.tomcat.util.threads.ThreadPoolExecutor.AbortPolicy());
-                    //推送转付凭证
-                    Future future = pool.submit(() -> {
-                        pushPaymentVoucher(businessSid);
-                    });
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    log.error("推送数据失败=========================" + e.getMessage());
-                    return rb.setMsg("推送数据失败");
-                }
+//                try {
+//                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+//                            .setNameFormat("demo-pool-%d").build();
+//                    ExecutorService pool = new org.apache.tomcat.util.threads.ThreadPoolExecutor(1, 10,
+//                            1000, TimeUnit.MILLISECONDS,
+//                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new org.apache.tomcat.util.threads.ThreadPoolExecutor.AbortPolicy());
+//                    //推送转付凭证
+//                    Future future = pool.submit(() -> {
+//                        pushPaymentVoucher(businessSid);
+//                    });
+//                } catch (Exception e) {
+//                    e.printStackTrace();
+//                    log.error("推送数据失败=========================" + e.getMessage());
+//                    return rb.setMsg("推送数据失败");
+//                }
 
             }
             return rb.success().setData(resultBean.getData());

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

@@ -74,4 +74,6 @@ public interface LoanVehClearanceApplyMapper extends BaseMapper<LoanVehClearance
 	LoanVehClearanceVehInit initVehListBySaleVehSid(String saleVehSid);
 
     int updateFlowFiled(Map<String, Object> map);
+
+    int selectBySid(String join);
 }

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

@@ -174,4 +174,11 @@
         </if>
         WHERE sid=#{sid}
     </update>
+
+    <select id="selectBySid" resultType="int">
+        SELECT COUNT(*)
+        FROM loan_veh_clearance_apply
+        WHERE nodeState != '待提交'
+		  and find_in_set(sid, #{list})
+    </select>
 </mapper>

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

@@ -93,9 +93,7 @@ public class LoanVehClearanceApplyRest implements LoanVehClearanceApplyFeign {
 	@ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		loanVehClearanceApplyService.delBySids(sids);
-		return rb.success();
+		return loanVehClearanceApplyService.delAllBySids(sids);
 	}
 
 	@Override

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

@@ -388,7 +388,7 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
         return vo;
     }
 
-    public LoanVehClearanceVehInit initVehListBySaleVehSid(String saleVehSid){
+    public LoanVehClearanceVehInit initVehListBySaleVehSid(String saleVehSid) {
         LoanVehClearanceVehInit loanVehClearanceVehInit = baseMapper.initVehListBySaleVehSid(saleVehSid);
         return loanVehClearanceVehInit;
     }
@@ -503,6 +503,11 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
             ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
+            //修改远程控制状态
+            List<LoanVehClearanceVehDto> loanVehClearanceVehList = dto.getLoanVehClearanceVehList();
+            for (LoanVehClearanceVehDto loanVehClearanceVehDto : loanVehClearanceVehList) {
+                loanBeCollectionVehService.updateLockState(loanVehClearanceVehDto.getSaleVehSid(), "4", "1");
+            }
             //极光推送
             loanVehClearanceApply = fetchBySid(businessSid);
             MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
@@ -596,6 +601,9 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+                for (LoanVehClearanceVehDetailsVo loanVehClearanceVehDetailsVo : loanVehClearanceVehDetailsVoList) {
+                    loanBeCollectionVehService.updateLockState(loanVehClearanceVehDetailsVo.getSaleVehSid(), "4", "3");
+                }
             } else {
                 //极光推送
                 loanVehClearanceApply = fetchBySid(businessSid);
@@ -744,6 +752,10 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
                 }
                 Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                 updateFlowFiled(map);
+                List<LoanVehClearanceVehDetailsVo> loanVehClearanceVehDetailsVoList = loanVehClearanceVehService.selByMainSid(query.getBusinessSid());
+                for (LoanVehClearanceVehDetailsVo loanVehClearanceVehDetailsVo : loanVehClearanceVehDetailsVoList) {
+                    loanBeCollectionVehService.updateLockState(loanVehClearanceVehDetailsVo.getSaleVehSid(), "1", "4");
+                }
                 return rb.success().setData(resultBean.getData());
             } else {
                 if (businessTaskId.equals(query.getTaskId())) {
@@ -755,6 +767,10 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
                     }
                     Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                     updateFlowFiled(map);
+                    List<LoanVehClearanceVehDetailsVo> loanVehClearanceVehDetailsVoList = loanVehClearanceVehService.selByMainSid(query.getBusinessSid());
+                    for (LoanVehClearanceVehDetailsVo loanVehClearanceVehDetailsVo : loanVehClearanceVehDetailsVoList) {
+                        loanBeCollectionVehService.updateLockState(loanVehClearanceVehDetailsVo.getSaleVehSid(), "1", "4");
+                    }
                     return rb.success().setData(resultBean.getData());
                 }
             }
@@ -770,4 +786,18 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
         flowFeign.delegate(delegateQuery);
         return rb.success();
     }
+
+    public ResultBean delAllBySids(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        //查询该sid中是否有流程不是待提交的
+        int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
+        if (count > 0) {
+            return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败");
+        }
+        delBySids(sids);
+        for (String sid : sids) {
+            loanVehClearanceVehService.delByMainSid(sid);
+        }
+        return rb.success();
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/returninbound/ReturnInboundAppVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.risk.returninbound;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.anrui.terminal.api.supplychain.vehicleApply.VehicleApplyCarPageVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -80,6 +81,7 @@ public class ReturnInboundAppVo {
     @ApiModelProperty(value = "任务id")
     private String taskId;
     @ApiModelProperty(value = "流程实例id")
+    @JsonProperty("procInsId")
     private String procInstId;
 
 
@@ -92,7 +94,7 @@ public class ReturnInboundAppVo {
     @ApiModelProperty("挂车类型key")
     private String trailerTypeKey;
     @ApiModelProperty("挂车入库价")
-    private int inboundMoneyTrailer;
+    private String inboundMoneyTrailer;
     @ApiModelProperty("挂车备注")
     private String remarksTrailer;
 
@@ -109,4 +111,6 @@ public class ReturnInboundAppVo {
     private String nper;
     @ApiModelProperty("当前期数")
     private String currentPeriod;
+    @ApiModelProperty("是否显示挂车信息")
+    private boolean trailerBoolean;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/returninbound/ReturnInboundService.java

@@ -134,13 +134,16 @@ public class ReturnInboundService {
         appSubVersionVo.setJson(JSONObject.toJSONString(map));
         BeanUtil.copyProperties(appSubVersionVo, appVehicleVersionVo);
         returnInboundAppVo.setCarDetailPage(appVehicleVersionVo);
-        returnInboundAppVo.setPublishInfo(returnInboundAppVo.getCreateDept()+"-"+returnInboundAppVo.getCreateByName());
+        returnInboundAppVo.setPublishInfo(returnInboundAppVo.getCreateDept() + "-" + returnInboundAppVo.getCreateByName());
         if (StringUtils.isNotBlank(returnInboundAppVo.getNper()) && StringUtils.isNotBlank(returnInboundAppVo.getCurrentPeriod())) {
             returnInboundAppVo.setQsCount(returnInboundAppVo.getNper() + "/" + returnInboundAppVo.getCurrentPeriod());
         }
         if (StringUtils.isNotBlank(returnInboundAppVo.getCurrentBeMoney()) && StringUtils.isNotBlank(returnInboundAppVo.getWheFundOccMoney())) {
             returnInboundAppVo.setYqzjzyMoney(returnInboundAppVo.getCurrentBeMoney() + "/" + returnInboundAppVo.getWheFundOccMoney());
         }
+        if ("是".equals(returnInboundAppVo.getTralier())) {
+            returnInboundAppVo.setTrailerBoolean(true);
+        }
         return rb.success().setData(returnInboundAppVo);
     }
 

doc/databases/risk_center.sql

@@ -1424,7 +1424,7 @@ CREATE TABLE `loan_return_inbound_apply`
     `inboundMoney`            int(32)              DEFAULT NULL COMMENT '入库价',
     `locationName`            varchar(64)          DEFAULT NULL COMMENT '停放地点',
     `locationSid`             varchar(64)          DEFAULT NULL COMMENT '停放地点sid',
-    `parkFees`                varchar(500)       DEFAULT NULL COMMENT '停车收费标准',
+    `parkFees`                varchar(500)         DEFAULT NULL COMMENT '停车收费标准',
     `alRepaidMoney`           decimal(10, 0)       DEFAULT NULL COMMENT '已还金额',
     `currentBeMoney`          decimal(10, 0)       DEFAULT NULL COMMENT '当前逾期金额',
     `wheFundOccMoney`         decimal(10, 0)       DEFAULT NULL COMMENT '其中资金占用费',
@@ -1529,6 +1529,135 @@ CREATE TABLE `loan_return_veh_ledger`
 
 
 
+DROP TABLE IF EXISTS `loan_secondary_sales_apply`;
+CREATE TABLE `loan_secondary_sales_apply`
+(
+    `id`                      int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`                     varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion`             int(32)              DEFAULT '0' COMMENT '版本锁',
+    `createTime`              timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`              timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`                int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`                   int(32)              DEFAULT '1' COMMENT '状态',
+    `isDelete`                int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`                 varchar(255)         DEFAULT NULL COMMENT '备注',
+    `createBySid`             varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid`             varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `createDept`              varchar(64)          DEFAULT NULL COMMENT '申请部门',
+    `createDeptSid`           varchar(64)          DEFAULT NULL COMMENT '申请部门sid',
+    `createByName`            varchar(64)          DEFAULT NULL COMMENT '申请人',
+    `customerName`            varchar(64)          DEFAULT NULL COMMENT '客户名称',
+    `customerSid`             varchar(64)          DEFAULT NULL COMMENT '客户sid',
+    `loanSid`                 varchar(64)          DEFAULT NULL COMMENT '贷款人sid',
+    `loanName`                varchar(64)          DEFAULT NULL COMMENT '贷款人',
+    `loanContractNo`          varchar(64)          DEFAULT NULL COMMENT '贷款合同编号',
+    `bankName`                varchar(64)          DEFAULT NULL COMMENT '资方',
+    `bankContractNo`          varchar(64)          DEFAULT NULL COMMENT '资方合同编号',
+    `locationName`            varchar(64)          DEFAULT NULL COMMENT '停放地点',
+    `locationSid`             varchar(64)          DEFAULT NULL COMMENT '停放地点sid',
+    `inspect`                 varchar(64)          DEFAULT NULL COMMENT '是否年检',
+    `inspectSituation`        text                 DEFAULT NULL COMMENT '年检情况',
+    `guaranteed`              varchar(64)          DEFAULT NULL COMMENT '是否已出保',
+    `insuranceSituation`      text                 DEFAULT NULL COMMENT '保险情况',
+    `firstDate`               varchar(64)          DEFAULT NULL COMMENT '首次登记日期',
+    `kilometerDriven`         varchar(64)          DEFAULT NULL COMMENT '当前行驶公里数',
+    `illustrate`              text                 DEFAULT NULL COMMENT '其他车况说明',
+    `files`                   text                 DEFAULT NULL COMMENT '车辆照片',
+    `alRepaidMoney`           decimal(10, 0)       DEFAULT NULL COMMENT '已还金额',
+    `currentBeMoney`          decimal(10, 0)       DEFAULT NULL COMMENT '当前逾期金额',
+    `wheFundOccMoney`         decimal(10, 0)       DEFAULT NULL COMMENT '其中资金占用费',
+    `unexpiredMoney`          decimal(10, 0)       DEFAULT NULL COMMENT '未到期金额',
+    `nper`                    varchar(64)          DEFAULT NULL COMMENT '总期数',
+    `currentPeriod`           varchar(64)          DEFAULT NULL COMMENT '当前期数',
+    `alRepaidMoneyConPeriod`  varchar(64)          DEFAULT NULL COMMENT '已还金额换算期数',
+    `beOverdueMoneyAndPeriod` varchar(64)          DEFAULT NULL COMMENT '逾期金额换算期数',
+    `nodeState`               varchar(64)          DEFAULT NULL COMMENT '流程状态',
+    `useOrgSid`               varchar(64)          DEFAULT NULL COMMENT '分公司sid',
+    `useOrgName`              varchar(64)          DEFAULT NULL COMMENT '分公司',
+    `closeDate`               varchar(64)          DEFAULT NULL COMMENT '办结日期',
+    `procInstId`              varchar(64)          DEFAULT NULL COMMENT '实例id',
+    `procDefId`               varchar(64)          DEFAULT NULL COMMENT '流程定义id',
+    `taskId`                  varchar(64)          DEFAULT NULL COMMENT '任务id',
+    `taskDefKey`              varchar(64)          DEFAULT NULL COMMENT '环节id',
+    `orgSidPath`              text                 DEFAULT NULL COMMENT '机构全路径sid',
+    `salesOrderSid`           varchar(64)          DEFAULT NULL COMMENT '销售订单sid',
+    PRIMARY KEY (`id`),
+    KEY `id` (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8 COMMENT ='交回车辆二次销售申请';
+
+DROP TABLE IF EXISTS `loan_secondary_sales_veh`;
+CREATE TABLE `loan_secondary_sales_veh`
+(
+    `id`          int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`         varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion` int(32)              DEFAULT '0' COMMENT '版本锁',
+    `createTime`  timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`  timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`    int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`       int(32)              DEFAULT '1' COMMENT '状态',
+    `isDelete`    int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`     varchar(255)         DEFAULT NULL COMMENT '备注',
+    `createBySid` varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid` varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `mainSid`     varchar(64)          DEFAULT NULL COMMENT '主表sid',
+    `vinNo`       varchar(64)          DEFAULT NULL COMMENT '车架号',
+    `vehMark`     text                 DEFAULT NULL COMMENT '车牌号',
+    `vehType`     varchar(64)          DEFAULT NULL COMMENT '车辆类型',
+    `modelName`   text                 DEFAULT NULL COMMENT '车型',
+    `modelSid`    varchar(64)          DEFAULT NULL COMMENT '车型',
+    `configSid`   varchar(64)          DEFAULT NULL COMMENT '车型',
+    `busVinSid`   varchar(64)          DEFAULT NULL COMMENT '销售订单车辆sid',
+    PRIMARY KEY (`id`),
+    KEY `id` (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8 COMMENT ='交回车辆二次销售申请车辆';
+
+
+
+DROP TABLE IF EXISTS `loan_secondary_sales_cost`;
+CREATE TABLE `loan_secondary_sales_cost`
+(
+    `id`                         int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`                        varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion`                int(32)              DEFAULT '0' COMMENT '版本锁',
+    `createTime`                 timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`                 timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`                   int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`                      int(32)              DEFAULT '1' COMMENT '状态',
+    `isDelete`                   int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`                    varchar(255)         DEFAULT NULL COMMENT '备注',
+    `createBySid`                varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid`                varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `mainSid`                    varchar(64)          DEFAULT NULL COMMENT '主表sid',
+    `arrearsAll`                 decimal(10, 2)       DEFAULT NULL COMMENT '欠款合计',
+    `loanDeposit`                decimal(10, 2)       DEFAULT NULL COMMENT '贷款保证金',
+    `vehPrice`                   decimal(10, 2)       DEFAULT NULL COMMENT '车辆售价',
+    `collectionCost`             decimal(10, 2)       DEFAULT NULL COMMENT '催收费用',
+    `bankSettleCost`             decimal(10, 2)       DEFAULT NULL COMMENT '资方结清费用',
+    `bankSettleCostAssume`       varchar(64)          DEFAULT NULL COMMENT '资方结清费用承担方',
+    `vehicleViolationCost`       decimal(10, 2)       DEFAULT NULL COMMENT '车辆违章费用',
+    `vehicleViolationCostAssume` varchar(64)          DEFAULT NULL COMMENT '车辆违章费用承担方',
+    `inspectYearCost`            decimal(10, 2)       DEFAULT NULL COMMENT '年检费',
+    `inspectYearCostAssume`      varchar(64)          DEFAULT NULL COMMENT '年检费承担方',
+    `insureCost`                 decimal(10, 2)       DEFAULT NULL COMMENT '保险费',
+    `insureCostAssume`           varchar(64)          DEFAULT NULL COMMENT '保险费承担方',
+    `ownershipCost`              decimal(10, 2)       DEFAULT NULL COMMENT '过户费',
+    `ownershipCostAssume`        varchar(64)          DEFAULT NULL COMMENT '过户费承担方',
+    `stopCost`                   decimal(10, 2)       DEFAULT NULL COMMENT '停车费',
+    `stopCostAssume`             varchar(64)          DEFAULT NULL COMMENT '停车费承担方',
+    `otherCost`                  decimal(10, 2)       DEFAULT NULL COMMENT '其他费用',
+    `otherCostAssume`            varchar(64)          DEFAULT NULL COMMENT '其他费用承担方',
+    `costDescription`            text                 DEFAULT NULL COMMENT '费用说明',
+    `lossPrice`                  decimal(10, 2)       DEFAULT NULL COMMENT '预计亏损金额',
+    `debtDisposal`               text                 DEFAULT NULL COMMENT '后续欠款处置方向',
+    `files`                      text                 DEFAULT NULL COMMENT '附件',
+    PRIMARY KEY (`id`),
+    KEY `id` (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8 COMMENT ='交回车辆二次销售申请费用说明';
+
+