yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 4 days ago
parent
53049f7152 6c02328387
commit
054a1ece97
36 changed files with 556 additions and 667 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 31
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrower.java
  2. 152
      anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/xstc.ftl
  3. 2
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  4. 22
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/FlowableUuidConfig.java
  5. 39
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVeh.java
  6. 32
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDbrDetailsVo.java
  7. 33
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDbrDto.java
  8. 14
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDetailsVo.java
  9. 36
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDto.java
  10. 16
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFeignFallback.java
  11. 15
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFile.java
  12. 1
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehInit.java
  13. 40
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehQuery.java
  14. 42
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehVo.java
  15. 68
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerDetailsVo.java
  16. 16
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/AlrepaidAndArrVo.java
  17. 31
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java
  18. 3
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.java
  19. 7
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java
  20. 96
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml
  21. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java
  22. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java
  23. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java
  24. 6
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java
  25. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.java
  26. 207
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.xml
  27. 45
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java
  28. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java
  29. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturnvehledger/LoanReturnVehLedgerService.java
  30. 23
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java
  31. 84
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyMapper.xml
  32. 7
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyService.java
  33. 122
      anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/fkce.ftl
  34. 7
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
  35. 8
      doc/databases/统计报表更新.sql
  36. 2
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml

31
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrower.java
View File

@ -31,46 +31,33 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-buscenter(销售订单) <br/>
* File: BusSalesOrderBorrower.java <br/>
* Class: com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower <br/>
* Description: 销售订单-贷款人. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-08-10 13:46:47 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "销售订单-贷款人", description = "销售订单-贷款人")
@TableName("bus_sales_order_borrower")
public class BusSalesOrderBorrower extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("销售订单sid")
@ApiModelProperty("销售订单sid")
private String salesOrderSid;
@ApiModelProperty("客户sid")
@ApiModelProperty("客户sid")
private String customSid;
@ApiModelProperty("借款人名称")
@ApiModelProperty("借款人名称")
private String borrowerName;
@ApiModelProperty("手机号码")
@ApiModelProperty("手机号码")
private String mobile;
@ApiModelProperty("台数")
@ApiModelProperty("台数")
private Integer vehCount;
@ApiModelProperty("资方sid")
private String bankSid;
@ApiModelProperty("资方名称")
private String bankName;
@ApiModelProperty("金融产品名称")
@ApiModelProperty("金融产品名称")
private String policyName;
@ApiModelProperty("业务阶段编码")
@ApiModelProperty("业务阶段编码")
private String busNo;
@ApiModelProperty("业务阶段名称")
@ApiModelProperty("业务阶段名称")
private String busName;
@ApiModelProperty("业务状态码")
@ApiModelProperty("业务状态码")
private String busState;
}

152
anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/xstc.ftl
View File

@ -30,15 +30,16 @@
<o:Author>10745413@qq.com</o:Author>
<o:LastAuthor>10745413@qq.com</o:LastAuthor>
<o:Revision>2</o:Revision>
<o:TotalTime>0</o:TotalTime>
<o:Created>2025-04-16T08:07:00Z</o:Created>
<o:LastSaved>2025-04-16T08:07:00Z</o:LastSaved>
<o:TotalTime>1</o:TotalTime>
<o:LastPrinted>2025-04-21T02:20:00Z</o:LastPrinted>
<o:Created>2025-04-21T02:20:00Z</o:Created>
<o:LastSaved>2025-04-21T02:20:00Z</o:LastSaved>
<o:Pages>1</o:Pages>
<o:Words>121</o:Words>
<o:Characters>378</o:Characters>
<o:Lines>54</o:Lines>
<o:Paragraphs>55</o:Paragraphs>
<o:CharactersWithSpaces>444</o:CharactersWithSpaces>
<o:Paragraphs>62</o:Paragraphs>
<o:CharactersWithSpaces>437</o:CharactersWithSpaces>
<o:Version>16</o:Version>
</o:DocumentProperties>
<w:fonts>
@ -1168,7 +1169,7 @@
</w:hdrShapeDefaults>
<w:footnotePr>
<w:footnote w:type="separator">
<w:p wsp:rsidR="00F6410E" wsp:rsidRDefault="00F6410E" wsp:rsidP="00017D34">
<w:p wsp:rsidR="000E0241" wsp:rsidRDefault="000E0241" wsp:rsidP="00017D34">
<w:pPr>
<w:spacing w:after="0" w:line="240" w:line-rule="auto"/>
<w:rPr>
@ -1181,7 +1182,7 @@
</w:p>
</w:footnote>
<w:footnote w:type="continuation-separator">
<w:p wsp:rsidR="00F6410E" wsp:rsidRDefault="00F6410E" wsp:rsidP="00017D34">
<w:p wsp:rsidR="000E0241" wsp:rsidRDefault="000E0241" wsp:rsidP="00017D34">
<w:pPr>
<w:spacing w:after="0" w:line="240" w:line-rule="auto"/>
<w:rPr>
@ -1196,7 +1197,7 @@
</w:footnotePr>
<w:endnotePr>
<w:endnote w:type="separator">
<w:p wsp:rsidR="00F6410E" wsp:rsidRDefault="00F6410E" wsp:rsidP="00017D34">
<w:p wsp:rsidR="000E0241" wsp:rsidRDefault="000E0241" wsp:rsidP="00017D34">
<w:pPr>
<w:spacing w:after="0" w:line="240" w:line-rule="auto"/>
<w:rPr>
@ -1209,7 +1210,7 @@
</w:p>
</w:endnote>
<w:endnote w:type="continuation-separator">
<w:p wsp:rsidR="00F6410E" wsp:rsidRDefault="00F6410E" wsp:rsidP="00017D34">
<w:p wsp:rsidR="000E0241" wsp:rsidRDefault="000E0241" wsp:rsidP="00017D34">
<w:pPr>
<w:spacing w:after="0" w:line="240" w:line-rule="auto"/>
<w:rPr>
@ -1240,20 +1241,30 @@
<wsp:rsidRoot wsp:val="00B439A2"/>
<wsp:rsid wsp:val="00017D34"/>
<wsp:rsid wsp:val="0009789E"/>
<wsp:rsid wsp:val="000B5D11"/>
<wsp:rsid wsp:val="000D7B74"/>
<wsp:rsid wsp:val="000E0241"/>
<wsp:rsid wsp:val="00192634"/>
<wsp:rsid wsp:val="002E10BC"/>
<wsp:rsid wsp:val="002F48A3"/>
<wsp:rsid wsp:val="0034459F"/>
<wsp:rsid wsp:val="00362AE2"/>
<wsp:rsid wsp:val="00366AE3"/>
<wsp:rsid wsp:val="003B1297"/>
<wsp:rsid wsp:val="003D7C25"/>
<wsp:rsid wsp:val="00430D10"/>
<wsp:rsid wsp:val="004D6F8C"/>
<wsp:rsid wsp:val="00516923"/>
<wsp:rsid wsp:val="00627292"/>
<wsp:rsid wsp:val="0066299D"/>
<wsp:rsid wsp:val="00685FF7"/>
<wsp:rsid wsp:val="00742BFB"/>
<wsp:rsid wsp:val="007433E1"/>
<wsp:rsid wsp:val="007614D3"/>
<wsp:rsid wsp:val="00786031"/>
<wsp:rsid wsp:val="007F2F2A"/>
<wsp:rsid wsp:val="00827192"/>
<wsp:rsid wsp:val="00882693"/>
<wsp:rsid wsp:val="008A2FCD"/>
<wsp:rsid wsp:val="0096737A"/>
<wsp:rsid wsp:val="009953C5"/>
@ -1262,17 +1273,17 @@
<wsp:rsid wsp:val="00AF0D39"/>
<wsp:rsid wsp:val="00B439A2"/>
<wsp:rsid wsp:val="00B64B18"/>
<wsp:rsid wsp:val="00BE0D81"/>
<wsp:rsid wsp:val="00C3401F"/>
<wsp:rsid wsp:val="00C35592"/>
<wsp:rsid wsp:val="00C55685"/>
<wsp:rsid wsp:val="00C95A3A"/>
<wsp:rsid wsp:val="00CE39F8"/>
<wsp:rsid wsp:val="00D95F98"/>
<wsp:rsid wsp:val="00DD312A"/>
<wsp:rsid wsp:val="00E10A32"/>
<wsp:rsid wsp:val="00EA1770"/>
<wsp:rsid wsp:val="00EF2E50"/>
<wsp:rsid wsp:val="00F307C2"/>
<wsp:rsid wsp:val="00F6410E"/>
<wsp:rsid wsp:val="00F94A48"/>
<wsp:rsid wsp:val="00FA5004"/>
<wsp:rsid wsp:val="00FC2170"/>
@ -1283,6 +1294,7 @@
<w:tbl>
<w:tblPr>
<w:tblW w:w="8647" w:type="dxa"/>
<w:jc w:val="center"/>
<w:tblLook w:val="04A0"/>
</w:tblPr>
<w:tblGrid>
@ -1305,9 +1317,10 @@
<w:gridCol w:w="142"/>
<w:gridCol w:w="1417"/>
</w:tblGrid>
<w:tr wsp:rsidR="00D95F98" wsp:rsidRPr="00EA1770" wsp:rsidTr="008A2FCD">
<w:tr wsp:rsidR="00D95F98" wsp:rsidRPr="003B1297" wsp:rsidTr="000B5D11">
<w:trPr>
<w:trHeight w:val="565"/>
<w:jc w:val="center"/>
</w:trPr>
<w:tc>
<w:tcPr>
@ -1354,9 +1367,10 @@
</w:p>
</w:tc>
</w:tr>
<w:tr wsp:rsidR="00A04355" wsp:rsidRPr="00EA1770" wsp:rsidTr="008A2FCD">
<w:tr wsp:rsidR="00A04355" wsp:rsidRPr="003B1297" wsp:rsidTr="000B5D11">
<w:trPr>
<w:trHeight w:val="310"/>
<w:jc w:val="center"/>
</w:trPr>
<w:tc>
<w:tcPr>
@ -1629,9 +1643,10 @@
</w:p>
</w:tc>
</w:tr>
<w:tr wsp:rsidR="00A04355" wsp:rsidRPr="00EA1770" wsp:rsidTr="008A2FCD">
<w:tr wsp:rsidR="00A04355" wsp:rsidRPr="003B1297" wsp:rsidTr="000B5D11">
<w:trPr>
<w:trHeight w:val="310"/>
<w:jc w:val="center"/>
</w:trPr>
<w:tc>
<w:tcPr>
@ -1806,7 +1821,7 @@
<w:sz w:val="15"/>
<w:sz-cs w:val="15"/>
</w:rPr>
<w:t>${finshTime!}</w:t>
<w:t>${finishTime!}</w:t>
</w:r>
<w:r wsp:rsidRPr="00D95F98">
<w:rPr>
@ -1915,9 +1930,10 @@
</w:p>
</w:tc>
</w:tr>
<w:tr wsp:rsidR="002E10BC" wsp:rsidRPr="00EA1770" wsp:rsidTr="008A2FCD">
<w:tr wsp:rsidR="002E10BC" wsp:rsidRPr="003B1297" wsp:rsidTr="000B5D11">
<w:trPr>
<w:trHeight w:val="310"/>
<w:jc w:val="center"/>
</w:trPr>
<w:tc>
<w:tcPr>
@ -2087,9 +2103,10 @@
</w:p>
</w:tc>
</w:tr>
<w:tr wsp:rsidR="002E10BC" wsp:rsidRPr="00EA1770" wsp:rsidTr="008A2FCD">
<w:tr wsp:rsidR="002E10BC" wsp:rsidRPr="003B1297" wsp:rsidTr="000B5D11">
<w:trPr>
<w:trHeight w:val="310"/>
<w:jc w:val="center"/>
</w:trPr>
<w:tc>
<w:tcPr>
@ -2259,9 +2276,10 @@
</w:p>
</w:tc>
</w:tr>
<w:tr wsp:rsidR="002E10BC" wsp:rsidRPr="00EA1770" wsp:rsidTr="008A2FCD">
<w:tr wsp:rsidR="002E10BC" wsp:rsidRPr="003B1297" wsp:rsidTr="000B5D11">
<w:trPr>
<w:trHeight w:val="310"/>
<w:jc w:val="center"/>
</w:trPr>
<w:tc>
<w:tcPr>
@ -2431,9 +2449,10 @@
</w:p>
</w:tc>
</w:tr>
<w:tr wsp:rsidR="00D95F98" wsp:rsidRPr="00EA1770" wsp:rsidTr="008A2FCD">
<w:tr wsp:rsidR="00D95F98" wsp:rsidRPr="003B1297" wsp:rsidTr="000B5D11">
<w:trPr>
<w:trHeight w:val="310"/>
<w:jc w:val="center"/>
</w:trPr>
<w:tc>
<w:tcPr>
@ -2519,9 +2538,10 @@
</w:p>
</w:tc>
</w:tr>
<w:tr wsp:rsidR="00D95F98" wsp:rsidRPr="00EA1770" wsp:rsidTr="008A2FCD">
<w:tr wsp:rsidR="00D95F98" wsp:rsidRPr="003B1297" wsp:rsidTr="000B5D11">
<w:trPr>
<w:trHeight w:val="310"/>
<w:jc w:val="center"/>
</w:trPr>
<w:tc>
<w:tcPr>
@ -2607,9 +2627,10 @@
</w:p>
</w:tc>
</w:tr>
<w:tr wsp:rsidR="00D95F98" wsp:rsidRPr="00EA1770" wsp:rsidTr="008A2FCD">
<w:tr wsp:rsidR="00D95F98" wsp:rsidRPr="003B1297" wsp:rsidTr="000B5D11">
<w:trPr>
<w:trHeight w:val="310"/>
<w:jc w:val="center"/>
</w:trPr>
<w:tc>
<w:tcPr>
@ -2695,9 +2716,10 @@
</w:p>
</w:tc>
</w:tr>
<w:tr wsp:rsidR="00D95F98" wsp:rsidRPr="00EA1770" wsp:rsidTr="00EA1770">
<w:tr wsp:rsidR="00D95F98" wsp:rsidRPr="003B1297" wsp:rsidTr="003B1297">
<w:trPr>
<w:trHeight w:val="310"/>
<w:jc w:val="center"/>
</w:trPr>
<w:tc>
<w:tcPr>
@ -2741,9 +2763,10 @@
</w:p>
</w:tc>
</w:tr>
<w:tr wsp:rsidR="00A04355" wsp:rsidRPr="00EA1770" wsp:rsidTr="008A2FCD">
<w:tr wsp:rsidR="00A04355" wsp:rsidRPr="003B1297" wsp:rsidTr="000B5D11">
<w:trPr>
<w:trHeight w:val="310"/>
<w:jc w:val="center"/>
</w:trPr>
<w:tc>
<w:tcPr>
@ -3041,9 +3064,10 @@
</w:tc>
</w:tr>
<#list wlList as wl>
<w:tr wsp:rsidR="00A04355" wsp:rsidRPr="00EA1770" wsp:rsidTr="00EA1770">
<w:tr wsp:rsidR="00A04355" wsp:rsidRPr="003B1297" wsp:rsidTr="003B1297">
<w:trPr>
<w:trHeight w:val="310"/>
<w:jc w:val="center"/>
</w:trPr>
<w:tc>
<w:tcPr>
@ -3339,9 +3363,10 @@
</w:tc>
</w:tr>
</#list>
<w:tr wsp:rsidR="00000000" wsp:rsidRPr="00EA1770" wsp:rsidTr="00EA1770">
<w:tr wsp:rsidR="00DD312A" wsp:rsidRPr="003B1297" wsp:rsidTr="003B1297">
<w:trPr>
<w:trHeight w:val="280"/>
<w:jc w:val="center"/>
</w:trPr>
<w:tc>
<w:tcPr>
@ -3506,9 +3531,10 @@
</w:tr>
<#list lcList as lc>
<#if (lc_index>0)>
<w:tr wsp:rsidR="00000000" wsp:rsidRPr="00EA1770" wsp:rsidTr="00EA1770">
<w:tr wsp:rsidR="00DD312A" wsp:rsidRPr="003B1297" wsp:rsidTr="003B1297">
<w:trPr>
<w:trHeight w:val="280"/>
<w:jc w:val="center"/>
</w:trPr>
<w:tc>
<w:tcPr>
@ -3548,7 +3574,8 @@
<w:tcW w:w="4126" w:type="dxa"/>
<w:gridSpan w:val="10"/>
<w:tcBorders>
<w:left w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="156082"/>
<w:left w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0"
w:color="156082"/>
<w:bottom w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0"
w:color="156082"/>
</w:tcBorders>
@ -3618,11 +3645,13 @@
<w:tcW w:w="3528" w:type="dxa"/>
<w:gridSpan w:val="7"/>
<w:tcBorders>
<w:top w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
<w:top w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0"
w:color="auto"/>
<w:left w:val="nil"/>
<w:bottom w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0"
w:color="156082"/>
<w:right w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="156082"/>
<w:right w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0"
w:color="156082"/>
</w:tcBorders>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
<w:vAlign w:val="bottom"/>
@ -3660,9 +3689,10 @@
</w:tr>
</#if>
</#list>
<w:tr wsp:rsidR="00430D10" wsp:rsidRPr="00EA1770" wsp:rsidTr="00EA1770">
<w:tr wsp:rsidR="00430D10" wsp:rsidRPr="003B1297" wsp:rsidTr="003B1297">
<w:trPr>
<w:trHeight w:val="280"/>
<w:jc w:val="center"/>
</w:trPr>
<w:tc>
<w:tcPr>
@ -3690,6 +3720,7 @@
<w:sz-cs w:val="15"/>
</w:rPr>
</w:pPr>
<aml:annotation aml:id="4" w:type="Word.Bookmark.Start" w:name="_Hlk195714147"/>
<w:r>
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
@ -3817,6 +3848,7 @@
</w:tc>
</w:tr>
<aml:annotation aml:id="0" w:type="Word.Bookmark.End"/>
<aml:annotation aml:id="4" w:type="Word.Bookmark.End"/>
</w:tbl>
<w:p wsp:rsidR="00B64B18" wsp:rsidRPr="004D6F8C" wsp:rsidRDefault="00B64B18">
<w:pPr>
@ -3827,66 +3859,6 @@
</w:pPr>
</w:p>
<w:sectPr wsp:rsidR="00B64B18" wsp:rsidRPr="004D6F8C" wsp:rsidSect="00FC2170">
<w:hdr w:type="even">
<w:p wsp:rsidR="00AF0D39" wsp:rsidRDefault="00AF0D39" wsp:rsidP="00AF0D39">
<w:pPr>
<w:pStyle w:val="ae"/>
<w:rPr>
<w:rFonts w:hint="fareast"/>
</w:rPr>
</w:pPr>
</w:p>
</w:hdr>
<w:hdr w:type="odd">
<w:p wsp:rsidR="00AF0D39" wsp:rsidRDefault="00AF0D39" wsp:rsidP="00AF0D39">
<w:pPr>
<w:pStyle w:val="ae"/>
<w:rPr>
<w:rFonts w:hint="fareast"/>
</w:rPr>
</w:pPr>
</w:p>
</w:hdr>
<w:ftr w:type="even">
<w:p wsp:rsidR="00AF0D39" wsp:rsidRDefault="00AF0D39">
<w:pPr>
<w:pStyle w:val="af0"/>
<w:rPr>
<w:rFonts w:hint="fareast"/>
</w:rPr>
</w:pPr>
</w:p>
</w:ftr>
<w:ftr w:type="odd">
<w:p wsp:rsidR="00AF0D39" wsp:rsidRDefault="00AF0D39">
<w:pPr>
<w:pStyle w:val="af0"/>
<w:rPr>
<w:rFonts w:hint="fareast"/>
</w:rPr>
</w:pPr>
</w:p>
</w:ftr>
<w:hdr w:type="first">
<w:p wsp:rsidR="00AF0D39" wsp:rsidRDefault="00AF0D39">
<w:pPr>
<w:pStyle w:val="ae"/>
<w:rPr>
<w:rFonts w:hint="fareast"/>
</w:rPr>
</w:pPr>
</w:p>
</w:hdr>
<w:ftr w:type="first">
<w:p wsp:rsidR="00AF0D39" wsp:rsidRDefault="00AF0D39">
<w:pPr>
<w:pStyle w:val="af0"/>
<w:rPr>
<w:rFonts w:hint="fareast"/>
</w:rPr>
</w:pPr>
</w:p>
</w:ftr>
<w:pgSz w:w="11906" w:h="16838" w:code="9"/>
<w:pgMar w:top="720" w:right="284" w:bottom="284" w:left="720" w:header="851" w:footer="992"
w:gutter="0"/>

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

@ -71,7 +71,7 @@ public enum ProcDefEnum {
LOANVEHCLEARANCEAPPLY("车辆远程解控申请", "process_zbzenr9b:2:7782504"),
LOANRESTOREREPORTAPPLY("车辆交回事前报备申请", "process_w796wtt7:1:7822504"),
LOANREDEMPTIONAPPLY("车辆交回赎回申请", "process_qu4fq4r6:1:7820004"),
LOANRETUENINBOUNDAPPLY("交回车辆入库申请", "process_h0i1vnn8:1:7945004"),
LOANRETUENINBOUNDAPPLY("交回车辆入库申请", "process_h0i1vnn8:2:19482504"),
LOANSUBLETAPPLY("交回车辆二次转租申请", "process_lu7pdwzs:1:7940004"),
LOANOUTBOUNDVEHAPPLY("交回车辆出库申请", "process_14spbdx8:1:7982504"),
LOANSECONDSALEAPPLY("交车车辆二次销售申请", "process_6kb1z0pe:4:8110004"),

22
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/FlowableUuidConfig.java
View File

@ -0,0 +1,22 @@
package com.yxt.anrui.flowable.config;
import org.flowable.common.engine.impl.persistence.StrongUuidGenerator;
import org.flowable.spring.SpringProcessEngineConfiguration;
import org.flowable.spring.boot.EngineConfigurationConfigurer;
import org.flowable.spring.boot.ProcessEngineConfigurationConfigurer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* @description:
* @author: dimengzhe
* @date: 2025/4/21
**/
@Configuration
public class FlowableUuidConfig {
@Bean
public EngineConfigurationConfigurer<SpringProcessEngineConfiguration> idGeneratorConfigurer() {
return configuration -> configuration.setIdGenerator(new StrongUuidGenerator());
}
}

39
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVeh.java
View File

@ -31,56 +31,43 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-riskcenter(催收措施申请) <br/>
* File: LoanBeCollectionVeh.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVeh <br/>
* Description: 逾期催收车辆. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-12-12 16:06:20 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "逾期催收车辆", description = "逾期催收车辆")
@TableName("loan_be_collection_veh")
public class LoanBeCollectionVeh extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("车架号")
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("车牌号")
@ApiModelProperty("车牌号")
private String carNum; // 车牌号
@ApiModelProperty("客户姓名")
@ApiModelProperty("客户姓名")
private String customerName; // 客户姓名
@ApiModelProperty("客户联系电话")
@ApiModelProperty("客户联系电话")
private String customerPhone; // 客户联系电话
@ApiModelProperty("贷款合同编号")
@ApiModelProperty("贷款合同编号")
private String loanContractNo; // 贷款合同编号
@ApiModelProperty("资方")
@ApiModelProperty("资方")
private String bankName; // 资方
@ApiModelProperty("资方合同编号")
private String bankContractNo;
@ApiModelProperty("贷款人姓名")
private String borrowerName;
@ApiModelProperty("首次逾期日期")
@ApiModelProperty("首次逾期日期")
private String firstBeDate; // 首次逾期日期
@ApiModelProperty("逾期金额")
@ApiModelProperty("逾期金额")
private String beOverdueMoney; // 逾期金额
@ApiModelProperty("逾期期数")
@ApiModelProperty("逾期期数")
private String beOverduePeriod; // 逾期期数
@ApiModelProperty("逾期金额换算期数")
@ApiModelProperty("逾期金额换算期数")
private String beOverdueMoneyAndPeriod; // 逾期金额换算期数
@ApiModelProperty("锁车费用")
@ApiModelProperty("锁车费用")
private String lockCarMoney; // 锁车费用
@ApiModelProperty("锁车状态")
@ApiModelProperty("锁车状态")
private String lockCarState; // 锁车状态
@ApiModelProperty("销售订单车辆sid")
private String saleVehSid; // 销售订单车辆sid
@ApiModelProperty("催收申请sid")
@ApiModelProperty("催收申请sid")
private String mainSid; // 催收申请sid
}

32
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDbrDetailsVo.java
View File

@ -25,7 +25,6 @@
*********************************************************/
package com.yxt.anrui.riskcenter.api.loanbecollectionveh;
import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionFileVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
@ -35,19 +34,6 @@ import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* Project: anrui-riskcenter(家访考察) <br/>
* File: LoanHomevisitInvestigateOtherpeoVo.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoVo <br/>
* Description: 家访考察-其他人员 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-08-10 15:13:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "家访考察-其他人员 视图数据详情", description = "家访考察-其他人员 视图数据详情")
public class LoanBeCollectionVehDbrDetailsVo implements Vo {
@ -56,23 +42,23 @@ public class LoanBeCollectionVehDbrDetailsVo implements Vo {
@ApiModelProperty("人员身份key")
private String peoTypeKey;
@ApiModelProperty("人员身份")
@ApiModelProperty("人员身份")
private String peoType; // 人员身份
@ApiModelProperty("姓名")
@ApiModelProperty("姓名")
private String peoName; // 姓名
@ApiModelProperty("身份证号")
@ApiModelProperty("身份证号")
private String idNumber; // 身份证号
@ApiModelProperty("手机号")
@ApiModelProperty("手机号")
private String mobile; // 手机号
@ApiModelProperty("户籍地址")
@ApiModelProperty("户籍地址")
private String peoDomAddress; // 户籍地址
@ApiModelProperty("现住址")
@ApiModelProperty("现住址")
private String peoPreAddress; // 现住址
@ApiModelProperty("工作单位")
@ApiModelProperty("工作单位")
private String workUnit; // 工作单位
@ApiModelProperty("职业key")
@ApiModelProperty("职业key")
private String peoCareerKey; // 职业key
@ApiModelProperty("职业value")
@ApiModelProperty("职业value")
private String peoCareerValue; // 职业value
@ApiModelProperty("家访考察表sid")
private String mainSid; // 家访考察表sid

33
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDbrDto.java
View File

@ -25,7 +25,6 @@
*********************************************************/
package com.yxt.anrui.riskcenter.api.loanbecollectionveh;
import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionFileVo;
import com.yxt.common.core.dto.Dto;
import com.yxt.common.core.vo.Vo;
@ -36,44 +35,30 @@ import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* Project: anrui-riskcenter(家访考察) <br/>
* File: LoanHomevisitInvestigateOtherpeoVo.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoVo <br/>
* Description: 家访考察-其他人员 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-08-10 15:13:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "家访考察-其他人员 视图数据详情", description = "家访考察-其他人员 视图数据详情")
public class LoanBeCollectionVehDbrDto implements Dto {
private String sid;
@ApiModelProperty("人员身份key")
private String peoTypeKey;
@ApiModelProperty("人员身份")
@ApiModelProperty("人员身份")
private String peoType; // 人员身份
@ApiModelProperty("姓名")
@ApiModelProperty("姓名")
private String peoName; // 姓名
@ApiModelProperty("身份证号")
@ApiModelProperty("身份证号")
private String idNumber; // 身份证号
@ApiModelProperty("手机号")
@ApiModelProperty("手机号")
private String mobile; // 手机号
@ApiModelProperty("户籍地址")
@ApiModelProperty("户籍地址")
private String peoDomAddress; // 户籍地址
@ApiModelProperty("现住址")
@ApiModelProperty("现住址")
private String peoPreAddress; // 现住址
@ApiModelProperty("工作单位")
@ApiModelProperty("工作单位")
private String workUnit; // 工作单位
@ApiModelProperty("职业key")
@ApiModelProperty("职业key")
private String peoCareerKey; // 职业key
@ApiModelProperty("职业value")
@ApiModelProperty("职业value")
private String peoCareerValue; // 职业value
@ApiModelProperty("家访考察表sid")
private String mainSid; // 家访考察表sid

14
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDetailsVo.java
View File

@ -25,7 +25,6 @@
*********************************************************/
package com.yxt.anrui.riskcenter.api.loanbecollectionveh;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionFileVo;
import com.yxt.common.core.vo.Vo;
@ -39,19 +38,6 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* Project: anrui-riskcenter(催收措施申请) <br/>
* File: LoanBeCollectionVehVo.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehVo <br/>
* Description: 逾期催收车辆 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-12-12 16:06:20 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "逾期催收车辆 视图数据详情", description = "逾期催收车辆 视图数据详情")
public class LoanBeCollectionVehDetailsVo implements Vo {

36
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDto.java
View File

@ -25,7 +25,6 @@
*********************************************************/
package com.yxt.anrui.riskcenter.api.loanbecollectionveh;
import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionFileVo;
import com.yxt.common.core.dto.Dto;
@ -36,56 +35,43 @@ import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* Project: anrui-riskcenter(催收措施申请) <br/>
* File: LoanBeCollectionVehDto.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDto <br/>
* Description: 逾期催收车辆 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-12-12 16:06:20 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "逾期催收车辆 数据传输对象", description = "逾期催收车辆 数据传输对象")
public class LoanBeCollectionVehDto implements Dto {
private String sid; // sid
@ApiModelProperty("车架号")
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("车牌号")
@ApiModelProperty("车牌号")
private String carNum; // 车牌号
@ApiModelProperty("客户名称")
private String custName;
@ApiModelProperty("联系电话")
private String custPhone;
@ApiModelProperty("贷款合同编号")
@ApiModelProperty("贷款合同编号")
private String loanContractNo; // 贷款合同编号
@ApiModelProperty("资方")
@ApiModelProperty("资方")
private String bankName; // 资方
@ApiModelProperty("资方合同编号")
private String bankContractNo;
@ApiModelProperty("贷款人姓名")
private String borrowerName;
@ApiModelProperty("首次逾期日期")
@ApiModelProperty("首次逾期日期")
private String firstBeDate; // 首次逾期日期
@ApiModelProperty("逾期金额")
@ApiModelProperty("逾期金额")
private String beOverdueMoney; // 逾期金额
@ApiModelProperty("逾期期数")
@ApiModelProperty("逾期期数")
private String beOverduePeriod; // 逾期期数
@ApiModelProperty("逾期金额换算期数")
@ApiModelProperty("逾期金额换算期数")
private String beOverdueMoneyAndPeriod; // 逾期金额换算期数
@ApiModelProperty("锁车费用")
@ApiModelProperty("锁车费用")
private String lockCarMoney; // 锁车费用
@ApiModelProperty("锁车状态")
@ApiModelProperty("锁车状态")
private String lockCarState; // 锁车状态
@ApiModelProperty("销售订单车辆sid")
private String saleVehSid; // 销售订单车辆sid
@ApiModelProperty("催收申请sid")
@ApiModelProperty("催收申请sid")
private String mainSid; // 催收申请sid
@ApiModelProperty

16
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFeignFallback.java
View File

@ -25,27 +25,11 @@
*********************************************************/
package com.yxt.anrui.riskcenter.api.loanbecollectionveh;
import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyDto;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* Project: anrui-riskcenter(催收措施申请) <br/>
* File: LoanBeCollectionVehFeignFallback.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFeignFallback <br/>
* Description: 逾期催收车辆. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-12-12 16:06:20 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class LoanBeCollectionVehFeignFallback implements LoanBeCollectionVehFeign {

15
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFile.java
View File

@ -25,30 +25,15 @@
*********************************************************/
package com.yxt.anrui.riskcenter.api.loanbecollectionveh;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* Project: anrui-riskcenter(催收措施申请) <br/>
* File: LoanBeCollectionVehVo.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehVo <br/>
* Description: 逾期催收车辆 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-12-12 16:06:20 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "逾期催收车辆 视图数据详情", description = "逾期催收车辆 视图数据详情")
public class LoanBeCollectionVehFile implements Vo {

1
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehInit.java
View File

@ -3,7 +3,6 @@ package com.yxt.anrui.riskcenter.api.loanbecollectionveh;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
import java.util.Map;

40
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehQuery.java
View File

@ -25,55 +25,41 @@
*********************************************************/
package com.yxt.anrui.riskcenter.api.loanbecollectionveh;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-riskcenter(催收措施申请) <br/>
* File: LoanBeCollectionVehQuery.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehQuery <br/>
* Description: 逾期催收车辆 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-12-12 16:06:20 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "逾期催收车辆 查询条件", description = "逾期催收车辆 查询条件")
public class LoanBeCollectionVehQuery implements Query {
@ApiModelProperty("车架号")
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("车牌号")
@ApiModelProperty("车牌号")
private String carNum; // 车牌号
@ApiModelProperty("客户姓名")
@ApiModelProperty("客户姓名")
private String customerName; // 客户姓名
@ApiModelProperty("客户联系电话")
@ApiModelProperty("客户联系电话")
private String customerPhone; // 客户联系电话
@ApiModelProperty("贷款合同编号")
@ApiModelProperty("贷款合同编号")
private String loanContractNo; // 贷款合同编号
@ApiModelProperty("资方")
@ApiModelProperty("资方")
private String bankName; // 资方
@ApiModelProperty("首次逾期日期")
@ApiModelProperty("首次逾期日期")
private String firstBeDate; // 首次逾期日期
@ApiModelProperty("逾期金额")
@ApiModelProperty("逾期金额")
private String beOverdueMoney; // 逾期金额
@ApiModelProperty("逾期期数")
@ApiModelProperty("逾期期数")
private String beOverduePeriod; // 逾期期数
@ApiModelProperty("逾期金额换算期数")
@ApiModelProperty("逾期金额换算期数")
private String beOverdueMoneyAndPeriod; // 逾期金额换算期数
@ApiModelProperty("锁车费用")
@ApiModelProperty("锁车费用")
private String lockCarMoney; // 锁车费用
@ApiModelProperty("锁车状态")
@ApiModelProperty("锁车状态")
private String lockCarState; // 锁车状态
@ApiModelProperty("催收申请sid")
@ApiModelProperty("催收申请sid")
private String mainSid; // 催收申请sid
}

42
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehVo.java
View File

@ -25,57 +25,41 @@
*********************************************************/
package com.yxt.anrui.riskcenter.api.loanbecollectionveh;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-riskcenter(催收措施申请) <br/>
* File: LoanBeCollectionVehVo.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehVo <br/>
* Description: 逾期催收车辆 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-12-12 16:06:20 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "逾期催收车辆 视图数据对象", description = "逾期催收车辆 视图数据对象")
public class LoanBeCollectionVehVo implements Vo {
private String sid; // sid
@ApiModelProperty("车架号")
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("车牌号")
@ApiModelProperty("车牌号")
private String carNum; // 车牌号
@ApiModelProperty("客户姓名")
@ApiModelProperty("客户姓名")
private String customerName; // 客户姓名
@ApiModelProperty("客户联系电话")
@ApiModelProperty("客户联系电话")
private String customerPhone; // 客户联系电话
@ApiModelProperty("贷款合同编号")
@ApiModelProperty("贷款合同编号")
private String loanContractNo; // 贷款合同编号
@ApiModelProperty("资方")
@ApiModelProperty("资方")
private String bankName; // 资方
@ApiModelProperty("首次逾期日期")
@ApiModelProperty("首次逾期日期")
private String firstBeDate; // 首次逾期日期
@ApiModelProperty("逾期金额")
@ApiModelProperty("逾期金额")
private String beOverdueMoney; // 逾期金额
@ApiModelProperty("逾期期数")
@ApiModelProperty("逾期期数")
private String beOverduePeriod; // 逾期期数
@ApiModelProperty("逾期金额换算期数")
@ApiModelProperty("逾期金额换算期数")
private String beOverdueMoneyAndPeriod; // 逾期金额换算期数
@ApiModelProperty("锁车费用")
@ApiModelProperty("锁车费用")
private String lockCarMoney; // 锁车费用
@ApiModelProperty("锁车状态")
@ApiModelProperty("锁车状态")
private String lockCarState; // 锁车状态
@ApiModelProperty("催收申请sid")
@ApiModelProperty("催收申请sid")
private String mainSid; // 催收申请sid
}

68
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerDetailsVo.java
View File

@ -25,85 +25,71 @@
*********************************************************/
package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-riskcenter(家访考察) <br/>
* File: LoanHomevisitInvestigateCustomerVo.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerVo <br/>
* Description: 家访考察-客户信息 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-08-10 15:13:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "家访考察-客户信息 视图数据详情", description = "家访考察-客户信息 视图数据详情")
public class LoanHomevisitInvestigateCustomerDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("是否为实际购车人")
@ApiModelProperty("是否为实际购车人")
private Boolean isConfirmRealBuyer; // 是否为实际购车人
@ApiModelProperty("借款人sid")
@ApiModelProperty("借款人sid")
private String borrowerSid; // 借款人sid
@ApiModelProperty("借款人姓名")
@ApiModelProperty("借款人姓名")
private String borrowerName; // 借款人姓名
@ApiModelProperty("借款人身份证号")
@ApiModelProperty("借款人身份证号")
private String borrowerIdNumber; // 借款人身份证号
@ApiModelProperty("借款人手机号")
@ApiModelProperty("借款人手机号")
private String borrowerMobile; // 借款人手机号
@ApiModelProperty("借款人职业key")
@ApiModelProperty("借款人职业key")
private String borrowerCareerKey; // 借款人职业key
@ApiModelProperty("借款人职业value")
@ApiModelProperty("借款人职业value")
private String borrowerCareerValue; // 借款人职业value
@ApiModelProperty("婚姻状况key")
@ApiModelProperty("婚姻状况key")
private String maritalStatusKey; // 婚姻状况key
@ApiModelProperty("婚姻状况value")
@ApiModelProperty("婚姻状况value")
private String maritalStatusValue; // 婚姻状况value
@ApiModelProperty("有无子女key")
@ApiModelProperty("有无子女key")
private String isChildrenKey; // 有无子女key
@ApiModelProperty("有无子女value")
@ApiModelProperty("有无子女value")
private String isChildrenValue; // 有无子女value
@ApiModelProperty("借款人户籍地址")
@ApiModelProperty("借款人户籍地址")
private String borrowerDomAddress; // 借款人户籍地址
@ApiModelProperty("借款人现住址")
@ApiModelProperty("借款人现住址")
private String borrowerPreAddress; // 借款人现住址
@ApiModelProperty("银行卡号")
@ApiModelProperty("银行卡号")
private String bankCardNo; // 银行卡号
@ApiModelProperty("开户行")
@ApiModelProperty("开户行")
private String depositBank; // 开户行
@ApiModelProperty("配偶姓名")
@ApiModelProperty("配偶姓名")
private String spouseName; // 配偶姓名
@ApiModelProperty("配偶身份证号")
@ApiModelProperty("配偶身份证号")
private String spouseIdNumber; // 配偶身份证号
@ApiModelProperty("配偶手机号")
@ApiModelProperty("配偶手机号")
private String spouseMobile; // 配偶手机号
@ApiModelProperty("配偶职业key")
@ApiModelProperty("配偶职业key")
private String spouseCareerKey; // 配偶职业key
@ApiModelProperty("配偶职业value")
@ApiModelProperty("配偶职业value")
private String spouseCareerValue; // 配偶职业value
@ApiModelProperty("配偶户籍地址")
@ApiModelProperty("配偶户籍地址")
private String spouseDomAddress; // 配偶户籍地址
@ApiModelProperty("配偶现住址")
@ApiModelProperty("配偶现住址")
private String spousePreAddress; // 配偶现住址
@ApiModelProperty("紧急联系人")
@ApiModelProperty("紧急联系人")
private String emergencyContact; // 紧急联系人
@ApiModelProperty("紧急联系电话")
@ApiModelProperty("紧急联系电话")
private String emergencyMobile; // 紧急联系电话
@ApiModelProperty("关系key")
@ApiModelProperty("关系key")
private String relationshipKey; // 关系key
@ApiModelProperty("关系value")
@ApiModelProperty("关系value")
private String relationshipValue; // 关系value
@ApiModelProperty("家访考察表sid")
@ApiModelProperty("家访考察表sid")
private String mainSid; // 家访考察表sid
@ApiModelProperty("车辆登记在(1客户名下,2挂靠公司名下)")

16
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/AlrepaidAndArrVo.java
View File

@ -37,20 +37,20 @@ import java.util.List;
@Data
public class AlrepaidAndArrVo implements Vo {
@ApiModelProperty("已还金额")
@ApiModelProperty("已还金额")
private String alRepaidMoney; // 已还金额
@ApiModelProperty("当前逾期金额")
@ApiModelProperty("当前逾期金额")
private String currentBeMoney; // 当前逾期金额
@ApiModelProperty("其中资金占用费")
@ApiModelProperty("其中资金占用费")
private String wheFundOccMoney; // 其中资金占用费
@ApiModelProperty("未到期金额")
@ApiModelProperty("未到期金额")
private String unexpiredMoney; // 未到期金额
@ApiModelProperty("总期数")
@ApiModelProperty("总期数")
private String nper; // 总期数
@ApiModelProperty("当前期数")
@ApiModelProperty("当前期数")
private String currentPeriod; // 当前期数
@ApiModelProperty("已还金额换算期数")
@ApiModelProperty("已还金额换算期数")
private String alRepaidMoneyConPeriod; // 已还金额换算期数
@ApiModelProperty("逾期金额换算期数")
@ApiModelProperty("逾期金额换算期数")
private String beOverdueMoneyAndPeriod; // 逾期金额换算期数
}

31
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java
View File

@ -30,6 +30,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower;
import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice;
@ -65,19 +67,6 @@ import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
* Project: anrui-riskcenter(逾期催收记录) <br/>
* File: LoanBeCollectionRecordService.java <br/>
* Class: com.yxt.anrui.riskcenter.biz.loanbecollectionrecord.LoanBeCollectionRecordService <br/>
* Description: 逾期催收记录 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-12-11 13:45:40 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class LoanBeCollectionRecordService extends MybatisBaseService<LoanBeCollectionRecordMapper, LoanBeCollectionRecord> {
@ -98,7 +87,7 @@ public class LoanBeCollectionRecordService extends MybatisBaseService<LoanBeColl
@Autowired
private BusSalesOrderFeign busSalesOrderFeign;
@Autowired
private LoanSolutionsService loanSolutionsService;
private BusSalesOrderBorrowerFeign busSalesOrderBorrowerFeign;
@Autowired
private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
@Autowired
@ -192,11 +181,17 @@ public class LoanBeCollectionRecordService extends MybatisBaseService<LoanBeColl
public LoanBeCollectionRecordInit init(String saleVehSid) {
LoanBeCollectionRecordInit loanBeCollectionRecordInit = new LoanBeCollectionRecordInit();
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(saleVehSid).getData();
BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerFeign.fetchEntityBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.fetchByBorrowerSid(busSalesOrderVehicle.getBorrowerSid());
loanBeCollectionRecordInit.setBorrowerName(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerName());
loanBeCollectionRecordInit.setBorrowerMobile(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerMobile());
loanBeCollectionRecordInit.setSpouseName(loanHomevisitInvestigateCustomerDetailsVo.getSpouseName());
loanBeCollectionRecordInit.setSpouseMobile(loanHomevisitInvestigateCustomerDetailsVo.getSpouseMobile());
if (loanHomevisitInvestigateCustomerDetailsVo == null){
loanBeCollectionRecordInit.setBorrowerName(busSalesOrderBorrower.getBorrowerName());
loanBeCollectionRecordInit.setBorrowerMobile(busSalesOrderBorrower.getMobile());
}else {
loanBeCollectionRecordInit.setBorrowerName(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerName());
loanBeCollectionRecordInit.setBorrowerMobile(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerMobile());
loanBeCollectionRecordInit.setSpouseName(loanHomevisitInvestigateCustomerDetailsVo.getSpouseName());
loanBeCollectionRecordInit.setSpouseMobile(loanHomevisitInvestigateCustomerDetailsVo.getSpouseMobile());
}
List<LoanBeCollectionRecordVehInit> loanBeCollectionRecordVehInits = loanBeOverdueVehService.initVehListByBorrSid(busSalesOrderVehicle.getBorrowerSid());
for (LoanBeCollectionRecordVehInit loanBeCollectionRecordVehInit : loanBeCollectionRecordVehInits) {
List<LoanBeCollectionVehFile> loanBeCollectionVehFiles = new ArrayList<>();

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

@ -63,4 +63,7 @@ public interface LoanBeCollectionVehMapper extends BaseMapper<LoanBeCollectionVe
@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);
@Select("select mainSid from loan_be_collection_veh where saleVehSid = #{saleVehSid}")
String selBySaleVehSid(String saleVehSid);
}

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

@ -147,13 +147,12 @@ public class LoanBeCollectionVehService extends MybatisBaseService<LoanBeCollect
}
public LoanBeCollectionVehDbrDetailsVo initDbr(String saleVehSid) {
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(saleVehSid).getData();
String sid = loanHomevisitInvestigateService.selectByBorrSid(busSalesOrderVehicle.getBorrowerSid());
LoanHomevisitInvestigateOtherpeoDetailsVo loanHomevisitInvestigateOtherpeoDetailsVo = loanHomevisitInvestigateOtherpeoService.selByMainSidAndSaleVehSid(sid, saleVehSid);
String applySid = baseMapper.selBySaleVehSid(saleVehSid);
LoanHomevisitInvestigateOtherpeoDetailsVo loanHomevisitInvestigateOtherpeoDetailsVo = loanHomevisitInvestigateOtherpeoService.selByMainSidAndSaleVehSid(applySid, saleVehSid);
LoanBeCollectionVehDbrDetailsVo loanBeCollectionVehDbrDetailsVo = new LoanBeCollectionVehDbrDetailsVo();
BeanUtil.copyProperties(loanHomevisitInvestigateOtherpeoDetailsVo, loanBeCollectionVehDbrDetailsVo);
loanBeCollectionVehDbrDetailsVo.setSaleVehSid(saleVehSid);
loanBeCollectionVehDbrDetailsVo.setMainSid(sid);
loanBeCollectionVehDbrDetailsVo.setMainSid(applySid);
List<LoanHomevisitInvestigateFileDetailsVo> dbrsfzs = loanHomevisitInvestigateFileService.selBySaleVehSidAndTypeKey(saleVehSid, LoanAttachTypeEnum.DBRSFZ.getAttachType());
List<LoanBeCollectionFileVo> sfzs = new ArrayList<>();
if (dbrsfzs != null && dbrsfzs.size() > 0){

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

@ -90,7 +90,7 @@
WHERE lbca.collMeasure LIKE '%远程控制%'
AND lbca.nodeState = '已办结'
) lbcv ON lbcv.saleVehSid = lrpd.busVinSid AND lbcv.rn = 1
WHERE lrpd.dueDate &lt; CURDATE() -- 移除DATE_FORMAT函数
WHERE lrpd.dueDate &lt;= lrpd.updateTime -- 移除DATE_FORMAT函数
GROUP BY lrpd.sid
HAVING (lrpd.dueMoney - COALESCE(SUM(lrh.actualMoney), 0)) > 0
) a1
@ -108,7 +108,7 @@
FROM loan_fund_day lfd
JOIN loan_repayment_plan_details lrpd
ON lrpd.sid = lfd.busSid
WHERE lrpd.dueDate &lt; CURDATE()
WHERE lrpd.dueDate &lt;= lrpd.updateTime
GROUP BY lrpd.busVinSid
) lfd_sum ON lfd_sum.busVinSid = a1.busVinSid
<where>
@ -147,7 +147,8 @@
) AS beOverdueMoneyAndPeriod,
a1.busVinSid AS saleVehSid,
MAX(a1.salesOrderSid) AS salesOrderSid,
MAX(a1.lockCarState) AS lockCarState
MAX(a1.lockCarState) AS lockCarState,
a1.nowOverdue
FROM (
SELECT
lrpd.sid,
@ -168,7 +169,8 @@
ct.mobile,
lrpd.borrowerSid,
lrpd.salesOrderSid,
lbcv_agg.lockCarState
lbcv_agg.lockCarState,
if(lrpd.dueDate &lt;= lrpd.updateTime,0,1) as nowOverdue
FROM
loan_repayment_plan_details lrpd
LEFT JOIN loan_repayment_history lrh
@ -233,6 +235,7 @@
) a1
WHERE
a1.borrowerSid = #{borrowerSid}
AND a1.nowOverdue = 0
GROUP BY
a1.loanContractNo,
a1.vinNo,
@ -283,7 +286,8 @@
MAX(a1.reaRepaymentName) AS repaymentName,
MAX(a1.createTime) AS createTime,
a1.orgSidPath,
MAX(a1.lockCarState) AS lockCarState -- 保证聚合正确性
MAX(a1.lockCarState) AS lockCarState, -- 保证聚合正确性
a1.nowOverdue
FROM (
SELECT
lrpd.sid,
@ -313,87 +317,7 @@
WHEN 2 THEN '控制失败'
WHEN 3 THEN '已解控'
END AS lockCarState,
CASE
WHEN lrpd.dueDate > lrpd.updateTime or lrpd.updateTime IS NULL THEN '1'
WHEN lrpd.dueDate &lt;= lrpd.updateTime AND (IFNULL(
(
lrpd.dueMoney - IFNULL((
SELECT
SUM(
IFNULL( lrh.actualMoney, 0 ))
FROM
loan_repayment_history AS lrh
WHERE
lrh.planDetailSid = lrpd.sid
AND lrh.updateState = '1'
),
0
)),
0
) + IFNULL((
SELECT
( fjj.reveivableMoney - fjj.m )
FROM
(
SELECT
IFNULL((
SELECT
SUM( subscriptionMoney )
FROM
anrui_fin.fin_selected_receivables_detailed AS s
WHERE
s.auditState = '3'
AND s.receivablesSid = fj.sid
),
0
) AS m,
fj.*
FROM
( SELECT j.busSid, j.sid, j.reveivableMoney FROM anrui_fin.fin_uncollected_receivables_detailed_jr AS j WHERE j.payCostTitleKey = '006' ) AS fj
) AS fjj
WHERE
fjj.busSid = lrpd.sid
),0) + IFNULL(lrpd.paymentInterest,0)) > 0 THEN '0'
WHEN lrpd.dueDate &lt;= lrpd.updateTime AND (IFNULL(
(
lrpd.dueMoney - IFNULL((
SELECT
SUM(
IFNULL( lrh.actualMoney, 0 ))
FROM
loan_repayment_history AS lrh
WHERE
lrh.planDetailSid = lrpd.sid
AND lrh.updateState = '1'
),
0
)),
0
) + IFNULL((
SELECT
( fjj.reveivableMoney - fjj.m )
FROM
(
SELECT
IFNULL((
SELECT
SUM( subscriptionMoney )
FROM
anrui_fin.fin_selected_receivables_detailed AS s
WHERE
s.auditState = '3'
AND s.receivablesSid = fj.sid
),
0
) AS m,
fj.*
FROM
( SELECT j.busSid, j.sid, j.reveivableMoney FROM anrui_fin.fin_uncollected_receivables_detailed_jr AS j WHERE j.payCostTitleKey = '006' ) AS fj
) AS fjj
WHERE
fjj.busSid = lrpd.sid
),0) + IFNULL(lrpd.paymentInterest,0)) &lt;= 0 THEN '1'
END AS nowOverdue
if(lrpd.dueDate &lt;= lrpd.updateTime,0,1) as nowOverdue
FROM loan_repayment_plan_details lrpd
LEFT JOIN loan_repayment_history lrh
ON lrh.planDetailSid = lrpd.sid

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

@ -164,6 +164,7 @@ public class LoanBeOverdueVehService {
if (StringUtils.isNotBlank(query.getNames())) {
qw.and(wrapper -> wrapper.like("a1.loanContractNo", query.getNames()).or().like("a1.borrowerName", query.getNames()).or().like("a1.vinNo", query.getNames()));
}
qw.eq("a1.nowOverdue", "0");
String collectionStartDate = query.getCollectionStartDate();
String collectionEndDate = query.getCollectionEndDate();
qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (a1.createTime,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
@ -283,6 +284,7 @@ public class LoanBeOverdueVehService {
if (StringUtils.isNotBlank(query.getVinNo())) {
qw.like("a1.vinNo", query.getVinNo());
}
qw.eq("a1.nowOverdue", "0");
String collectionStartDate = query.getCollectionStartDate();
String collectionEndDate = query.getCollectionEndDate();
qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (a1.createTime,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java
View File

@ -886,7 +886,7 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
//循环获取车辆信息
for (LoanDiffDetailssVo loanDiffDetailssVo : data.getLoanDiffDetails()) {
LoanDiffPdfVo loanDiffPdfVo = new LoanDiffPdfVo();
loanDiffPdfVo.setVinNo(loanDiffDetailssVo.getVinNo());
loanDiffPdfVo.setVinNo(loanDiffDetailssVo.getVinNo().substring(loanDiffDetailssVo.getVinNo().length() - 8));
loanDiffPdfVo.setYf1(loanDiffDetailssVo.getMakeLoan() == null ? "0" : loanDiffDetailssVo.getMakeLoan().toString());
loanDiffPdfVo.setSf2(loanDiffDetailssVo.getRealityLoan() == null ? "0" : loanDiffDetailssVo.getRealityLoan().toString());
loanDiffPdfVo.setCe3(loanDiffDetailssVo.getDiffLoan() == null ? "0" : loanDiffDetailssVo.getDiffLoan().toString());

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

@ -223,7 +223,7 @@ public class LoanLawsuitApplyService extends MybatisBaseService<LoanLawsuitApply
}
for (LoanLawsuitVehVo veh : vehList) {
String busVinSid = veh.getBusVinSid();
AlrepaidAndArrVo alrepaidAndArr = loanRestoreReportApplyService.getAlrepaidAndArr(busVinSid);
AlrepaidAndArrVo alrepaidAndArr = loanRestoreReportApplyService.getAlrepaidAndArr2(busVinSid);
if (null != alrepaidAndArr) {
//已还金额
if (StringUtils.isNotBlank(alrepaidAndArr.getAlRepaidMoney())) {

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

@ -271,7 +271,7 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
if (StringUtils.isNotBlank(rkSid)) {
vo.setRksqSid(rkSid);
}
AlrepaidAndArrVo alrepaidAndArr = loanRestoreReportApplyService.getAlrepaidAndArr(redemptionInitVo.getBusVinSid());
AlrepaidAndArrVo alrepaidAndArr = loanRestoreReportApplyService.getAlrepaidAndArr2(redemptionInitVo.getBusVinSid());
if (null != alrepaidAndArr) {
//已还金额
if (StringUtils.isNotBlank(alrepaidAndArr.getAlRepaidMoney())) {
@ -500,7 +500,7 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
if (StringUtils.isNotBlank(rkSid)) {
vo.setRksqSid(rkSid);
}
AlrepaidAndArrVo alrepaidAndArr = loanRestoreReportApplyService.getAlrepaidAndArr(vo.getBusVinSid());
AlrepaidAndArrVo alrepaidAndArr = loanRestoreReportApplyService.getAlrepaidAndArr2(vo.getBusVinSid());
if (null != alrepaidAndArr) {
//已还金额
if (StringUtils.isNotBlank(alrepaidAndArr.getAlRepaidMoney())) {
@ -1215,7 +1215,7 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
if (StringUtils.isNotBlank(rkSid)) {
vo.setRksqSid(rkSid);
}
AlrepaidAndArrVo alrepaidAndArr = loanRestoreReportApplyService.getAlrepaidAndArr(vo.getCsjlSid());
AlrepaidAndArrVo alrepaidAndArr = loanRestoreReportApplyService.getAlrepaidAndArr2(vo.getCsjlSid());
if (null != alrepaidAndArr) {
String allPeriod = "";
String nowBeMoney = "";

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

@ -72,4 +72,8 @@ public interface LoanRestoreReportApplyMapper extends BaseMapper<LoanRestoreRepo
int selectBySid(String join);
LoanRestoreReportCarInfo jkCarInfo(String saleVehSid);
String getDqyqje2(String saleVehSid);
String getYqjehsqs2(String saleVehSid);
}

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

@ -36,7 +36,7 @@
<select id="getYhje" resultType="java.lang.String">
SELECT
IFNULL(SUM(lrh.`actualMoney`),0)
IFNULL(SUM(lrh.actualMoney),0)
FROM
(SELECT DISTINCT
scheduleSid
@ -44,16 +44,16 @@
loan_repayment_plan_details
WHERE busVinSid = #{saleVehSid}) lrpd
LEFT JOIN loan_repayment_history lrh
ON lrpd.`scheduleSid` = lrh.`scheduleSid`
ON lrpd.scheduleSid = lrh.scheduleSid
WHERE lrh.updateState = '1'
</select>
<select id="getWdqje" resultType="java.lang.String">
SELECT
IFNULL(SUM(lrpd.`dueMoney`),0)
IFNULL(SUM(lrpd.dueMoney),0)
FROM loan_repayment_plan_details lrpd
WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &gt;= CURDATE()
AND lrpd.`busVinSid` = #{saleVehSid}
AND lrpd.busVinSid = #{saleVehSid}
</select>
<select id="getZqs" resultType="java.lang.String">
@ -61,24 +61,24 @@
COUNT(lrpd.sid)
FROM
loan_repayment_plan_details lrpd
WHERE lrpd.`busVinSid` = #{saleVehSid}
WHERE lrpd.busVinSid = #{saleVehSid}
</select>
<select id="getDqqs" resultType="java.lang.String">
SELECT
lrpd.`period`
lrpd.period
FROM
loan_repayment_plan_details lrpd
WHERE MONTH(lrpd.dueDate) = MONTH(CURDATE()) AND YEAR(lrpd.dueDate) = YEAR(CURDATE())
AND lrpd.`busVinSid` = #{saleVehSid}
ORDER BY lrpd.`period` DESC
AND lrpd.busVinSid = #{saleVehSid}
ORDER BY lrpd.period DESC
LIMIT 1
</select>
<select id="getYhjehsqs" resultType="java.lang.String">
SELECT
IFNULL(ROUND(
IFNULL(SUM(lrh.`actualMoney`), 0) / (
IFNULL(SUM(lrh.actualMoney), 0) / (
IFNULL(lrs.mainMidRepay, 0) + IFNULL(lrs.otherMidRepay, 0)
),
1
@ -90,7 +90,7 @@
loan_repayment_plan_details
WHERE busVinSid = #{saleVehSid}) lrpd
LEFT JOIN loan_repayment_history lrh
ON lrpd.`scheduleSid` = lrh.`scheduleSid`
ON lrpd.scheduleSid = lrh.scheduleSid
LEFT JOIN loan_repayment_schedule lrs
ON lrpd.scheduleSid = lrs.sid
WHERE lrh.updateState = '1'
@ -101,7 +101,7 @@
(IFNULL(SUM(ss.yq_total), 0)
+ IFNULL(
(SELECT
IFNULL(SUM(lbpv.`bankBeInter`),0)
IFNULL(SUM(lbpv.bankBeInter),0)
FROM
loan_be_padsincere_veh lbpv
WHERE lbpv.saleVehSid = ss.busVinSid),
@ -123,17 +123,17 @@
FROM
(SELECT
(
lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0))
lrpd.dueMoney - SUM(IFNULL(lrh.actualMoney, 0))
) AS yq_total,
lrpd.`busVinSid`,
lrpd.`sid`
lrpd.busVinSid,
lrpd.sid
FROM
`loan_repayment_plan_details` lrpd
LEFT JOIN `loan_repayment_history` lrh
ON lrh.planDetailSid = lrpd.`sid`
loan_repayment_plan_details lrpd
LEFT JOIN loan_repayment_history lrh
ON lrh.planDetailSid = lrpd.sid
WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; CURDATE()
AND lrpd.`busVinSid` = #{saleVehSid}
GROUP BY lrpd.`sid`) ss
AND lrpd.busVinSid = #{saleVehSid}
GROUP BY lrpd.sid) ss
</select>
<select id="getQzzjzyf" resultType="java.lang.String">
@ -155,7 +155,7 @@
(
IFNULL(SUM(ss.yq_total), 0) + IFNULL(
(SELECT
SUM(lbpv.`bankBeInter`)
SUM(lbpv.bankBeInter)
FROM
loan_be_padsincere_veh lbpv
WHERE lbpv.saleVehSid = ss.busVinSid),
@ -171,7 +171,7 @@
FROM
loan_repayment_plan_details lrpd
WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; CURDATE()
AND lrpd.`busVinSid` = #{saleVehSid})),
AND lrpd.busVinSid = #{saleVehSid})),
0
)
) / ss.qjyh,
@ -180,20 +180,20 @@
FROM
(SELECT
(
lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0))
lrpd.dueMoney - SUM(IFNULL(lrh.actualMoney, 0))
) AS yq_total,
lrpd.`busVinSid`,
lrpd.`sid`,
lrpd.busVinSid,
lrpd.sid,
(IFNULL(lrs.mainMidRepay,0) + IFNULL(lrs.otherMidRepay,0)) AS qjyh
FROM
`loan_repayment_plan_details` lrpd
LEFT JOIN `loan_repayment_history` lrh
ON lrh.planDetailSid = lrpd.`sid`
loan_repayment_plan_details lrpd
LEFT JOIN loan_repayment_history lrh
ON lrh.planDetailSid = lrpd.sid
LEFT JOIN loan_repayment_schedule lrs
ON lrpd.scheduleSid = lrs.sid
WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; CURDATE()
AND lrpd.`busVinSid` = #{saleVehSid}
GROUP BY lrpd.`sid`) ss
AND lrpd.busVinSid = #{saleVehSid}
GROUP BY lrpd.sid) ss
</select>
<select id="selectBySid" resultType="int">
@ -205,10 +205,10 @@
<select id="jkCarInfo" resultType="com.yxt.anrui.riskcenter.api.loanrestorereportapply.LoanRestoreReportCarInfo">
SELECT
a1.`loanContractNo`,
a1.loanContractNo,
RIGHT (a1.vinNo, 8) AS vinNo,
a1.vehMark AS carNum,
a1.`bankName`,
a1.bankName,
a1.bankContractNo,
a1.customer AS custName,
a1.borrowerName AS loanName,
@ -217,23 +217,154 @@
(SELECT
lrpd.sid,
lrpd.busVinSid,
lrpd.`loanContractNo`,
lrpd.loanContractNo,
lrpd.bankContractNo,
lrpd.`vinNo`,
lrpd.vinNo,
lrpd.vehMark,
lrpd.customer,
lrpd.borrowerName,
lrpd.`bankName`,
lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0)) AS yq_total,
lrpd.bankName,
lrpd.dueMoney - SUM(IFNULL(lrh.actualMoney, 0)) AS yq_total,
lrpd.salesOrderSid
FROM
loan_repayment_plan_details lrpd
LEFT JOIN `loan_repayment_history` lrh
ON lrh.planDetailSid = lrpd.`sid`
LEFT JOIN loan_repayment_history lrh
ON lrh.planDetailSid = lrpd.sid
WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; CURDATE()
GROUP BY lrpd.`sid`
GROUP BY lrpd.sid
HAVING (yq_total > 0)) a1
WHERE a1.busVinSid = #{saleVehSid}
GROUP BY a1.busVinSid
</select>
<select id="getDqyqje2" resultType="java.lang.String">
SELECT
ROUND(
SUM(ss.yq_total) +
COALESCE(lbpv_sum.bankBeInter_sum, 0) +
COALESCE(lfd_sum.fund_sum, 0),
2
) AS beMoney
FROM (
SELECT
lrpd.sid,
lrpd.busVinSid,
(lrpd.dueMoney - COALESCE(SUM(lrh.actualMoney), 0)) AS yq_total
FROM loan_repayment_plan_details lrpd
LEFT JOIN loan_repayment_history lrh
ON lrh.planDetailSid = lrpd.sid
WHERE lrpd.dueDate &lt;= lrpd.updateTime
AND lrpd.busVinSid = #{saleVehSid}
GROUP BY lrpd.sid
HAVING yq_total > 0
) ss
LEFT JOIN (
SELECT
saleVehSid,
SUM(bankBeInter) AS bankBeInter_sum
FROM loan_be_padsincere_veh
GROUP BY saleVehSid
) lbpv_sum ON lbpv_sum.saleVehSid = ss.busVinSid
LEFT JOIN (
SELECT
a.busVinSid,
sum( a.fund ) AS fund_sum
FROM
(
SELECT
( fjj.reveivableMoney - fjj.m ) AS fund,
lp.busVinSid
FROM
(
SELECT
IFNULL((
SELECT
SUM( subscriptionMoney )
FROM
anrui_fin.fin_selected_receivables_detailed AS s
WHERE
s.auditState = '3'
AND s.receivablesSid = fj.sid
),
0
) AS m,
fj.*
FROM
( SELECT j.busSid, j.sid, j.reveivableMoney FROM anrui_fin.fin_uncollected_receivables_detailed_jr AS j WHERE j.payCostTitleKey = '006' ) AS fj
) AS fjj
LEFT JOIN loan_repayment_plan_details lp ON lp.sid = fjj.busSid
where lp.dueDate &lt;= lp.updateTime
GROUP BY
lp.busVinSid
) a
) lfd_sum ON lfd_sum.busVinSid = ss.busVinSid
GROUP BY ss.busVinSid
</select>
<select id="getYqjehsqs2" resultType="java.lang.String">
SELECT
ROUND(
(
SUM(ss.yq_total)
+ COALESCE(lbpv_sum.bankBeInter_sum, 0)
+ COALESCE(lfd_sum.fund_sum, 0)
) / MAX(ss.qjyh), 1
) AS yqjehsqs
FROM (
SELECT
lrpd.sid,
lrpd.busVinSid,
(lrpd.dueMoney - COALESCE(SUM(lrh.actualMoney), 0)) AS yq_total,
COALESCE(lrs.mainMidRepay, 0) + COALESCE(lrs.otherMidRepay, 0) AS qjyh
FROM loan_repayment_plan_details lrpd
LEFT JOIN loan_repayment_history lrh ON lrh.planDetailSid = lrpd.sid
LEFT JOIN loan_repayment_schedule lrs ON lrpd.scheduleSid = lrs.sid
WHERE lrpd.dueDate &lt;= lrpd.updateTime
AND lrpd.busVinSid = #{saleVehSid}
GROUP BY lrpd.sid
HAVING yq_total > 0
) ss
LEFT JOIN (
SELECT
saleVehSid,
SUM(bankBeInter) AS bankBeInter_sum
FROM loan_be_padsincere_veh
GROUP BY saleVehSid
) lbpv_sum ON lbpv_sum.saleVehSid = ss.busVinSid
LEFT JOIN (
SELECT
a.busVinSid,
sum( a.fund ) AS fund_sum
FROM
(
SELECT
( fjj.reveivableMoney - fjj.m ) AS fund,
lp.busVinSid
FROM
(
SELECT
IFNULL((
SELECT
SUM( subscriptionMoney )
FROM
anrui_fin.fin_selected_receivables_detailed AS s
WHERE
s.auditState = '3'
AND s.receivablesSid = fj.sid
),
0
) AS m,
fj.*
FROM
( SELECT j.busSid, j.sid, j.reveivableMoney FROM anrui_fin.fin_uncollected_receivables_detailed_jr AS j WHERE j.payCostTitleKey = '006' ) AS fj
) AS fjj
LEFT JOIN loan_repayment_plan_details lp ON lp.sid = fjj.busSid
where lp.dueDate &lt;= lp.updateTime
GROUP BY
lp.busVinSid
) a
) lfd_sum ON lfd_sum.busVinSid = ss.busVinSid
GROUP BY ss.busVinSid
</select>
</mapper>

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

@ -87,19 +87,6 @@ import org.springframework.stereotype.Service;
import java.util.*;
import java.util.stream.Collectors;
/**
* Project: anrui-riskcenter(车辆交回事前报备申请) <br/>
* File: LoanRestoreReportApplyService.java <br/>
* Class: com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyService <br/>
* Description: 车辆交回事前报备申请 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-01-08 11:43:57 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class LoanRestoreReportApplyService extends MybatisBaseService<LoanRestoreReportApplyMapper, LoanRestoreReportApply> {
@ -351,7 +338,7 @@ public class LoanRestoreReportApplyService extends MybatisBaseService<LoanRestor
LoanSolutions loanSolutions = loanSolutionsService.selectBySaleOrderSid(busSalesOrderVehicle.getSalesOrderSid());
loanRestoreReportApplyDetailsVo.setJrfaSid(loanSolutions.getSid());
loanRestoreReportApplyDetailsVo.setSaleVehSid(saleVehSid);
AlrepaidAndArrVo alrepaidAndArr = getAlrepaidAndArr(saleVehSid);
AlrepaidAndArrVo alrepaidAndArr = getAlrepaidAndArr2(saleVehSid);
loanRestoreReportApplyDetailsVo.setAlRepaidMoney(alrepaidAndArr.getAlRepaidMoney());
loanRestoreReportApplyDetailsVo.setCurrentBeMoney(alrepaidAndArr.getCurrentBeMoney());
loanRestoreReportApplyDetailsVo.setWheFundOccMoney(alrepaidAndArr.getWheFundOccMoney());
@ -685,6 +672,36 @@ public class LoanRestoreReportApplyService extends MybatisBaseService<LoanRestor
return alrepaidAndArrVo;
}
public AlrepaidAndArrVo getAlrepaidAndArr2(String saleVehSid) {
AlrepaidAndArrVo alrepaidAndArrVo = new AlrepaidAndArrVo();
//已还金额
String yhje = baseMapper.getYhje(saleVehSid);
alrepaidAndArrVo.setAlRepaidMoney(yhje);
//当前逾期金额
String dqyqje = baseMapper.getDqyqje2(saleVehSid);
alrepaidAndArrVo.setCurrentBeMoney(dqyqje);
//其中资金占用费
String qzzjzyf = baseMapper.getQzzjzyf(saleVehSid);
alrepaidAndArrVo.setWheFundOccMoney(qzzjzyf);
//未到期金额
String wdqje = baseMapper.getWdqje(saleVehSid);
alrepaidAndArrVo.setUnexpiredMoney(wdqje);
//总期数
String zqs = baseMapper.getZqs(saleVehSid);
alrepaidAndArrVo.setNper(zqs);
//当前期数
String dqqs = baseMapper.getDqqs(saleVehSid);
alrepaidAndArrVo.setCurrentPeriod(dqqs);
//已还金额换算期数
String yhjehsqs = baseMapper.getYhjehsqs(saleVehSid);
alrepaidAndArrVo.setAlRepaidMoneyConPeriod(yhjehsqs);
//逾期金额换算期数
String yqjehsqs = baseMapper.getYqjehsqs2(saleVehSid);
alrepaidAndArrVo.setBeOverdueMoneyAndPeriod(yqjehsqs);
return alrepaidAndArrVo;
}
public ResultBean delAllBySids(String[] sids) {
ResultBean rb = ResultBean.fireFail();
//查询该sid中是否有流程不是待提交的

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

@ -366,7 +366,7 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
}
//根据交回车辆事前报备申请sid查询数据
loanReturnInboundApplyDetailsVo = baseMapper.selectSidOne(chooseSid);
AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr(loanReturnInboundApplyDetailsVo.getBusVinSid());
AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr2(loanReturnInboundApplyDetailsVo.getBusVinSid());
if (alrepaidAndArrVo != null) {
BeanUtil.copyProperties(alrepaidAndArrVo, loanReturnInboundApplyDetailsVo);
}

4
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturnvehledger/LoanReturnVehLedgerService.java
View File

@ -219,7 +219,7 @@ public class LoanReturnVehLedgerService extends MybatisBaseService<LoanReturnVeh
if (!paggingRecords.isEmpty()) {
for (LoanReturnVehLedgerVo record : pagging.getRecords()) {
if ("主车".equals(record.getVehType())) {
AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr(record.getBusVinSid());
AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr2(record.getBusVinSid());
if (alrepaidAndArrVo != null) {
record.setOverMoney(alrepaidAndArrVo.getCurrentBeMoney());
record.setNotBecomeDueMoney(alrepaidAndArrVo.getUnexpiredMoney());
@ -250,7 +250,7 @@ public class LoanReturnVehLedgerService extends MybatisBaseService<LoanReturnVeh
LoanReturnLedgerVo loanReturnLedgerVo = new LoanReturnLedgerVo();
BeanUtil.copyProperties(loanReturnVehLedger, loanReturnLedgerVo);
if ("主车".equals(loanReturnVehLedger.getVehType())) {
AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr(loanReturnVehLedger.getBusVinSid());
AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr2(loanReturnVehLedger.getBusVinSid());
if (alrepaidAndArrVo != null) {
loanReturnLedgerVo.setOverMoney(alrepaidAndArrVo.getCurrentBeMoney());
loanReturnLedgerVo.setNotBecomeDueMoney(alrepaidAndArrVo.getUnexpiredMoney());

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

@ -879,7 +879,7 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
}
}
LoanSecondarySalesCostVo loanSecondarySalesCost = new LoanSecondarySalesCostVo();
AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr(busVinSid);
AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr2(busVinSid);
if (alrepaidAndArrVo != null) {
BeanUtil.copyProperties(alrepaidAndArrVo, loanSecondarySalesApplyDetailsVo);
BigDecimal bigDecimal = BigDecimal.ZERO;
@ -905,17 +905,20 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
//根据主车查询挂车信息
LoanReturnVehLedger loanReturnVehLedgerT = loanReturnVehLedgerService.selectByPSid(loanReturnVehLedger.getSid());
if ("未处置".equals(loanReturnVehLedgerT.getDisposal())) {
loanSecondarySalesVehVo = new LoanSecondarySalesVehVo();
loanSecondarySalesVehVo.setVehType(loanReturnVehLedgerT.getVehType());
loanSecondarySalesVehVo.setVehMark(loanReturnVehLedgerT.getVehMark());
loanSecondarySalesVehVo.setVinNo(loanReturnVehLedgerT.getVinNo());
loanSecondarySalesVehVo.setModelName(loanReturnVehLedgerT.getVehModel());
loanSecondarySalesVehVo.setBusSid(loanReturnVehLedgerT.getSid());
loanSecondarySalesVehVoList.add(loanSecondarySalesVehVo);
if(loanReturnVehLedgerT != null){
if ("未处置".equals(loanReturnVehLedgerT.getDisposal())) {
loanSecondarySalesVehVo = new LoanSecondarySalesVehVo();
loanSecondarySalesVehVo.setVehType(loanReturnVehLedgerT.getVehType());
loanSecondarySalesVehVo.setVehMark(loanReturnVehLedgerT.getVehMark());
loanSecondarySalesVehVo.setVinNo(loanReturnVehLedgerT.getVinNo());
loanSecondarySalesVehVo.setModelName(loanReturnVehLedgerT.getVehModel());
loanSecondarySalesVehVo.setBusSid(loanReturnVehLedgerT.getSid());
loanSecondarySalesVehVoList.add(loanSecondarySalesVehVo);
}
}
}
if ("挂车".equals(loanReturnVehLedger.getVehType())) {
if ("未处置".equals(loanReturnVehLedger.getDisposal())) {
@ -935,7 +938,7 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
loanSecondarySalesApplyDetailsVo.setBankContractNo(loanReturnInboundApply.getBankContractNo());
loanSecondarySalesApplyDetailsVo.setLocationName(loanReturnVehLedger.getLocation());
loanSecondarySalesApplyDetailsVo.setSalesOrderSid(loanReturnVehLedger.getSaleOrderSid());
AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr(busVinSid);
AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr2(busVinSid);
if (alrepaidAndArrVo != null) {
BeanUtil.copyProperties(alrepaidAndArrVo, loanSecondarySalesApplyDetailsVo);
}

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

@ -37,7 +37,7 @@
lv.borrowerName
FROM loan_be_collection_veh lv
LEFT JOIN loan_be_collection_apply la
ON lv.`mainSid` = la.`sid`
ON lv.mainSid = la.sid
<where>
${ew.sqlSegment}
</where>
@ -68,83 +68,37 @@
<select id="initVehListBySaleVehSidYCJK"
resultType="com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehInit">
SELECT
a1.`loanContractNo`,
a1.loanContractNo,
RIGHT (a1.vinNo, 8) AS vinNo,
a1.vehMark AS carNum,
a1.`bankName`,
a1.bankName,
a1.bankContractNo,
a1.customer AS custName,
a1.borrowerName AS loanName,
a1.dueDate AS firstBeDate,
COUNT(a1.sid) AS beOverduePeriod,
(
SUM(a1.yq_total) + IFNULL(
(SELECT
SUM(lbpv.`bankBeInter`)
FROM
loan_be_padsincere_veh lbpv
WHERE lbpv.saleVehSid = a1.busVinSid),
0
) + IFNULL(
(SELECT
SUM(fund)
FROM
loan_fund_day
WHERE busSid IN
(SELECT
lrpd.sid
FROM
loan_repayment_plan_details lrpd
WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; CURDATE())),
0
)
) AS beOverdueMoney,
ROUND(
(
SUM(a1.yq_total) + IFNULL(
(SELECT
SUM(lbpv.`bankBeInter`)
FROM
loan_be_padsincere_veh lbpv
WHERE lbpv.saleVehSid = a1.busVinSid),
0
) + IFNULL(
(SELECT
SUM(fund)
FROM
loan_fund_day
WHERE busSid IN
(SELECT
lrpd.sid
FROM
loan_repayment_plan_details lrpd
WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; CURDATE())),
0
)
) / a1.dueMoney,
1
) AS beOverdueMoneyAndPeriod,
a1.busVinSid AS saleVehSid,
a1.salesOrderSid,
a1.lockCarMoney
a1.lockCarMoney,
a1.nowOverdue
FROM
(SELECT
lrpd.sid,
lrpd.busVinSid,
lrpd.`loanContractNo`,
lrpd.loanContractNo,
lrpd.bankContractNo,
lrpd.`vinNo`,
lrpd.`bankName`,
lrpd.vinNo,
lrpd.bankName,
lrpd.borrowerName,
lrpd.dueDate,
lrpd.vehMark,
lrpd.dueMoney,
(
lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0))
lrpd.dueMoney - SUM(IFNULL(lrh.actualMoney, 0))
) AS yq_total,
(
lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0))
) / lrpd.`dueMoney` AS yq_hsqs,
lrpd.dueMoney - SUM(IFNULL(lrh.actualMoney, 0))
) / lrpd.dueMoney AS yq_hsqs,
lrpd.customer,
ct.mobile,
lr.createTime,
@ -161,12 +115,13 @@
AND lbcv.lockCarState = '1'
AND lbcv.saleVehSid = lrpd.busVinSid
ORDER BY lbcv.createTime DESC
LIMIT 1) AS lockCarMoney
LIMIT 1) AS lockCarMoney,
if(lrpd.dueDate &lt;= lrpd.updateTime,0,1) as nowOverdue
FROM
`loan_repayment_plan_details` lrpd
LEFT JOIN `loan_repayment_history` lrh
ON lrh.planDetailSid = lrpd.`sid`
LEFT JOIN anrui_buscenter.`bus_sales_order_vehicle` bv
loan_repayment_plan_details lrpd
LEFT JOIN loan_repayment_history lrh
ON lrh.planDetailSid = lrpd.sid
LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bv
ON lrpd.busVinSid = bv.sid
LEFT JOIN
(SELECT
@ -177,12 +132,13 @@
ORDER BY createTime DESC
LIMIT 1) lr
ON lrpd.busVinSid = lr.saleVehSid
LEFT JOIN anrui_crm.`crm_customer_temp` ct
LEFT JOIN anrui_crm.crm_customer_temp ct
ON lrpd.customerSid = ct.sid
WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; CURDATE()
GROUP BY lrpd.`sid`
GROUP BY lrpd.sid
HAVING (yq_total > 0)) a1
WHERE a1.busVinSid = #{saleVehSid}
AND a1.nowOverdue = 0
GROUP BY a1.loanContractNo,
a1.vinNo,
a1.busVinSid

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

@ -57,6 +57,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.*;
import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.flowable.*;
@ -64,6 +65,7 @@ import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.*;
import com.yxt.anrui.riskcenter.biz.loanbecollectionveh.LoanBeCollectionVehService;
import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigate.LoanHomevisitInvestigateService;
import com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyService;
import com.yxt.anrui.riskcenter.biz.loansolutions.LoanSolutionsService;
import com.yxt.anrui.riskcenter.biz.loanvehclearanceveh.LoanVehClearanceVehService;
import com.yxt.common.base.config.component.FileUploadComponent;
@ -99,6 +101,8 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
@Autowired
private LoanVehClearanceVehService loanVehClearanceVehService;
@Autowired
private LoanRestoreReportApplyService loanRestoreReportApplyService;
@Autowired
private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
@Autowired
private BusSalesOrderFeign busSalesOrderFeign;
@ -392,6 +396,9 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
LoanVehClearanceVehInit loanVehClearanceVehInit = baseMapper.initVehListBySaleVehSidYCJK(saleVehSid);
LoanVehClearanceVehDetailsVo loanVehClearanceVehDetailsVo = new LoanVehClearanceVehDetailsVo();
BeanUtil.copyProperties(loanVehClearanceVehInit, loanVehClearanceVehDetailsVo);
AlrepaidAndArrVo alrepaidAndArr2 = loanRestoreReportApplyService.getAlrepaidAndArr2(saleVehSid);
loanVehClearanceVehDetailsVo.setBeOverdueMoney(alrepaidAndArr2.getCurrentBeMoney());
loanVehClearanceVehDetailsVo.setBeOverdueMoneyAndPeriod(alrepaidAndArr2.getBeOverdueMoneyAndPeriod());
loanVehClearanceVehDetailsVo.setCustomerName(loanVehClearanceVehInit.getCustName());
loanVehClearanceVehDetailsVo.setBorrowerName(loanVehClearanceVehInit.getLoanName());
List<LoanVehClearanceVehFile> loanVehClearanceVehFiles = new ArrayList<>();

122
anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/fkce.ftl
View File

@ -31,15 +31,15 @@
<o:LastAuthor>10745413@qq.com</o:LastAuthor>
<o:Revision>2</o:Revision>
<o:TotalTime>0</o:TotalTime>
<o:LastPrinted>2025-04-17T07:20:00Z</o:LastPrinted>
<o:Created>2025-04-17T08:41:00Z</o:Created>
<o:LastSaved>2025-04-17T08:41:00Z</o:LastSaved>
<o:LastPrinted>2025-04-18T09:05:00Z</o:LastPrinted>
<o:Created>2025-04-18T09:06:00Z</o:Created>
<o:LastSaved>2025-04-18T09:06:00Z</o:LastSaved>
<o:Pages>1</o:Pages>
<o:Words>192</o:Words>
<o:Characters>564</o:Characters>
<o:Lines>94</o:Lines>
<o:Characters>560</o:Characters>
<o:Lines>93</o:Lines>
<o:Paragraphs>107</o:Paragraphs>
<o:CharactersWithSpaces>649</o:CharactersWithSpaces>
<o:CharactersWithSpaces>645</o:CharactersWithSpaces>
<o:Version>16</o:Version>
</o:DocumentProperties>
<w:fonts>
@ -1111,7 +1111,7 @@
</w:hdrShapeDefaults>
<w:footnotePr>
<w:footnote w:type="separator">
<w:p wsp:rsidR="00726B11" wsp:rsidRDefault="00726B11" wsp:rsidP="00554AEC">
<w:p wsp:rsidR="00E81AC2" wsp:rsidRDefault="00E81AC2" wsp:rsidP="00554AEC">
<w:pPr>
<w:spacing w:after="0" w:line="240" w:line-rule="auto"/>
<w:rPr>
@ -1124,7 +1124,7 @@
</w:p>
</w:footnote>
<w:footnote w:type="continuation-separator">
<w:p wsp:rsidR="00726B11" wsp:rsidRDefault="00726B11" wsp:rsidP="00554AEC">
<w:p wsp:rsidR="00E81AC2" wsp:rsidRDefault="00E81AC2" wsp:rsidP="00554AEC">
<w:pPr>
<w:spacing w:after="0" w:line="240" w:line-rule="auto"/>
<w:rPr>
@ -1139,7 +1139,7 @@
</w:footnotePr>
<w:endnotePr>
<w:endnote w:type="separator">
<w:p wsp:rsidR="00726B11" wsp:rsidRDefault="00726B11" wsp:rsidP="00554AEC">
<w:p wsp:rsidR="00E81AC2" wsp:rsidRDefault="00E81AC2" wsp:rsidP="00554AEC">
<w:pPr>
<w:spacing w:after="0" w:line="240" w:line-rule="auto"/>
<w:rPr>
@ -1152,7 +1152,7 @@
</w:p>
</w:endnote>
<w:endnote w:type="continuation-separator">
<w:p wsp:rsidR="00726B11" wsp:rsidRDefault="00726B11" wsp:rsidP="00554AEC">
<w:p wsp:rsidR="00E81AC2" wsp:rsidRDefault="00E81AC2" wsp:rsidP="00554AEC">
<w:pPr>
<w:spacing w:after="0" w:line="240" w:line-rule="auto"/>
<w:rPr>
@ -1185,10 +1185,12 @@
<wsp:rsid wsp:val="000B469D"/>
<wsp:rsid wsp:val="0010494A"/>
<wsp:rsid wsp:val="00193798"/>
<wsp:rsid wsp:val="002B53BF"/>
<wsp:rsid wsp:val="002D1C78"/>
<wsp:rsid wsp:val="00362AE2"/>
<wsp:rsid wsp:val="00390173"/>
<wsp:rsid wsp:val="003A3590"/>
<wsp:rsid wsp:val="003C2704"/>
<wsp:rsid wsp:val="003D1213"/>
<wsp:rsid wsp:val="003D7C25"/>
<wsp:rsid wsp:val="00426D6C"/>
@ -1201,17 +1203,17 @@
<wsp:rsid wsp:val="00600339"/>
<wsp:rsid wsp:val="0060515A"/>
<wsp:rsid wsp:val="0061325E"/>
<wsp:rsid wsp:val="0061550F"/>
<wsp:rsid wsp:val="00627292"/>
<wsp:rsid wsp:val="00685FF7"/>
<wsp:rsid wsp:val="00687DEE"/>
<wsp:rsid wsp:val="007039E1"/>
<wsp:rsid wsp:val="00726B11"/>
<wsp:rsid wsp:val="007433E1"/>
<wsp:rsid wsp:val="0076372D"/>
<wsp:rsid wsp:val="0085004E"/>
<wsp:rsid wsp:val="00864920"/>
<wsp:rsid wsp:val="00887F24"/>
<wsp:rsid wsp:val="00932034"/>
<wsp:rsid wsp:val="008C7A2B"/>
<wsp:rsid wsp:val="009974D4"/>
<wsp:rsid wsp:val="00A3305D"/>
<wsp:rsid wsp:val="00A5394F"/>
@ -1219,12 +1221,15 @@
<wsp:rsid wsp:val="00B1296B"/>
<wsp:rsid wsp:val="00B439A2"/>
<wsp:rsid wsp:val="00B64B18"/>
<wsp:rsid wsp:val="00BF5C00"/>
<wsp:rsid wsp:val="00C3401F"/>
<wsp:rsid wsp:val="00C76AD4"/>
<wsp:rsid wsp:val="00C85CF5"/>
<wsp:rsid wsp:val="00D14F52"/>
<wsp:rsid wsp:val="00D55DC5"/>
<wsp:rsid wsp:val="00D95F98"/>
<wsp:rsid wsp:val="00DF2745"/>
<wsp:rsid wsp:val="00E81AC2"/>
<wsp:rsid wsp:val="00EE1C63"/>
<wsp:rsid wsp:val="00EE24EE"/>
<wsp:rsid wsp:val="00EF2E50"/>
@ -1236,14 +1241,12 @@
<wx:sect>
<w:tbl>
<w:tblPr>
<w:tblW w:w="16563" w:type="dxa"/>
<w:tblInd w:w="284" w:type="dxa"/>
<w:tblW w:w="15713" w:type="dxa"/>
<w:jc w:val="center"/>
<w:tblLook w:val="04A0"/>
</w:tblPr>
<w:tblGrid>
<w:gridCol w:w="709"/>
<w:gridCol w:w="244"/>
<w:gridCol w:w="748"/>
<w:gridCol w:w="851"/>
<w:gridCol w:w="992"/>
<w:gridCol w:w="949"/>
<w:gridCol w:w="43"/>
@ -1272,14 +1275,15 @@
<w:gridCol w:w="993"/>
<w:gridCol w:w="996"/>
</w:tblGrid>
<w:tr wsp:rsidR="00D55DC5" wsp:rsidRPr="00932034" wsp:rsidTr="00485C6B">
<w:tr wsp:rsidR="00D55DC5" wsp:rsidRPr="00C85CF5" wsp:rsidTr="008C7A2B">
<w:trPr>
<w:trHeight w:val="745"/>
<w:jc w:val="center"/>
</w:trPr>
<w:tc>
<w:tcPr>
<w:tcW w:w="16563" w:type="dxa"/>
<w:gridSpan w:val="30"/>
<w:tcW w:w="15713" w:type="dxa"/>
<w:gridSpan w:val="28"/>
<w:tcBorders>
<w:top w:val="nil"/>
<w:left w:val="nil"/>
@ -1323,14 +1327,15 @@
</w:p>
</w:tc>
</w:tr>
<w:tr wsp:rsidR="00D55DC5" wsp:rsidRPr="00932034" wsp:rsidTr="00485C6B">
<w:tr wsp:rsidR="00D55DC5" wsp:rsidRPr="00C85CF5" wsp:rsidTr="008C7A2B">
<w:trPr>
<w:trHeight w:val="310"/>
<w:jc w:val="center"/>
</w:trPr>
<w:tc>
<w:tcPr>
<w:tcW w:w="3642" w:type="dxa"/>
<w:gridSpan w:val="5"/>
<w:tcW w:w="2792" w:type="dxa"/>
<w:gridSpan w:val="3"/>
<w:tcBorders>
<w:top w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="FFFFFF"/>
<w:left w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="FFFFFF"/>
@ -1574,14 +1579,15 @@
</w:p>
</w:tc>
</w:tr>
<w:tr wsp:rsidR="00D55DC5" wsp:rsidRPr="00932034" wsp:rsidTr="00485C6B">
<w:tr wsp:rsidR="00D55DC5" wsp:rsidRPr="00C85CF5" wsp:rsidTr="008C7A2B">
<w:trPr>
<w:trHeight w:val="310"/>
<w:jc w:val="center"/>
</w:trPr>
<w:tc>
<w:tcPr>
<w:tcW w:w="3642" w:type="dxa"/>
<w:gridSpan w:val="5"/>
<w:tcW w:w="2792" w:type="dxa"/>
<w:gridSpan w:val="3"/>
<w:tcBorders>
<w:top w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="FFFFFF"/>
<w:left w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="FFFFFF"/>
@ -1825,13 +1831,14 @@
</w:p>
</w:tc>
</w:tr>
<w:tr wsp:rsidR="00D55DC5" wsp:rsidRPr="00932034" wsp:rsidTr="00485C6B">
<w:tr wsp:rsidR="00D55DC5" wsp:rsidRPr="00C85CF5" wsp:rsidTr="008C7A2B">
<w:trPr>
<w:trHeight w:val="310"/>
<w:jc w:val="center"/>
</w:trPr>
<w:tc>
<w:tcPr>
<w:tcW w:w="709" w:type="dxa"/>
<w:tcW w:w="851" w:type="dxa"/>
<w:tcBorders>
<w:top w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
<w:left w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
@ -1872,8 +1879,8 @@
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="4536" w:type="dxa"/>
<w:gridSpan w:val="8"/>
<w:tcW w:w="3544" w:type="dxa"/>
<w:gridSpan w:val="6"/>
<w:tcBorders>
<w:top w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
<w:left w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
@ -2075,14 +2082,14 @@
</w:p>
</w:tc>
</w:tr>
<w:tr wsp:rsidR="00000000" wsp:rsidRPr="00932034" wsp:rsidTr="00932034">
<w:tr wsp:rsidR="00D55DC5" wsp:rsidRPr="00C85CF5" wsp:rsidTr="00C85CF5">
<w:trPr>
<w:trHeight w:val="300"/>
<w:jc w:val="center"/>
</w:trPr>
<w:tc>
<w:tcPr>
<w:tcW w:w="1701" w:type="dxa"/>
<w:gridSpan w:val="3"/>
<w:tcW w:w="851" w:type="dxa"/>
<w:vmerge w:val="restart"/>
<w:tcBorders>
<w:top w:val="nil"/>
@ -2333,14 +2340,14 @@
</w:p>
</w:tc>
</w:tr>
<w:tr wsp:rsidR="00000000" wsp:rsidRPr="00932034" wsp:rsidTr="00932034">
<w:tr wsp:rsidR="00000000" wsp:rsidRPr="00C85CF5" wsp:rsidTr="00C85CF5">
<w:trPr>
<w:trHeight w:val="300"/>
<w:jc w:val="center"/>
</w:trPr>
<w:tc>
<w:tcPr>
<w:tcW w:w="1701" w:type="dxa"/>
<w:gridSpan w:val="3"/>
<w:tcW w:w="851" w:type="dxa"/>
<w:vmerge/>
<w:tcBorders>
<w:top w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
@ -2996,14 +3003,14 @@
</w:tc>
</w:tr>
<#list wlList as wl>
<w:tr wsp:rsidR="00D55DC5" wsp:rsidRPr="00932034" wsp:rsidTr="00485C6B">
<w:tr wsp:rsidR="00D55DC5" wsp:rsidRPr="00C85CF5" wsp:rsidTr="008C7A2B">
<w:trPr>
<w:trHeight w:val="310"/>
<w:jc w:val="center"/>
</w:trPr>
<w:tc>
<w:tcPr>
<w:tcW w:w="1701" w:type="dxa"/>
<w:gridSpan w:val="3"/>
<w:tcW w:w="851" w:type="dxa"/>
<w:tcBorders>
<w:top w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
<w:left w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
@ -3014,7 +3021,7 @@
<w:noWrap/>
<w:vAlign w:val="center"/>
</w:tcPr>
<w:p wsp:rsidR="00600339" wsp:rsidRPr="003D1213" wsp:rsidRDefault="0010494A"
<w:p wsp:rsidR="00600339" wsp:rsidRPr="003D1213" wsp:rsidRDefault="002B53BF"
wsp:rsidP="0010494A">
<w:pPr>
<w:widowControl/>
@ -3668,15 +3675,15 @@
</w:tc>
</w:tr>
</#list>
<w:tr wsp:rsidR="00D55DC5" wsp:rsidRPr="00932034" wsp:rsidTr="00485C6B">
<w:tr wsp:rsidR="00D55DC5" wsp:rsidRPr="00C85CF5" wsp:rsidTr="008C7A2B">
<w:trPr>
<w:trHeight w:val="310"/>
<w:jc w:val="center"/>
</w:trPr>
<w:tc>
<w:tcPr>
<w:tcW w:w="953" w:type="dxa"/>
<w:tcW w:w="851" w:type="dxa"/>
<w:vmerge w:val="restart"/>
<w:gridSpan w:val="2"/>
<w:tcBorders>
<w:top w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
<w:left w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
@ -3719,8 +3726,8 @@
<#if (lc_index==0)>
<w:tc>
<w:tcPr>
<w:tcW w:w="13137" w:type="dxa"/>
<w:gridSpan w:val="25"/>
<w:tcW w:w="12389" w:type="dxa"/>
<w:gridSpan w:val="24"/>
<w:tcBorders>
<w:top w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
<w:left w:val="nil"/>
@ -3835,7 +3842,7 @@
<w:sz w:val="15"/>
<w:sz-cs w:val="15"/>
</w:rPr>
<w:t> ${lc.spsj!}</w:t>
<w:t> ${lc.spsj}</w:t>
</w:r>
</w:p>
</w:tc>
@ -3844,15 +3851,15 @@
</w:tr>
<#list lcList as lc>
<#if (lc_index>0)>
<w:tr wsp:rsidR="00D55DC5" wsp:rsidRPr="00932034" wsp:rsidTr="00485C6B">
<w:tr wsp:rsidR="00D55DC5" wsp:rsidRPr="00C85CF5" wsp:rsidTr="008C7A2B">
<w:trPr>
<w:trHeight w:val="310"/>
<w:jc w:val="center"/>
</w:trPr>
<w:tc>
<w:tcPr>
<w:tcW w:w="953" w:type="dxa"/>
<w:tcW w:w="851" w:type="dxa"/>
<w:vmerge/>
<w:gridSpan w:val="2"/>
<w:tcBorders>
<w:top w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
<w:left w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
@ -3883,8 +3890,8 @@
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="13137" w:type="dxa"/>
<w:gridSpan w:val="25"/>
<w:tcW w:w="12389" w:type="dxa"/>
<w:gridSpan w:val="24"/>
<w:tcBorders>
<w:top w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0"
w:color="auto"/>
@ -4004,21 +4011,22 @@
<w:sz w:val="15"/>
<w:sz-cs w:val="15"/>
</w:rPr>
<w:t> ${lc.spsj!}</w:t>
<w:t> ${lc.spsj}</w:t>
</w:r>
</w:p>
</w:tc>
</w:tr>
</#if>
</#list>
<w:tr wsp:rsidR="00D55DC5" wsp:rsidRPr="00932034" wsp:rsidTr="00485C6B">
<w:tr wsp:rsidR="00D55DC5" wsp:rsidRPr="00C85CF5" wsp:rsidTr="008C7A2B">
<w:trPr>
<w:trHeight w:val="310"/>
<w:jc w:val="center"/>
</w:trPr>
<w:tc>
<w:tcPr>
<w:tcW w:w="4252" w:type="dxa"/>
<w:gridSpan w:val="7"/>
<w:tcW w:w="3402" w:type="dxa"/>
<w:gridSpan w:val="5"/>
<w:tcBorders>
<w:top w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
</w:tcBorders>
@ -4175,9 +4183,9 @@
</w:rPr>
</w:pPr>
</w:p>
<w:sectPr wsp:rsidR="00B64B18" wsp:rsidRPr="003D1213" wsp:rsidSect="0061325E">
<w:sectPr wsp:rsidR="00B64B18" wsp:rsidRPr="003D1213" wsp:rsidSect="008C7A2B">
<w:pgSz w:w="16838" w:h="11906" w:orient="landscape" w:code="9"/>
<w:pgMar w:top="720" w:right="57" w:bottom="284" w:left="57" w:header="851" w:footer="992"
<w:pgMar w:top="720" w:right="454" w:bottom="720" w:left="454" w:header="851" w:footer="992"
w:gutter="0"/>
<w:cols w:space="425"/>
<w:docGrid w:type="lines" w:line-pitch="312"/>

7
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
View File

@ -660,7 +660,12 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
}
String vinNo = dto.getVin();
int countByVinNo = baseMapper.getCountByVinNo(vinNo, orgSid);
if (!"004".equals(dto.getPurchaseKey())){
if ("004".equals(dto.getPurchaseKey()) || "001".equals(dto.getPurchaseKey())){
if (countByVinNo > 1) {
return rb.setMsg("该车架号已存在，请勿重复验车！");
}
}
if ("002".equals(dto.getPurchaseKey()) || "003".equals(dto.getPurchaseKey())){
if (countByVinNo > 0) {
return rb.setMsg("该车架号已存在，请勿重复验车！");
}

8
doc/databases/统计报表更新.sql
View File

@ -867,7 +867,7 @@ BEGIN
) s ON s.busVinSid = bv.sid
LEFT JOIN anrui_portal.sys_organization so ON so.sid = ba.useOrgSid
WHERE ba.nodeState = '已办结'
AND ba.typeState = 1
AND ba.typeState = 1 and ba.contractNo = bo.contractNo
GROUP BY bv.sid,
ba.useOrgSid,
bm.modelSid,
@ -923,7 +923,7 @@ BEGIN
LEFT JOIN anrui_portal.sys_organization so ON so.sid = ba.useOrgSid
WHERE ba.nodeState = '已办结'
AND ba.paymentMethodKey = 1
AND bbv.vehicleState = '0002'
AND bbv.vehicleState = '0002' and ba.contractNo = bo.contractNo
GROUP BY bv.sid,
ba.useOrgSid,
bm.modelSid,
@ -995,7 +995,7 @@ BEGIN
) s ON s.busVinSid = bv.sid
LEFT JOIN anrui_portal.sys_organization so ON so.sid = ba.useOrgSid
WHERE ba.nodeState = '已办结'
AND ba.typeState = 1
AND ba.typeState = 1 and ba.contractNo = bo.contractNo
GROUP BY bv.sid,
ba.useOrgSid,
bm.modelSid,
@ -1055,7 +1055,7 @@ BEGIN
LEFT JOIN anrui_portal.sys_organization so ON so.sid = ba.useOrgSid
WHERE ba.nodeState = '已办结'
AND ba.paymentMethodKey = 1
AND bbv.vehicleState = '0002'
AND bbv.vehicleState = '0002' and ba.contractNo = bo.contractNo
GROUP BY bv.sid,
ba.useOrgSid,
bm.modelSid,

2
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml
View File

@ -133,6 +133,6 @@
SELECT @row_number := 0
) AS r
WHERE spu.useOrgSid = #{deptSid}
AND spu.isDelete = 0
AND spu.isDelete = 0 and spu.goodsClassKey='004'
</select>
</mapper>

Write Preview
Loading…
Cancel
Save