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

Merge remote-tracking branch 'origin/master'

master
dimengzhe 1 year ago
parent
cbaa7b4360 dbfeee9c54
commit
87e8a837c8
5 changed files with 86 additions and 9 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. 36
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue
  2. 36
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/daifukuanguanli/obligation.vue
  3. 14
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  4. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java
  5. 5
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml

36
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue
View File

@ -7,7 +7,7 @@
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
<el-form-item label="状态">
<el-select v-model="listQuery.params.state" placeholder="请选择" clearable class="addinputw">
<el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
@ -23,6 +23,24 @@
<el-option v-for="item in costTitle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="收款单位名称">
<el-input v-model="listQuery.params.receiveCompany" placeholder="" clearable/>
</el-form-item>
<el-form-item label="收款账号">
<el-input v-model="listQuery.params.receiveBankAccount" placeholder="" clearable/>
</el-form-item>
<el-form-item label="金额">
<el-input v-model="listQuery.params.cost" placeholder="" clearable/>
</el-form-item>
<el-form-item label="付款时需备注内容">
<el-input v-model="listQuery.params.busRemarks" placeholder="" clearable/>
</el-form-item>
<el-form-item label="开户名称">
<el-input v-model="listQuery.params.payBank" placeholder="" clearable/>
</el-form-item>
<el-form-item label="付款账号">
<el-input v-model="listQuery.params.payBankAccount" placeholder="" clearable/>
</el-form-item>
<el-form-item label="审批日期">
<el-date-picker v-model="listQuery.params.createStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
<span style="padding: 0 8px">至</span>
@ -360,7 +378,13 @@ export default {
createStartDate: '',
state: '',
userSid: '',
orgPath: ''
orgPath: '',
receiveCompany: '',
receiveBankAccount: '',
cost: '',
busRemarks: '',
payBank: '',
payBankAccount: ''
},
current: 1,
size: 10,
@ -537,7 +561,13 @@ export default {
createStartDate: '',
state: '',
userSid: '',
orgPath: ''
orgPath: '',
receiveCompany: '',
receiveBankAccount: '',
cost: '',
busRemarks: '',
payBank: '',
payBankAccount: ''
},
current: 1,
size: 10,

36
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/daifukuanguanli/obligation.vue
View File

@ -7,7 +7,7 @@
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
<el-form-item label="状态">
<el-select v-model="listQuery.params.state" placeholder="请选择" clearable class="addinputw">
<el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
@ -23,6 +23,24 @@
<el-option v-for="item in costTitle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="收款单位名称">
<el-input v-model="listQuery.params.receiveCompany" placeholder="" clearable/>
</el-form-item>
<el-form-item label="收款账号">
<el-input v-model="listQuery.params.receiveBankAccount" placeholder="" clearable/>
</el-form-item>
<el-form-item label="金额">
<el-input v-model="listQuery.params.cost" placeholder="" clearable/>
</el-form-item>
<el-form-item label="付款时需备注内容">
<el-input v-model="listQuery.params.busRemarks" placeholder="" clearable/>
</el-form-item>
<el-form-item label="开户名称">
<el-input v-model="listQuery.params.payBank" placeholder="" clearable/>
</el-form-item>
<el-form-item label="付款账号">
<el-input v-model="listQuery.params.payBankAccount" placeholder="" clearable/>
</el-form-item>
<el-form-item label="审批日期">
<el-date-picker v-model="listQuery.params.createStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
<span style="padding: 0 8px">至</span>
@ -209,7 +227,13 @@ export default {
createStartDate: '',
state: '',
userSid: '',
orgPath: ''
orgPath: '',
receiveCompany: '',
receiveBankAccount: '',
cost: '',
busRemarks: '',
payBank: '',
payBankAccount: ''
},
current: 1,
size: 10,
@ -303,7 +327,13 @@ export default {
createStartDate: '',
state: '',
userSid: '',
orgPath: ''
orgPath: '',
receiveCompany: '',
receiveBankAccount: '',
cost: '',
busRemarks: '',
payBank: '',
payBankAccount: ''
},
current: 1,
size: 10,

14
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
View File

@ -3253,6 +3253,20 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
Map<String, Object> map = BeanUtil.beanToMap(ufVo);
//更新业务中的流程相关的参数
updateFlowFiled(map);
if ("发起申请".equals(ufVo.getNodeState())) {
//查询销售订单信息
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplication.getContractNo()).getData();
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchByMainSid(query.getBusinessSid());
List<BaseVehicleStateDto> baseVehicleStateDtos = new ArrayList<>();
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByOrderSidAndVehSid(busSalesOrder.getSid(), finBillVehicleVo.getVehSid()).getData();
baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid());
baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.QKKPZZ.getTypeKey());
baseVehicleStateDtos.add(baseVehicleStateDto);
}
baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos);
}
//极光推送
finBillApplication = fetchBySid(businessSid);
try {

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

@ -378,7 +378,7 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceFeign.selectByVinAndContractNo(busSalesOrderVehicle1.getLinkSid(), busSalesOrder.getContractNo()).getData();
LoanBeCollectionVehFile loanBeCollectionVehFile2 = new LoanBeCollectionVehFile();
loanBeCollectionVehFile2.setName("开票信息");
//loanBeCollectionVehFile2.setSid(finVehicleInvoice.getSid());
loanBeCollectionVehFile2.setSid(finVehicleInvoice.getSid());
loanBeCollectionVehFiles.add(loanBeCollectionVehFile2);
//月还明细sid
LoanBeCollectionVehFile loanBeCollectionVehFile3 = new LoanBeCollectionVehFile();
@ -440,7 +440,7 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceFeign.selectByVinAndContractNo(busSalesOrderVehicle1.getLinkSid(), busSalesOrder.getContractNo()).getData();
LoanBeCollectionVehFile loanBeCollectionVehFile2 = new LoanBeCollectionVehFile();
loanBeCollectionVehFile2.setName("开票信息");
//loanBeCollectionVehFile2.setSid(finVehicleInvoice.getSid());
loanBeCollectionVehFile2.setSid(finVehicleInvoice.getSid());
loanBeCollectionVehFiles.add(loanBeCollectionVehFile2);
//月还明细sid
LoanBeCollectionVehFile loanBeCollectionVehFile3 = new LoanBeCollectionVehFile();

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

@ -83,7 +83,8 @@
a1.mobile AS custPhone,
a1.`loanContractNo`,
a1.`bankName`,
a1.createTime AS firstBeDate,
a1.vehMark AS carNum,
a1.dueDate AS firstBeDate,
COUNT(a1.sid) AS beOverduePeriod,
SUM(a1.yq_total) AS beOverdueMoney,
SUM(a1.yq_hsqs) AS beOverdueMoneyAndPeriod,
@ -96,6 +97,8 @@
lrpd.`loanContractNo`,
lrpd.`vinNo`,
lrpd.`bankName`,
lrpd.dueDate,
lrpd.vehMark,
(
lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0))
) AS yq_total,

Write Preview
Loading…
Cancel
Save