Browse Source

Merge remote-tracking branch 'origin/master'

master
God 1 year ago
parent
commit
dfd37b7f2e
  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/deduct/deduct.vue
  5. 7
      anrui-riskcenter-ui/src/views/workFlow/diankuanFlow/advancerequestDaiBan.vue
  6. 11
      anrui-riskcenter-ui/src/views/workFlow/diankuanFlow/advancerequestEdit.vue
  7. 7
      anrui-riskcenter-ui/src/views/workFlow/diankuanFlow/advancerequestYiBan.vue
  8. 43
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.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/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" />

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) {

Loading…
Cancel
Save