Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
dimengzhe 1 year ago
parent
commit
8b8bb5d471
  1. 18
      anrui-riskcenter-ui/src/views/advancerequest/advancerequest.vue
  2. 11
      anrui-riskcenter-ui/src/views/advancerequest/advancerequestAdd.vue
  3. 7
      anrui-riskcenter-ui/src/views/advancerequest/advancerequestInfo.vue
  4. 2
      anrui-riskcenter-ui/src/views/agentbusiness/agentbusiness.vue
  5. 2
      anrui-riskcenter-ui/src/views/deduct/deduct.vue
  6. 7
      anrui-riskcenter-ui/src/views/workFlow/diankuanFlow/advancerequestDaiBan.vue
  7. 11
      anrui-riskcenter-ui/src/views/workFlow/diankuanFlow/advancerequestEdit.vue
  8. 7
      anrui-riskcenter-ui/src/views/workFlow/diankuanFlow/advancerequestYiBan.vue
  9. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyQuery.java
  10. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyVo.java
  11. 16
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordVehInit.java
  12. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/DkRecordVo.java
  13. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyQuery.java
  14. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyVo.java
  15. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyMapper.xml
  16. 13
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java
  17. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordMapper.xml
  18. 36
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java
  19. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml
  20. 8
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyMapper.xml
  21. 18
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java
  22. 3
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java
  23. 1
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
  24. 43
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java
  25. 80
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppInvoiceDetails.java
  26. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/BeCollectionFeign.java
  27. 5
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionRest.java
  28. 24
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java

18
anrui-riskcenter-ui/src/views/advancerequest/advancerequest.vue

@ -23,6 +23,11 @@
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.createEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
<el-form-item label="办结日期">
<el-date-picker v-model="listQuery.params.modifyStartTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.modifyEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
@ -72,6 +77,11 @@
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="办结日期" align="center" width="100">
<template slot-scope="scope">
<span>{{ scope.row.modifyTime }}</span>
</template>
</el-table-column>
<el-table-column label="申请编号" align="center" width="165">
<template slot-scope="scope">
<span>{{ scope.row.billNo }}</span>
@ -173,7 +183,9 @@ export default {
menuUrl: '',
orgPath: '',
useOrgName: '',
userSid: ''
userSid: '',
modifyStartTime: '',
modifyEndTime: ''
}
}
}
@ -292,7 +304,9 @@ export default {
menuUrl: '',
orgPath: '',
useOrgName: '',
userSid: ''
userSid: '',
modifyStartTime: '',
modifyEndTime: ''
}
}
this.getList()

11
anrui-riskcenter-ui/src/views/advancerequest/advancerequestAdd.vue

@ -42,19 +42,20 @@
</el-row>
<el-table :key="tableKey" :data="formobj.loanBePadsincereVehList" :index="index" border style="width: 100%" :cell-style="cellStyle" show-summary :summary-method="getSummaries">
<el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="vinNo" label="车架号" align="center" width="100" />
<el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="140"/>
<el-table-column prop="vinNo" label="车架号" align="center" width="100" />
<el-table-column prop="bankName" label="资方" align="center" width="100" />
<el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="140" />
<el-table-column prop="customer" label="客户名称" align="center" width="130" />
<el-table-column prop="borrowerName" label="贷款人" align="center" width="100" />
<el-table-column prop="period" label="期数" align="center" width="80" />
<el-table-column prop="sysBeMoney" label="平台逾期金额" align="center" width="140" />
<el-table-column label="资方逾期本金" align="center" width="140">
<el-table-column prop="sysBeMoney" label="平台逾期月还" align="center" width="140" />
<el-table-column label="资方逾期月还" align="center" width="140">
<template slot-scope="scope">
<el-input @input="padMoneySum(scope.row)" v-model="scope.row.bankBeMoney" clearable placeholder=""/>
</template>
</el-table-column>
<el-table-column label="资方逾期息" align="center" width="140">
<el-table-column label="资方逾期息" align="center" width="140">
<template slot-scope="scope">
<el-input @input="padMoneySum(scope.row)" v-model="scope.row.bankBeInter" clearable placeholder=""/>
</template>
@ -107,8 +108,8 @@
:data="uploadData"
:headers="headers"
>
<el-button slot="trigger" size="small" type="primary">选取文件</el-button>
<el-button style="margin-left: 10px;" size="small" type="primary" @click="downLoad">下载模板</el-button>
<el-button slot="trigger" size="small" type="primary">选取文件</el-button>
<el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传</el-button>
</el-upload>
</div>

7
anrui-riskcenter-ui/src/views/advancerequest/advancerequestInfo.vue

@ -43,11 +43,12 @@
<el-table-column prop="vinNo" label="车架号" align="center" width="100" />
<el-table-column prop="bankName" label="资方" align="center" width="100" />
<el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
<el-table-column prop="customer" label="客户名称" align="center" width="130" />
<el-table-column prop="borrowerName" label="贷款人" align="center" width="100" />
<el-table-column prop="period" label="期数" align="center" width="100" />
<el-table-column prop="sysBeMoney" label="平台逾期金额" align="center" width="120" />
<el-table-column prop="bankBeMoney" label="资方逾期本金" align="center" width="120" />
<el-table-column prop="bankBeInter" label="资方逾期息" align="center" width="120" />
<el-table-column prop="sysBeMoney" label="平台逾期月还" align="center" width="120" />
<el-table-column prop="bankBeMoney" label="资方逾期月还" align="center" width="120" />
<el-table-column prop="bankBeInter" label="资方逾期息" align="center" width="120" />
<el-table-column prop="padMoney" label="垫款金额" align="center" width="100"/>
<el-table-column prop="paymentAccount" label="付款账户" align="center" width="100" />
<el-table-column prop="paymentNum" label="付款账号" align="center" width="100" />

2
anrui-riskcenter-ui/src/views/agentbusiness/agentbusiness.vue

@ -23,7 +23,7 @@
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.applyEndDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
<el-form-item label="申请日期">
<el-form-item label="办结日期">
<el-date-picker v-model="listQuery.params.closingStartDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.closingEndDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>

2
anrui-riskcenter-ui/src/views/deduct/deduct.vue

@ -156,7 +156,7 @@ export default {
],
isSearchShow: false,
searchxianshitit: '显示查询条件',
viewState: 2, // 1 2 3 4
viewState: 1, // 1 2 3 4
tableKey: 0,
list: [],
sids: [], // SIDs

7
anrui-riskcenter-ui/src/views/workFlow/diankuanFlow/advancerequestDaiBan.vue

@ -46,11 +46,12 @@
<el-table-column prop="vinNo" label="车架号" align="center" width="100" />
<el-table-column prop="bankName" label="资方" align="center" width="100" />
<el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
<el-table-column prop="customer" label="客户名称" align="center" width="130" />
<el-table-column prop="borrowerName" label="贷款人" align="center" width="100" />
<el-table-column prop="period" label="期数" align="center" width="100" />
<el-table-column prop="sysBeMoney" label="平台逾期金额" align="center" width="120" />
<el-table-column prop="bankBeMoney" label="资方逾期本金" align="center" width="120" />
<el-table-column prop="bankBeInter" label="资方逾期息" align="center" width="120" />
<el-table-column prop="sysBeMoney" label="平台逾期月还" align="center" width="120" />
<el-table-column prop="bankBeMoney" label="资方逾期月还" align="center" width="120" />
<el-table-column prop="bankBeInter" label="资方逾期息" align="center" width="120" />
<el-table-column prop="padMoney" label="垫款金额" align="center" width="100"/>
<el-table-column prop="paymentAccount" label="付款账户" align="center" width="100" />
<el-table-column prop="paymentNum" label="付款账号" align="center" width="100" />

11
anrui-riskcenter-ui/src/views/workFlow/diankuanFlow/advancerequestEdit.vue

@ -41,19 +41,20 @@
</el-row>
<el-table :key="tableKey" :data="formobj.loanBePadsincereVehList" :index="index" border style="width: 100%" :cell-style="cellStyle" show-summary :summary-method="getSummaries">
<el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="vinNo" label="车架号" align="center" width="100" />
<el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="140"/>
<el-table-column prop="vinNo" label="车架号" align="center" width="100" />
<el-table-column prop="bankName" label="资方" align="center" width="100" />
<el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="140" />
<el-table-column prop="customer" label="客户名称" align="center" width="130" />
<el-table-column prop="borrowerName" label="贷款人" align="center" width="100" />
<el-table-column prop="period" label="期数" align="center" width="80" />
<el-table-column prop="sysBeMoney" label="平台逾期金额" align="center" width="140" />
<el-table-column label="资方逾期本金" align="center" width="140">
<el-table-column prop="sysBeMoney" label="平台逾期月还" align="center" width="140" />
<el-table-column label="资方逾期月还" align="center" width="140">
<template slot-scope="scope">
<el-input @input="padMoneySum(scope.row)" v-model="scope.row.bankBeMoney" clearable placeholder=""/>
</template>
</el-table-column>
<el-table-column label="资方逾期息" align="center" width="140">
<el-table-column label="资方逾期息" align="center" width="140">
<template slot-scope="scope">
<el-input @input="padMoneySum(scope.row)" v-model="scope.row.bankBeInter" clearable placeholder=""/>
</template>
@ -106,8 +107,8 @@
:data="uploadData"
:headers="headers"
>
<el-button slot="trigger" size="small" type="primary">选取文件</el-button>
<el-button style="margin-left: 10px;" size="small" type="primary" @click="downLoad">下载模板</el-button>
<el-button slot="trigger" size="small" type="primary">选取文件</el-button>
<el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传</el-button>
</el-upload>
</div>

7
anrui-riskcenter-ui/src/views/workFlow/diankuanFlow/advancerequestYiBan.vue

@ -43,11 +43,12 @@
<el-table-column prop="vinNo" label="车架号" align="center" width="100" />
<el-table-column prop="bankName" label="资方" align="center" width="100" />
<el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
<el-table-column prop="customer" label="客户名称" align="center" width="130" />
<el-table-column prop="borrowerName" label="贷款人" align="center" width="100" />
<el-table-column prop="period" label="期数" align="center" width="100" />
<el-table-column prop="sysBeMoney" label="平台逾期金额" align="center" width="120" />
<el-table-column prop="bankBeMoney" label="资方逾期本金" align="center" width="120" />
<el-table-column prop="bankBeInter" label="资方逾期息" align="center" width="120" />
<el-table-column prop="sysBeMoney" label="平台逾期月还" align="center" width="120" />
<el-table-column prop="bankBeMoney" label="资方逾期月还" align="center" width="120" />
<el-table-column prop="bankBeInter" label="资方逾期息" align="center" width="120" />
<el-table-column prop="padMoney" label="垫款金额" align="center" width="100"/>
<el-table-column prop="paymentAccount" label="付款账户" align="center" width="100" />
<el-table-column prop="paymentNum" label="付款账号" align="center" width="100" />

4
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyQuery.java

@ -59,6 +59,10 @@ public class LoanBeCollectionApplyQuery implements Query {
private String createStartTime;
@ApiModelProperty("申请结束日期")
private String createEndTime;
@ApiModelProperty("办结开始日期")
private String modifyStartTime;
@ApiModelProperty("办结结束日期")
private String modifyEndTime;
@ApiModelProperty("催收措施")
private String collMeasure;

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyVo.java

@ -65,6 +65,8 @@ public class LoanBeCollectionApplyVo implements Vo {
@ApiModelProperty("申请日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("办结日期")
private String modifyTime;
@ApiModelProperty("催收措施")
private String collMeasure;
@ApiModelProperty("备注")

16
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordVehInit.java

@ -1,10 +1,12 @@
package com.yxt.anrui.riskcenter.api.loanbecollectionrecord;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFile;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
@Data
public class LoanBeCollectionRecordVehInit {
@ -34,19 +36,11 @@ public class LoanBeCollectionRecordVehInit {
private String beOverdueMoney;
@ApiModelProperty("逾期金额换算期数")
private String beOverdueMoneyAndPeriod;
@ApiModelProperty("销售订单sid")
private String salesOrderSid;
@ApiModelProperty("销售订单车辆sid")
private String saleVehSid;
@ApiModelProperty("开票管理sid")
private String kpglSid;
@ApiModelProperty("月还明细sid")
private String yhmxSid;
@ApiModelProperty("金融方案sid")
private String jrfaSid;
@ApiModelProperty("家访考察报告sid")
private String kcbgSid;
@ApiModelProperty("家访考察资料sid")
private String kczlSid;
@ApiModelProperty
private List<LoanBeCollectionVehFile> sids;
}

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/DkRecordVo.java

@ -49,7 +49,7 @@ public class DkRecordVo implements Vo {
@ApiModelProperty("分公司名称")
private String useOrgName;
@ApiModelProperty("申请部门名称")
@ApiModelProperty("销售部门名称")
private String deptName;
@ApiModelProperty("垫款申请编号")
private String billNo;

4
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyQuery.java

@ -62,6 +62,10 @@ public class LoanBePadsincereApplyQuery implements Query {
private String createStartTime;
@ApiModelProperty("申请结束日期")
private String createEndTime;
@ApiModelProperty("办结开始日期")
private String modifyStartTime;
@ApiModelProperty("办结结束日期")
private String modifyEndTime;
private String userSid;
private String orgPath;

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyVo.java

@ -64,6 +64,8 @@ public class LoanBePadsincereApplyVo implements Vo {
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("申请日期")
private Date createTime;
@ApiModelProperty("办结日期")
private String modifyTime;
@ApiModelProperty("申请编号")
private String billNo;
@ApiModelProperty("备注")

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

@ -21,7 +21,7 @@
<update id="updateFlowFiled">
UPDATE loan_be_collection_apply
SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}
SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}, modifyTime = NOW()
<if test="procDefId != null and procDefId != ''">
, procDefId=#{procDefId}
</if>

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

@ -26,6 +26,7 @@
package com.yxt.anrui.riskcenter.biz.loanbecollectionapply;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -59,6 +60,7 @@ import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecor
import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDetailsVo;
import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDto;
import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFile;
import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.LoanBePadsincereApplyVo;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
@ -195,12 +197,23 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
qw.apply(StringUtils.isNotBlank(query.getCreateStartTime()), "date_format (createTime,'%Y-%m-%d') >= date_format('" + query.getCreateStartTime() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(query.getCreateEndTime()), "date_format (createTime,'%Y-%m-%d') <= date_format('" + query.getCreateEndTime() + "','%Y-%m-%d')"
);
qw.apply(StringUtils.isNotBlank(query.getModifyStartTime()), "date_format (modifyTime,'%Y-%m-%d') >= date_format('" + query.getModifyStartTime() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(query.getModifyEndTime()), "date_format (modifyTime,'%Y-%m-%d') <= date_format('" + query.getModifyEndTime() + "','%Y-%m-%d')"
);
if (StringUtils.isNotBlank(query.getCollMeasure())) {
qw.like("collMeasure", query.getCollMeasure());
}
qw.orderByDesc("createTime");
IPage<LoanBeCollectionApply> page = PagerUtil.queryToPage(pq);
IPage<LoanBeCollectionApplyVo> pagging = baseMapper.selectPageVo(page, qw);
for (LoanBeCollectionApplyVo record : pagging.getRecords()) {
if ("终止".equals(record.getNodeState()) || "已办结".equals(record.getNodeState())) {
DateTime modifyTime = DateUtil.parse(record.getModifyTime());
record.setModifyTime(DateUtil.formatDate(modifyTime));
} else {
record.setModifyTime("未办结");
}
}
PagerVo<LoanBeCollectionApplyVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordMapper.xml

@ -43,7 +43,7 @@
a1.dueDate AS firstBeDate,
COUNT(a1.sid) AS beOverduePeriod,
SUM(a1.yq_total) AS beOverdueMoney,
SUM(a1.yq_hsqs) AS beOverdueMoneyAndPeriod
ROUND(SUM(a1.yq_hsqs), 1) AS beOverdueMoneyAndPeriod
FROM
(SELECT
lrpd.sid,

36
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java

@ -38,6 +38,8 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.*;
import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDetailsVo;
import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFile;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomer;
@ -197,25 +199,45 @@ public class LoanBeCollectionRecordService extends MybatisBaseService<LoanBeColl
loanBeCollectionRecordInit.setSpouseMobile(loanHomevisitInvestigateCustomerDetailsVo.getSpouseMobile());
List<LoanBeCollectionRecordVehInit> loanBeCollectionRecordVehInits = loanBeOverdueVehService.initVehListByBorrSid(busSalesOrderVehicle.getBorrowerSid());
for (LoanBeCollectionRecordVehInit loanBeCollectionRecordVehInit : loanBeCollectionRecordVehInits) {
List<LoanBeCollectionVehFile> loanBeCollectionVehFiles = new ArrayList<>();
loanBeCollectionRecordVehInit.setCustNameAndPhone(loanBeCollectionRecordVehInit.getCustName() + loanBeCollectionRecordVehInit.getCustPhone());
BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanBeCollectionRecordVehInit.getSalesOrderSid()).getData();
BusSalesOrderVehicle busSalesOrderVehicle1 = busSalesOrderVehicleFeign.details(loanBeCollectionRecordVehInit.getSaleVehSid()).getData();
loanBeCollectionRecordVehInit.setReaRepaymentNameAndPhone(busSalesOrderVehicle1.getReaRepaymentName() + busSalesOrderVehicle1.getReaRepaymentPhone());
//催收记录sid
loanBeCollectionRecordVehInit.setSaleVehSid(loanBeCollectionRecordVehInit.getSaleVehSid());
LoanBeCollectionVehFile loanBeCollectionVehFile1 = new LoanBeCollectionVehFile();
loanBeCollectionVehFile1.setName("催收记录");
loanBeCollectionVehFile1.setSid(loanBeCollectionRecordVehInit.getSaleVehSid());
loanBeCollectionVehFiles.add(loanBeCollectionVehFile1);
//开票管理sid
FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceFeign.selectByVinAndContractNo(busSalesOrderVehicle1.getLinkSid(), busSalesOrder.getContractNo()).getData();
//loanBeCollectionRecordVehInit.setKpglSid(finVehicleInvoice.getSid());
LoanBeCollectionVehFile loanBeCollectionVehFile2 = new LoanBeCollectionVehFile();
loanBeCollectionVehFile2.setName("开票信息");
loanBeCollectionVehFile2.setSid(finVehicleInvoice.getSid());
loanBeCollectionVehFiles.add(loanBeCollectionVehFile2);
//月还明细sid
loanBeCollectionRecordVehInit.setYhmxSid(saleVehSid);
LoanBeCollectionVehFile loanBeCollectionVehFile3 = new LoanBeCollectionVehFile();
loanBeCollectionVehFile3.setName("月还明细");
loanBeCollectionVehFile3.setSid(saleVehSid);
loanBeCollectionVehFiles.add(loanBeCollectionVehFile3);
//金融方案sid
LoanSolutions loanSolutions = loanSolutionsService.selectBySaleOrderSid(loanBeCollectionRecordVehInit.getSalesOrderSid());
loanBeCollectionRecordVehInit.setJrfaSid(loanSolutions.getSid());
LoanBeCollectionVehFile loanBeCollectionVehFile4 = new LoanBeCollectionVehFile();
loanBeCollectionVehFile4.setName("金融方案");
loanBeCollectionVehFile4.setSid(loanBeCollectionRecordVehInit.getSalesOrderSid());
loanBeCollectionVehFiles.add(loanBeCollectionVehFile4);
//家访考察报告sid
String sid = loanHomevisitInvestigateService.selectByBorrSid(busSalesOrderVehicle.getBorrowerSid());
loanBeCollectionRecordVehInit.setKcbgSid(sid);
LoanBeCollectionVehFile loanBeCollectionVehFile5 = new LoanBeCollectionVehFile();
loanBeCollectionVehFile5.setName("家访考察报告");
loanBeCollectionVehFile5.setSid(sid);
loanBeCollectionVehFiles.add(loanBeCollectionVehFile5);
//家访考察资料sid
loanBeCollectionRecordVehInit.setKczlSid(sid);
LoanBeCollectionVehFile loanBeCollectionVehFile6 = new LoanBeCollectionVehFile();
loanBeCollectionVehFile6.setName("家访考察资料");
loanBeCollectionVehFile6.setSid(sid);
loanBeCollectionVehFiles.add(loanBeCollectionVehFile6);
loanBeCollectionRecordVehInit.setSids(loanBeCollectionVehFiles);
loanBeCollectionRecordVehInits.add(loanBeCollectionRecordVehInit);
}
loanBeCollectionRecordInit.setLoanBeCollectionRecordVehInitList(loanBeCollectionRecordVehInits);
return loanBeCollectionRecordInit;

4
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml

@ -18,7 +18,7 @@
a1.dueDate AS firstBeDate,
COUNT(a1.sid) AS beOverduePeriod,
SUM(a1.yq_total) AS beOverdueMoney,
SUM(a1.yq_hsqs) AS beOverdueMoneyAndPeriod,
ROUND(SUM(a1.yq_hsqs), 1) AS beOverdueMoneyAndPeriod,
SUM(a1.yd_dkje) AS advMoney,
SUM(a1.yd_zjzyf) AS fundPossCostMoney,
a1.riskStaffUserSid,
@ -87,7 +87,7 @@
a1.dueDate AS firstBeDate,
COUNT(a1.sid) AS beOverduePeriod,
SUM(a1.yq_total) AS beOverdueMoney,
SUM(a1.yq_hsqs) AS beOverdueMoneyAndPeriod,
ROUND(SUM(a1.yq_hsqs), 1) AS beOverdueMoneyAndPeriod,
a1.busVinSid AS saleVehSid,
a1.salesOrderSid
FROM

8
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyMapper.xml

@ -20,7 +20,7 @@
<update id="updateFlowFiled">
UPDATE loan_be_padsincere_apply
SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}
SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}, modifyTime = NOW()
<if test="procDefId != null and procDefId != ''">
, procDefId=#{procDefId}
</if>
@ -51,7 +51,7 @@
<select id="dkListPage" resultType="com.yxt.anrui.riskcenter.api.loanbepadsincereapply.DkRecordVo">
SELECT
la.useOrgName,
la.deptName,
bo.orgName AS deptName,
la.billNo,
lv.vinNo,
lv.`loanContractNo`,
@ -73,6 +73,10 @@
loan_be_padsincere_veh lv
LEFT JOIN loan_be_padsincere_apply la
ON lv.mainSid = la.sid
LEFT JOIN anrui_buscenter.`bus_sales_order_vehicle` bv
ON bv.`sid` = lv.`saleVehSid`
LEFT JOIN anrui_buscenter.`bus_sales_order` bo
ON bo.`sid` = bv.`salesOrderSid`
<where>
${ew.sqlSegment}
</where>

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

@ -26,6 +26,7 @@
package com.yxt.anrui.riskcenter.biz.loanbepadsincereapply;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -196,9 +197,20 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
qw.apply(StringUtils.isNotBlank(query.getCreateStartTime()), "date_format (createTime,'%Y-%m-%d') >= date_format('" + query.getCreateStartTime() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(query.getCreateEndTime()), "date_format (createTime,'%Y-%m-%d') <= date_format('" + query.getCreateEndTime() + "','%Y-%m-%d')"
);
qw.apply(StringUtils.isNotBlank(query.getModifyStartTime()), "date_format (modifyTime,'%Y-%m-%d') >= date_format('" + query.getModifyStartTime() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(query.getModifyEndTime()), "date_format (modifyTime,'%Y-%m-%d') <= date_format('" + query.getModifyEndTime() + "','%Y-%m-%d')"
);
qw.orderByDesc("createTime");
IPage<LoanBePadsincereApply> page = PagerUtil.queryToPage(pq);
IPage<LoanBePadsincereApplyVo> pagging = baseMapper.selectPageVo(page, qw);
for (LoanBePadsincereApplyVo record : pagging.getRecords()) {
if ("终止".equals(record.getNodeState()) || "已办结".equals(record.getNodeState())) {
DateTime modifyTime = DateUtil.parse(record.getModifyTime());
record.setModifyTime(DateUtil.formatDate(modifyTime));
} else {
record.setModifyTime("未办结");
}
}
PagerVo<LoanBePadsincereApplyVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
@ -246,6 +258,7 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
return p;
}
}
qw.eq("la.nodeState", "已办结");
if (StringUtils.isNotBlank(query.getUseOrgName())) {
qw.like("la.useOrgName", query.getUseOrgName());
}
@ -268,7 +281,7 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
qw.like("lv.bankName", query.getBankName());
}
if (StringUtils.isNotBlank(query.getCustName())) {
qw.like("lv.bankContractNo", query.getCustName());
qw.like("lv.customerName", query.getCustName());
}
if (StringUtils.isNotBlank(query.getBorrowerName())) {
qw.like("lv.borrowerName", query.getBorrowerName());
@ -415,6 +428,9 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
loanBePadsincereVehDetailsVo.setBorrowerName(loanRepaymentScheduleDetailsVo.getBorrowerName());
loanBePadsincereVehDetailsVo.setPeriod(bePadsincereExcelInfo.getPeriod());
String sysBeMoney = loanRepaymentPlanDetailsService.selBeMoney(loanRepaymentScheduleDetailsVo.getVinNo(), bePadsincereExcelInfo.getPeriod(), bePadsincereExcelInfo.getBankContractNo());
if (StringUtils.isBlank(sysBeMoney)) {
sysBeMoney = "0";
}
loanBePadsincereVehDetailsVo.setSysBeMoney(sysBeMoney);
loanBePadsincereVehDetailsVo.setBankBeMoney(String.valueOf(Integer.parseInt(bePadsincereExcelInfo.getBePrincipal()) / loanRepaymentScheduleDetailsVos.size()));
loanBePadsincereVehDetailsVo.setBankBeInter(String.valueOf(Integer.parseInt(bePadsincereExcelInfo.getBeDefInter()) / loanRepaymentScheduleDetailsVos.size()));

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

@ -1199,6 +1199,9 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
if (StringUtils.isNotBlank(pagerQuery.getStaffName())) {
qw.like("p.staffName", pagerQuery.getStaffName());
}
if (StringUtils.isNotBlank(pagerQuery.getBuckleKey())) {
qw.like("h.buckleKey", pagerQuery.getBuckleKey());
}
if (StringUtils.isNotBlank(pagerQuery.getLoanContractNo())) {
qw.like("p.loanContractNo", pagerQuery.getLoanContractNo());
}

1
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml

@ -25,6 +25,7 @@
WHERE lrpd.vinNo = #{no}
AND lrpd.period = #{period}
AND lrpd.bankContractNo = #{bankContractNo}
AND DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; CURDATE()
GROUP BY lrpd.`sid`
HAVING (yq_total > 0)
</select>

43
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@ -59,6 +59,7 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.messagecenter.api.message.MessageFeign;
import com.yxt.messagecenter.api.message.MessagePushTransferDto;
import com.yxt.messagecenter.api.message.PushMessageQuery;
import com.yxt.messagecenter.api.messagelist.MessageListDto;
import org.apache.tomcat.util.threads.ThreadPoolExecutor;
import org.springframework.beans.factory.annotation.Autowired;
@ -1108,21 +1109,33 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
System.out.println("还款发送短信:" + res);
System.out.println(contentCustomer);
String contentStaff = "您的贷款客户" + customer + "的还款计划表已生成";
//消息推送
MessagePushTransferDto messagePushTransferDto = new MessagePushTransferDto();
messagePushTransferDto.setMsgTypeSid("bc59c198-2d51-458f-913e-cbd8d7ef4799");
messagePushTransferDto.setMsgType("业务");
messagePushTransferDto.setMsgTitle("生成还款计划表");
messagePushTransferDto.setMsgContent(contentStaff);
messagePushTransferDto.setMsgSource("还款计划表");
messagePushTransferDto.setSenderSid(sendSid);
messagePushTransferDto.setSenderName(sendName);
messagePushTransferDto.setSenderDeptSid(sendDeptSid);
messagePushTransferDto.setSenderDeptName(sendDept);
messagePushTransferDto.setBusinessSid(schedule.getSid());
messagePushTransferDto.setReceiveSids(staffSid);
messagePushTransferDto.setReceiveNames(staffName);
messageFeign.pushTransferMessage(messagePushTransferDto);
// //消息推送
// MessagePushTransferDto messagePushTransferDto = new MessagePushTransferDto();
// messagePushTransferDto.setMsgTypeSid("bc59c198-2d51-458f-913e-cbd8d7ef4799");
// messagePushTransferDto.setMsgType("业务");
// messagePushTransferDto.setMsgTitle("生成还款计划表");
// messagePushTransferDto.setMsgContent(contentStaff);
// messagePushTransferDto.setMsgSource("还款计划表");
// messagePushTransferDto.setSenderSid(sendSid);
// messagePushTransferDto.setSenderName(sendName);
// messagePushTransferDto.setSenderDeptSid(sendDeptSid);
// messagePushTransferDto.setSenderDeptName(sendDept);
// messagePushTransferDto.setBusinessSid(schedule.getSid());
// messagePushTransferDto.setReceiveSids(staffSid);
// messagePushTransferDto.setReceiveNames(staffName);
// messageFeign.pushTransferMessage(messagePushTransferDto);
//发送通知给销售专员
List<String> receIveUserSidList = new ArrayList<>();
receIveUserSidList.add(staffSid);
PushMessageQuery pushMessageQuery = new PushMessageQuery();
pushMessageQuery.setReceivedSids(receIveUserSidList);
pushMessageQuery.setModuleName("风控");
pushMessageQuery.setMsgContent(contentStaff);
pushMessageQuery.setApp_type("2");
pushMessageQuery.setModuleSid("fec4e243-491a-11ec-94cd-fa163e0cb33c");
pushMessageQuery.setMsgTitle("还款计划提醒");
// 消息推送
messageFeign.pushNoUriMessage(pushMessageQuery);
}
});
} catch (Exception e) {

80
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppInvoiceDetails.java

@ -0,0 +1,80 @@
package com.yxt.anrui.terminal.api.risk.becollection;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* @author Administrator
* @description
* @date 2023/4/5 20:30
*/
@Data
public class AppInvoiceDetails implements Vo {
@ApiModelProperty("开票单位")
private String invoiceTitle;
@ApiModelProperty("申请人")
private String name;
@ApiModelProperty("合同编号")
private String contractNo;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("业务状态")
private String businessState;
@ApiModelProperty("是否领票")
private String isTakeTicket;
@ApiModelProperty("发票状态")
private String billingState;
@ApiModelProperty("开票类型")
private String invoiceType;
@ApiModelProperty("开票金额")
private BigDecimal invoiceAmount;
@ApiModelProperty("开票人")
private String drawer;
@ApiModelProperty("发票号")
private String invoiceNo;
@ApiModelProperty("发票代码")
private String invoiceCode;
@ApiModelProperty("开票日期")
private String createTime;
@ApiModelProperty("接收人")
private String recipient;
@ApiModelProperty("接收日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date transferTime;
@ApiModelProperty("移交状态")
private String transferState;
@ApiModelProperty("移交备注")
private String transferRemarks;
@ApiModelProperty("发票照片")
private List<String> fpFiles = new ArrayList<>();
@ApiModelProperty("开票申请附件")
private List<String> kpsqFiles = new ArrayList<>();
@ApiModelProperty("合格证照片")
private List<String> hgzFiles = new ArrayList<>();
@ApiModelProperty("开票名称")
private String invoicingName;
@ApiModelProperty("纳税人识别号")
private String taxpayerNo;
@ApiModelProperty("地址")
private String address;
@ApiModelProperty("电话")
private String telPhone;
@ApiModelProperty("开户行")
private String openingBank;
@ApiModelProperty("银行账号")
private String bankNum;
}

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/BeCollectionFeign.java

@ -64,6 +64,10 @@ public interface BeCollectionFeign {
@GetMapping("/yhmxDetails")
public ResultBean<AppMonRepayDetails> yhmxDetails(@RequestParam("saleVehSid") String saleVehSid);
@ApiOperation("开票管理")
@GetMapping("/kpglDetails")
public ResultBean<AppInvoiceDetails> kpglDetails(@RequestParam("sid") String sid);
/****************************************催收流程审批******************************************/
@ApiOperation("办理")

5
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionRest.java

@ -86,6 +86,11 @@ public class BeCollectionRest implements BeCollectionFeign {
return beCollectionService.yhmxDetails(saleVehSid);
}
@Override
public ResultBean<AppInvoiceDetails> kpglDetails(String sid) {
return beCollectionService.kpglDetails(sid);
}
@Override
public ResultBean agreeCreditInfo(CompleteBeCollectionDto dto) {
return beCollectionService.agreeCreditInfo(dto);

24
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java

@ -30,6 +30,8 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.ReaRepaymentDto;
import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceDetailsVo;
import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
@ -103,6 +105,8 @@ public class BeCollectionService {
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private CommonService commonService;
@Autowired
private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
public ResultBean agreeCreditInfo(CompleteBeCollectionDto dto) {
ResultBean rb = ResultBean.fireFail();
@ -606,4 +610,24 @@ public class BeCollectionService {
appMonRepayDetails.setAppMonRepayPeriodDetailsList(appMonRepayPeriodDetailsList);
return rb.success().setData(appMonRepayDetails);
}
public ResultBean<AppInvoiceDetails> kpglDetails(String sid) {
ResultBean rb = ResultBean.fireFail();
FinVehicleInvoiceDetailsVo finVehicleInvoiceDetailsVo = finVehicleInvoiceFeign.fetchBySid(sid).getData();
AppInvoiceDetails appInvoiceDetails = new AppInvoiceDetails();
BeanUtil.copyProperties(finVehicleInvoiceDetailsVo,appInvoiceDetails);
List<String> filePaths = finVehicleInvoiceDetailsVo.getFilePaths();
if (filePaths != null && filePaths.size() > 0){
appInvoiceDetails.setFpFiles(filePaths);
}
List<String> billingFilePaths = finVehicleInvoiceDetailsVo.getBillingFilePaths();
if (billingFilePaths != null && billingFilePaths.size() > 0){
appInvoiceDetails.setKpsqFiles(billingFilePaths);
}
List<String> certificatePaths = finVehicleInvoiceDetailsVo.getCertificatePaths();
if (certificatePaths != null && certificatePaths.size() > 0){
appInvoiceDetails.setHgzFiles(certificatePaths);
}
return rb.success().setData(appInvoiceDetails);
}
}
Loading…
Cancel
Save