GTsoft/mps-platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

附加项新增 导入优化、

Browse Source 
导入页面查询优化、
每日录入明细页面导出优化、
身份证非空，x改大写
罚没款增加编号查询条件
This commit is contained in:
zhuangdashia 2025-11-10 09:41:39 +08:00
parent 6ee1930df5
commit eea982ec33
6 changed files with 52 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cds-fontend-2025.V1/src/views/mps/emp-add-items/modules/emp-add-items-import-modal.vue
View File

@ -180,7 +180,7 @@
</NAlert>
<template #footer>
<NSpace justify="end" :size="16">
<!-- <NButton @click="handleDownloadTemplate">{{ $t('common.downloadTemplate') }}</NButton>-->
<NButton @click="handleDownloadTemplate">{{ $t('common.downloadTemplate') }}</NButton>
<NButton :disabled="message != ''" type="primary" @click="handleSubmit">{{ $t('common.import') }}</NButton>
</NSpace>
</template>

78
cds-fontend-2025.V1/src/views/original/import-special/modules/import-special-search.vue
View File

@ -50,51 +50,51 @@ async function search() {
<NFormItemGi span="24 s:12 m:6" label="户名" path="acctName" class="pr-24px">
<NInput v-model:value="model.acctName" placeholder="请输入户名" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="代理人名称" path="agentName" class="pr-24px">
<NInput v-model:value="model.agentName" placeholder="请输入代理人名称" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="凭证印刷号" path="voucherNumber" class="pr-24px">
<NInput v-model:value="model.voucherNumber" placeholder="请输入凭证印刷号" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="册/编号" path="bookNumber" class="pr-24px">
<NInput v-model:value="model.bookNumber" placeholder="请输入册/编号" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="笔/序号" path="transactionSerial" class="pr-24px">
<NInput v-model:value="model.transactionSerial" placeholder="请输入笔/序号" />
</NFormItemGi>
<!-- <NFormItemGi span="24 s:12 m:6" label="代理人名称" path="agentName" class="pr-24px">-->
<!-- <NInput v-model:value="model.agentName" placeholder="请输入代理人名称" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="凭证印刷号" path="voucherNumber" class="pr-24px">-->
<!-- <NInput v-model:value="model.voucherNumber" placeholder="请输入凭证印刷号" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="册/编号" path="bookNumber" class="pr-24px">-->
<!-- <NInput v-model:value="model.bookNumber" placeholder="请输入册/编号" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="笔/序号" path="transactionSerial" class="pr-24px">-->
<!-- <NInput v-model:value="model.transactionSerial" placeholder="请输入笔/序号" />-->
<!-- </NFormItemGi>-->
<NFormItemGi span="24 s:12 m:6" label="事务名称" path="transactionName" class="pr-24px">
<NInput v-model:value="model.transactionName" placeholder="请输入事务名称" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="事务序号" path="transactionSeq" class="pr-24px">
<NInput v-model:value="model.transactionSeq" placeholder="请输入事务序号" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="币种" path="currency" class="pr-24px">
<NInput v-model:value="model.currency" placeholder="请输入币种" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="本次冻结金额" path="freezeAmount" class="pr-24px">
<NInput v-model:value="model.freezeAmount" placeholder="请输入本次冻结金额" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="本次实际冻结金额" path="actualFreezeAmount" class="pr-24px">
<NInput v-model:value="model.actualFreezeAmount" placeholder="请输入本次实际冻结金额" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="止扣/质借号" path="pledgeNumber" class="pr-24px">
<NInput v-model:value="model.pledgeNumber" placeholder="请输入止扣/质借号" />
</NFormItemGi>
<!-- <NFormItemGi span="24 s:12 m:6" label="事务序号" path="transactionSeq" class="pr-24px">-->
<!-- <NInput v-model:value="model.transactionSeq" placeholder="请输入事务序号" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="币种" path="currency" class="pr-24px">-->
<!-- <NInput v-model:value="model.currency" placeholder="请输入币种" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="本次冻结金额" path="freezeAmount" class="pr-24px">-->
<!-- <NInput v-model:value="model.freezeAmount" placeholder="请输入本次冻结金额" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="本次实际冻结金额" path="actualFreezeAmount" class="pr-24px">-->
<!-- <NInput v-model:value="model.actualFreezeAmount" placeholder="请输入本次实际冻结金额" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="止扣/质借号" path="pledgeNumber" class="pr-24px">-->
<!-- <NInput v-model:value="model.pledgeNumber" placeholder="请输入止扣/质借号" />-->
<!-- </NFormItemGi>-->
<NFormItemGi span="24 s:12 m:6" label="证件号码" path="crtNo" class="pr-24px">
<NInput v-model:value="model.crtNo" placeholder="请输入证件号码" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="登录日" path="loggedDate" class="pr-24px">
<NInput v-model:value="model.loggedDate" placeholder="请输入登录日" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="解除日" path="releasedDate" class="pr-24px">
<NInput v-model:value="model.releasedDate" placeholder="请输入解除日" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="受理机构" path="branchCode" class="pr-24px">
<NInput v-model:value="model.branchCode" placeholder="请输入受理机构" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="受理柜员号" path="tellerId" class="pr-24px">
<NInput v-model:value="model.tellerId" placeholder="请输入受理柜员号" />
</NFormItemGi>
<!-- <NFormItemGi span="24 s:12 m:6" label="登录日" path="loggedDate" class="pr-24px">-->
<!-- <NInput v-model:value="model.loggedDate" placeholder="请输入登录日" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="解除日" path="releasedDate" class="pr-24px">-->
<!-- <NInput v-model:value="model.releasedDate" placeholder="请输入解除日" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="受理机构" path="branchCode" class="pr-24px">-->
<!-- <NInput v-model:value="model.branchCode" placeholder="请输入受理机构" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="受理柜员号" path="tellerId" class="pr-24px">-->
<!-- <NInput v-model:value="model.tellerId" placeholder="请输入受理柜员号" />-->
<!-- </NFormItemGi>-->
<NFormItemGi span="24 s:12 m:6" label="计价月份" path="importTime" class="pr-24px">
<NInput v-model:value="model.importTime" placeholder="请输入计价月份" />
</NFormItemGi>

6
cds-fontend-2025.V1/src/views/original/traffic/modules/traffic-search.vue
View File

@ -47,9 +47,9 @@ async function search() {
<!-- <NFormItemGi span="24 s:12 m:6" label="缴费账号" path="payerAccount" class="pr-24px">-->
<!-- <NInput v-model:value="model.payerAccount" placeholder="请输入缴费账号" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="处罚决定书编号" path="penaltyDecisionNo" class="pr-24px">-->
<!-- <NInput v-model:value="model.penaltyDecisionNo" placeholder="请输入处罚决定书编号" />-->
<!-- </NFormItemGi>-->
<NFormItemGi span="24 s:12 m:6" label="处罚编号" path="penaltyDecisionNo" class="pr-24px">
<NInput v-model:value="model.penaltyDecisionNo" placeholder="请输入处罚决定书编号" />
</NFormItemGi>
<!-- <NFormItemGi span="24 s:12 m:6" label="缴费方式" path="paymentMethod" class="pr-24px">-->
<!-- <NInput v-model:value="model.paymentMethod" placeholder="请输入缴费方式" />-->
<!-- </NFormItemGi>-->

4
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsEmpAddItemsServiceImpl.java
View File

@ -148,8 +148,8 @@ public class MpsEmpAddItemsServiceImpl implements IMpsEmpAddItemsService {
*/
@Override
public Boolean insertByBo(MpsEmpAddItemsBo bo) {
String month = DateUtils.parseDateToStr(FormatsType.YYYY_MM,Date.from(Instant.ofEpochMilli(Long.parseLong(bo.getRecordMonth()))));
bo.setRecordMonth(month);
// String month = DateUtils.parseDateToStr(FormatsType.YYYY_MM,Date.from(Instant.ofEpochMilli(Long.parseLong(bo.getRecordMonth()))));
bo.setRecordMonth(bo.getRecordMonth());
MpsEmpAddItems add = MapstructUtils.convert(bo, MpsEmpAddItems.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;

4
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsMarketServiceImpl.java
View File

@ -191,6 +191,10 @@ public class MpsMarketServiceImpl implements IMpsMarketService {
public Boolean insertByBo(MpsMarketBo bo) {
MpsMarket add = MapstructUtils.convert(bo, MpsMarket.class);
add.setEntryDate(DateUtil.format(new Date(), "yyyy-MM-dd"));
//身份证非空，x改大写
add.setCustId(add.getCustId() != null ? add.getCustId().toUpperCase() : null);
validEntityBefore(add);
System.out.println("add:--->"+add);
boolean flag = baseMapper.insert(add) > 0;

6
cds-platform-2025.V1/cds-modules/cds-system/src/main/resources/mapper/mps/MpsDetailEntryMapper.xml
View File

@ -58,9 +58,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM mps_market m
LEFT JOIN mps_traffic t ON m.traffic_id = t.traffic_id
LEFT JOIN mps_magneticcard c ON m.magnetic_card_id = c.magnetic_card_id
LEFT JOIN sys_user s ON m.yx_id = s.mkt_no
LEFT JOIN sys_dept d ON s.dept_id = d.dept_id
LEFT JOIN sys_dept de ON m.dept_id = de.dept_id
LEFT JOIN sys_user s ON m.yx_id = s.mkt_no and s.del_flag='0'
LEFT JOIN sys_dept d ON s.dept_id = d.dept_id and d.del_flag='0'
LEFT JOIN sys_dept de ON m.dept_id = de.dept_id and de.del_flag='0'
where m.del_flag='0'
) temp ${ew.customSqlSegment}