diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java index 2d9820bbd5..f093662357 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java +++ b/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 saveReturnSid(@RequestBody FinPaymentrecordDto dto); + + @ApiOperation("修改") @PostMapping("/update") @ResponseBody diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java index ad11923f04..5b0e44e8ae 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java +++ b/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 saveReturnSid(FinPaymentrecordDto dto) { + return null; + } + @Override public ResultBean update(FinPaymentrecordUpdateDto dto) { return null; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java index da7910e576..929e9ca88b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java +++ b/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 saveReturnSid(FinPaymentrecordDto dto) { + return finPaymentrecordService.saveReturnSid(dto); + } + @Override public ResultBean update(FinPaymentrecordUpdateDto dto) { return finPaymentrecordService.updateAll(dto); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index cd229605c8..f0befe8bd4 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/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 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 sids = dto.getSids(); @@ -390,7 +398,7 @@ public class FinPaymentrecordService extends MybatisBaseService 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> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/saveOrUpdate") + ResultBean saveOrUpdate(@RequestBody LoanSecondarySalesApplyDto dto); + + @ApiOperation("详情初始化") + @PostMapping("/details") + ResultBean 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> getPreviousNodesForReject(@Valid @SpringQueryMap LoanSecondarySalesApplyNodeQuery query); + + @ApiOperation(value = "获取下一个环节") + @GetMapping(value = "/getNextNodesForSubmit") + ResultBean> 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); + + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyFeignFallback.java new file mode 100644 index 0000000000..282366e380 --- /dev/null +++ b/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 { +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyQuery.java new file mode 100644 index 0000000000..1d583f8a6b --- /dev/null +++ b/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; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyVo.java new file mode 100644 index 0000000000..de278c0cff --- /dev/null +++ b/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 { +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/flowable/CompleteLoanSecondarySalesApplyDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/flowable/CompleteLoanSecondarySalesApplyDto.java new file mode 100644 index 0000000000..dd44eb4404 --- /dev/null +++ b/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 { +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/flowable/LoanSecondarySalesApplyDelegateQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/flowable/LoanSecondarySalesApplyDelegateQuery.java new file mode 100644 index 0000000000..47823a25ff --- /dev/null +++ b/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 { +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/flowable/LoanSecondarySalesApplyNodeQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/flowable/LoanSecondarySalesApplyNodeQuery.java new file mode 100644 index 0000000000..8688e0bcf8 --- /dev/null +++ b/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 { +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/flowable/LoanSecondarySalesApplyNodeVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/flowable/LoanSecondarySalesApplyNodeVo.java new file mode 100644 index 0000000000..1b2a1609a4 --- /dev/null +++ b/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 { +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/flowable/LoanSecondarySalesApplyTaskQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/flowable/LoanSecondarySalesApplyTaskQuery.java new file mode 100644 index 0000000000..a0c26fe3e6 --- /dev/null +++ b/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 { +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/flowable/SubmitLoanSecondarySalesApplyDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/flowable/SubmitLoanSecondarySalesApplyDto.java new file mode 100644 index 0000000000..110f63151b --- /dev/null +++ b/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 { +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalescost/LoanSecondarySalesCost.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalescost/LoanSecondarySalesCost.java new file mode 100644 index 0000000000..aa207d7bfe --- /dev/null +++ b/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; + + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesveh/LoanSecondarySalesVeh.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesveh/LoanSecondarySalesVeh.java new file mode 100644 index 0000000000..c2a631cf20 --- /dev/null +++ b/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; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentrecord/LoanTransferPaymentRecord.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentrecord/LoanTransferPaymentRecord.java index aeaf75bb19..9627a003a0 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentrecord/LoanTransferPaymentRecord.java +++ b/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; + } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyMapper.java index dae1201ae5..4ec374e5cf 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyMapper.java +++ b/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 WHERE sid=#{sid} + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyRest.java index 4f105f8351..45d148e6b1 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyRest.java +++ b/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 diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java index e82339754f..1c3fd77063 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java +++ b/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 0) { + return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败"); + } + delBySids(sids); + for (String sid : sids) { + loanBeCollectionVehService.delByMainSid(sid); + } + return rb.success(); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.java index 6a47391d59..3d9c0eb22a 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.java +++ b/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 0) { + return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败"); + } + delBySids(sids); + for (String sid : sids) { + loanBePadsincereVehService.delByMainSid(sid); + } + return rb.success(); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyMapper.java index c35c1a5b58..24d6d91a96 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyMapper.java +++ b/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 selTrailerByLedgerSid(@Param("ledgerSid") String ledgerSid); int updateFlowFiled(Map map); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyMapper.xml index 70fa662f90..8ac1cef84b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyMapper.xml +++ b/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 COUNT(*) + FROM loan_restore_report_apply + WHERE nodeState != '待提交' + and find_in_set(sid, #{list}) + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyRest.java index 634f31ea3e..97248e9ff6 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyRest.java +++ b/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 diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java index df5d84efc1..8a682b9f4d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java +++ b/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 0) { + return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败"); + } + delBySids(sids); + return rb.success(); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyMapper.xml index 5db9867606..04128b93ae 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyMapper.xml +++ b/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} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java index 00039e72c5..b0e40829ae 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java +++ b/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 resultBean = flowableFeign.breakProcess(flowTaskVo); - if (!resultBean.getSuccess()) { - return rb.setMsg(resultBean.getMsg()); - } - Map 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 resultBean = flowableFeign.breakProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + Map 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 { +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyMapper.xml new file mode 100644 index 0000000000..b4adcb15e3 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyMapper.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyRest.java new file mode 100644 index 0000000000..99014ee0d9 --- /dev/null +++ b/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> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean saveOrUpdate(LoanSecondarySalesApplyDto dto) { + return null; + } + + @Override + public ResultBean 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> getPreviousNodesForReject(LoanSecondarySalesApplyNodeQuery query) { + return null; + } + + @Override + public ResultBean> 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; + } +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java new file mode 100644 index 0000000000..e736c1cc34 --- /dev/null +++ b/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 { +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescost/LoanSecondarySalesCostMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescost/LoanSecondarySalesCostMapper.java new file mode 100644 index 0000000000..3da150a1ec --- /dev/null +++ b/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 { +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescost/LoanSecondarySalesCostMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescost/LoanSecondarySalesCostMapper.xml new file mode 100644 index 0000000000..2174ff68d6 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescost/LoanSecondarySalesCostMapper.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescost/LoanSecondarySalesCostService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescost/LoanSecondarySalesCostService.java new file mode 100644 index 0000000000..b04c20ecbb --- /dev/null +++ b/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 { +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesveh/LoanSecondarySalesVehMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesveh/LoanSecondarySalesVehMapper.java new file mode 100644 index 0000000000..d98b597d4f --- /dev/null +++ b/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 { +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesveh/LoanSecondarySalesVehMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesveh/LoanSecondarySalesVehMapper.xml new file mode 100644 index 0000000000..08ff1ef504 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesveh/LoanSecondarySalesVehMapper.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesveh/LoanSecondarySalesVehService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesveh/LoanSecondarySalesVehService.java new file mode 100644 index 0000000000..629ad2c5ca --- /dev/null +++ b/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 { +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansubletapply/LoanSubletApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansubletapply/LoanSubletApplyMapper.java index 13bfdb6056..94054fa7c1 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansubletapply/LoanSubletApplyMapper.java +++ b/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 { SubletVinList selReturnVinLegerBySid(@Param("ledgerSid") String ledgerSid); - SubletVinList selReturnTrVinLegerByPSid(@Param("ledgerSid")String ledgerSid); + List selReturnTrVinLegerByPSid(@Param("ledgerSid")String ledgerSid); SubletInitVo selLoanInfoByTrVeh(@Param("ledgerSid")String ledgerSid); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansubletapply/LoanSubletApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansubletapply/LoanSubletApplyMapper.xml index 524ca56116..63145c256b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansubletapply/LoanSubletApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansubletapply/LoanSubletApplyMapper.xml @@ -156,6 +156,7 @@ and disposal = '未处置' and stockState = '库存' + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansubletapply/LoanSubletApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansubletapply/LoanSubletApplyService.java index 733becc989..05c47763fb 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansubletapply/LoanSubletApplyService.java +++ b/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 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 vinLists = loanSubletVehService.selByMainSid(subletApply.getSid()); if (!vinLists.isEmpty()) { vinLists.forEach(v -> { @@ -1063,6 +1068,9 @@ public class LoanSubletApplyService extends MybatisBaseService 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 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 { + 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(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(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()); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyMapper.java index 61b33e5257..91365f6d02 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyMapper.java +++ b/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 map); + + int selectBySid(String join); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyMapper.xml index fa70704c84..e3e1b5072c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyMapper.xml @@ -174,4 +174,11 @@ WHERE sid=#{sid} + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyRest.java index 14334dbb93..34bf5dccab 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyRest.java +++ b/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 diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyService.java index 67f71201cd..f8270c111f 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyService.java +++ b/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 voResultBean = flowableFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); updateFlowFiled(BeanUtil.beanToMap(ufVo)); + //修改远程控制状态 + List 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 map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); + List 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 map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); + List 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 0) { + return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败"); + } + delBySids(sids); + for (String sid : sids) { + loanVehClearanceVehService.delByMainSid(sid); + } + return rb.success(); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/returninbound/ReturnInboundAppVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/returninbound/ReturnInboundAppVo.java index a74aaf525e..89e134fb8a 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/returninbound/ReturnInboundAppVo.java +++ b/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; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/returninbound/ReturnInboundService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/returninbound/ReturnInboundService.java index 718fa862b6..5dc8ec1c1c 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/returninbound/ReturnInboundService.java +++ b/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); } diff --git a/doc/databases/risk_center.sql b/doc/databases/risk_center.sql index 10eb4950c4..fd0d1e9bf7 100644 --- a/doc/databases/risk_center.sql +++ b/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 ='交回车辆二次销售申请费用说明'; + +