Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
xiaocp2009 2025-09-08 17:06:04 +08:00
commit 4bcb60f755
48 changed files with 295 additions and 301 deletions

View File

@ -54,6 +54,7 @@ declare module 'vue' {
NCollapse: typeof import('naive-ui')['NCollapse']
NCollapseItem: typeof import('naive-ui')['NCollapseItem']
NColorPicker: typeof import('naive-ui')['NColorPicker']
ND: typeof import('naive-ui')['ND']
NDataTable: typeof import('naive-ui')['NDataTable']
NDatePicker: typeof import('naive-ui')['NDatePicker']
NDescriptions: typeof import('naive-ui')['NDescriptions']

View File

@ -65,14 +65,14 @@ const {
width: 64,
resizable: true
},
{
key: 'id',
title: '主键',
align: 'center',
minWidth: 120,
ellipsis: true,
resizable: true
},
// {
// key: 'id',
// title: '',
// align: 'center',
// minWidth: 120,
// ellipsis: true,
// resizable: true
// },
{
key: 'accountNumber',
title: '账号',

View File

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

View File

@ -44,30 +44,30 @@ async function search() {
<NFormItemGi span="24 s:12 m:6" label="账户名称" path="accountName" class="pr-24px">
<NInput v-model:value="model.accountName" placeholder="请输入账户名称" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="开户日期" path="openingDate" class="pr-24px">
<NInput v-model:value="model.openingDate" placeholder="请输入开户日期" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="到期日期" path="expiryDate" class="pr-24px">
<NInput v-model:value="model.expiryDate" placeholder="请输入到期日期" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="期限" path="term" class="pr-24px">
<NInput v-model:value="model.term" placeholder="请输入期限" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="科目号" path="subjectNumber" class="pr-24px">
<NInput v-model:value="model.subjectNumber" placeholder="请输入科目号" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="账户年日均余额" path="yearlyAvgBalance" class="pr-24px">
<NInput v-model:value="model.yearlyAvgBalance" placeholder="请输入账户年日均余额" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="账户季日均余额" path="quarterlyAvgBalance" class="pr-24px">
<NInput v-model:value="model.quarterlyAvgBalance" placeholder="请输入账户季日均余额" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="账户月日均余额" path="monthlyAvgBalance" class="pr-24px">
<NInput v-model:value="model.monthlyAvgBalance" placeholder="请输入账户月日均余额" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="账户余额" path="accountBalance" class="pr-24px">
<NInput v-model:value="model.accountBalance" placeholder="请输入账户余额" />
</NFormItemGi>
<!-- <NFormItemGi span="24 s:12 m:6" label="开户日期" path="openingDate" class="pr-24px">-->
<!-- <NInput v-model:value="model.openingDate" placeholder="请输入开户日期" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="到期日期" path="expiryDate" class="pr-24px">-->
<!-- <NInput v-model:value="model.expiryDate" placeholder="请输入到期日期" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="期限" path="term" class="pr-24px">-->
<!-- <NInput v-model:value="model.term" placeholder="请输入期限" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="科目号" path="subjectNumber" class="pr-24px">-->
<!-- <NInput v-model:value="model.subjectNumber" placeholder="请输入科目号" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="账户年日均余额" path="yearlyAvgBalance" class="pr-24px">-->
<!-- <NInput v-model:value="model.yearlyAvgBalance" placeholder="请输入账户年日均余额" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="账户季日均余额" path="quarterlyAvgBalance" class="pr-24px">-->
<!-- <NInput v-model:value="model.quarterlyAvgBalance" placeholder="请输入账户季日均余额" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="账户月日均余额" path="monthlyAvgBalance" class="pr-24px">-->
<!-- <NInput v-model:value="model.monthlyAvgBalance" placeholder="请输入账户月日均余额" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="账户余额" path="accountBalance" class="pr-24px">-->
<!-- <NInput v-model:value="model.accountBalance" placeholder="请输入账户余额" />-->
<!-- </NFormItemGi>-->
<NFormItemGi span="24 s:12 m:6" label="开户机构" path="openingBranch" class="pr-24px">
<NInput v-model:value="model.openingBranch" placeholder="请输入开户机构" />
</NFormItemGi>

View File

@ -60,14 +60,14 @@ const {
width: 64,
resizable: true
},
{
key: 'id',
title: '主键',
align: 'center',
minWidth: 120,
ellipsis: true,
resizable: true
},
// {
// key: 'id',
// title: '',
// align: 'center',
// minWidth: 120,
// ellipsis: true,
// resizable: true
// },
{
key: 'cardNumber',
title: '卡号',

View File

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

View File

@ -44,20 +44,20 @@ async function search() {
<NFormItemGi span="24 s:12 m:6" label="开户机构" path="openingBranch" class="pr-24px">
<NInput v-model:value="model.openingBranch" placeholder="请输入开户机构" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="账户余额" path="accountBalance" class="pr-24px">
<NInput v-model:value="model.accountBalance" placeholder="请输入账户余额" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="账户月日均" path="monthlyAvgBalance" class="pr-24px">
<NInput v-model:value="model.monthlyAvgBalance" placeholder="请输入账户月日均" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="账户季日均" path="quarterlyAvgBalance" class="pr-24px">
<NInput v-model:value="model.quarterlyAvgBalance" placeholder="请输入账户季日均" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="账户年日均" path="yearlyAvgBalance" class="pr-24px">
<NInput v-model:value="model.yearlyAvgBalance" placeholder="请输入账户年日均" />
</NFormItemGi>
<!-- <NFormItemGi span="24 s:12 m:6" label="账户余额" path="accountBalance" class="pr-24px">-->
<!-- <NInput v-model:value="model.accountBalance" placeholder="请输入账户余额" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="账户月日均" path="monthlyAvgBalance" class="pr-24px">-->
<!-- <NInput v-model:value="model.monthlyAvgBalance" placeholder="请输入账户月日均" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="账户季日均" path="quarterlyAvgBalance" class="pr-24px">-->
<!-- <NInput v-model:value="model.quarterlyAvgBalance" placeholder="请输入账户季日均" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="账户年日均" path="yearlyAvgBalance" class="pr-24px">-->
<!-- <NInput v-model:value="model.yearlyAvgBalance" placeholder="请输入账户年日均" />-->
<!-- </NFormItemGi>-->
<NFormItemGi span="24 s:12 m:6" label="导入周期" path="importTime" class="pr-24px">
<NInput v-model:value="model.importTime" placeholder="请输入导入周期" />
<NInput v-model:value="model.importTime" clearable placeholder="请输入导入周期" />
</NFormItemGi>
<NFormItemGi span="24" class="pr-24px">
<NSpace class="w-full" justify="end">

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -111,14 +111,14 @@ const {
width: 64,
resizable: true
},
{
key: 'id',
title: '自增主键',
align: 'center',
minWidth: 120,
ellipsis: true,
resizable: true
},
// {
// key: 'id',
// title: '',
// align: 'center',
// minWidth: 120,
// ellipsis: true,
// resizable: true
// },
{
key: 'institutionName',
title: '机构名称',

View File

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

View File

@ -70,14 +70,14 @@ const {
width: 64,
resizable: true
},
{
key: 'id',
title: '自增主键',
align: 'center',
minWidth: 120,
ellipsis: true,
resizable: true
},
// {
// key: 'id',
// title: '',
// align: 'center',
// minWidth: 120,
// ellipsis: true,
// resizable: true
// },
{
key: 'merchantName',
title: '商户名称',

View File

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

View File

@ -44,48 +44,48 @@ async function search() {
<NFormItemGi span="24 s:12 m:6" label="商户编号" path="merchantId" class="pr-24px">
<NInput v-model:value="model.merchantId" placeholder="请输入商户编号" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="商户结算账号" path="settlementAccount" class="pr-24px">
<NInput v-model:value="model.settlementAccount" placeholder="请输入商户结算账号" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="商户入驻方式" path="entryMethod" class="pr-24px">
<NInput v-model:value="model.entryMethod" placeholder="请输入商户入驻方式" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="商户级别" path="merchantLevel" class="pr-24px">
<NInput v-model:value="model.merchantLevel" placeholder="请输入商户级别" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="所属一级商户编号" path="parentMerchantId" class="pr-24px">
<NInput v-model:value="model.parentMerchantId" placeholder="请输入所属一级商户编号" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="所属一级商户名称" path="parentMerchantName" class="pr-24px">
<NInput v-model:value="model.parentMerchantName" placeholder="请输入所属一级商户名称" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="当日累计交易手续费" path="dailyFee" class="pr-24px">
<NInput v-model:value="model.dailyFee" placeholder="请输入当日累计交易手续费" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="当日累计结算金额" path="dailySettlement" class="pr-24px">
<NInput v-model:value="model.dailySettlement" placeholder="请输入当日累计结算金额" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="当日累计交易笔数" path="dailyTransCount" class="pr-24px">
<NInput v-model:value="model.dailyTransCount" placeholder="请输入当日累计交易笔数" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="自月初累计交易手续费" path="monthlyFee" class="pr-24px">
<NInput v-model:value="model.monthlyFee" placeholder="请输入自月初累计交易手续费" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="自月初累计结算金额" path="monthlySettlement" class="pr-24px">
<NInput v-model:value="model.monthlySettlement" placeholder="请输入自月初累计结算金额" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="自月初累计交易笔数" path="monthlyTransCount" class="pr-24px">
<NInput v-model:value="model.monthlyTransCount" placeholder="请输入自月初累计交易笔数" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="自年初累计交易手续费" path="yearlyFee" class="pr-24px">
<NInput v-model:value="model.yearlyFee" placeholder="请输入自年初累计交易手续费" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="自年初累计结算金额" path="yearlySettlement" class="pr-24px">
<NInput v-model:value="model.yearlySettlement" placeholder="请输入自年初累计结算金额" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="自年初累计交易笔数" path="yearlyTransCount" class="pr-24px">
<NInput v-model:value="model.yearlyTransCount" placeholder="请输入自年初累计交易笔数" />
</NFormItemGi>
<!-- <NFormItemGi span="24 s:12 m:6" label="商户结算账号" path="settlementAccount" class="pr-24px">-->
<!-- <NInput v-model:value="model.settlementAccount" placeholder="请输入商户结算账号" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="商户入驻方式" path="entryMethod" class="pr-24px">-->
<!-- <NInput v-model:value="model.entryMethod" placeholder="请输入商户入驻方式" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="商户级别" path="merchantLevel" class="pr-24px">-->
<!-- <NInput v-model:value="model.merchantLevel" placeholder="请输入商户级别" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="所属一级商户编号" path="parentMerchantId" class="pr-24px">-->
<!-- <NInput v-model:value="model.parentMerchantId" placeholder="请输入所属一级商户编号" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="所属一级商户名称" path="parentMerchantName" class="pr-24px">-->
<!-- <NInput v-model:value="model.parentMerchantName" placeholder="请输入所属一级商户名称" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="当日累计交易手续费" path="dailyFee" class="pr-24px">-->
<!-- <NInput v-model:value="model.dailyFee" placeholder="请输入当日累计交易手续费" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="当日累计结算金额" path="dailySettlement" class="pr-24px">-->
<!-- <NInput v-model:value="model.dailySettlement" placeholder="请输入当日累计结算金额" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="当日累计交易笔数" path="dailyTransCount" class="pr-24px">-->
<!-- <NInput v-model:value="model.dailyTransCount" placeholder="请输入当日累计交易笔数" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="自月初累计交易手续费" path="monthlyFee" class="pr-24px">-->
<!-- <NInput v-model:value="model.monthlyFee" placeholder="请输入自月初累计交易手续费" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="自月初累计结算金额" path="monthlySettlement" class="pr-24px">-->
<!-- <NInput v-model:value="model.monthlySettlement" placeholder="请输入自月初累计结算金额" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="自月初累计交易笔数" path="monthlyTransCount" class="pr-24px">-->
<!-- <NInput v-model:value="model.monthlyTransCount" placeholder="请输入自月初累计交易笔数" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="自年初累计交易手续费" path="yearlyFee" class="pr-24px">-->
<!-- <NInput v-model:value="model.yearlyFee" placeholder="请输入自年初累计交易手续费" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="自年初累计结算金额" path="yearlySettlement" class="pr-24px">-->
<!-- <NInput v-model:value="model.yearlySettlement" placeholder="请输入自年初累计结算金额" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="自年初累计交易笔数" path="yearlyTransCount" class="pr-24px">-->
<!-- <NInput v-model:value="model.yearlyTransCount" placeholder="请输入自年初累计交易笔数" />-->
<!-- </NFormItemGi>-->
<NFormItemGi span="24 s:12 m:6" label="导入周期" path="importTime" class="pr-24px">
<NInput v-model:value="model.importTime" placeholder="请输入导入周期" />
</NFormItemGi>

View File

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

View File

@ -38,9 +38,9 @@ async function search() {
<NCollapseItem :title="$t('common.search')" name="user-search">
<NForm ref="formRef" :model="model" label-placement="left" :label-width="80">
<NGrid responsive="screen" item-responsive>
<NFormItemGi span="24 s:12 m:6" label="自月初累计结算金额" path="cumulativeSettlementAmount" class="pr-24px">
<NInput v-model:value="model.cumulativeSettlementAmount" placeholder="请输入自月初累计结算金额" />
</NFormItemGi>
<!-- <NFormItemGi span="24 s:12 m:6" label="自月初累计结算金额" path="cumulativeSettlementAmount" class="pr-24px">-->
<!-- <NInput v-model:value="model.cumulativeSettlementAmount" placeholder="请输入自月初累计结算金额" />-->
<!-- </NFormItemGi>-->
<NFormItemGi span="24 s:12 m:6" label="导入周期" path="importTime" class="pr-24px">
<NInput v-model:value="model.importTime" placeholder="请输入导入周期" />
</NFormItemGi>

View File

@ -61,14 +61,14 @@ const {
width: 64,
resizable: true
},
{
key: 'id',
title: '自增主键',
align: 'center',
minWidth: 120,
ellipsis: true,
resizable: true
},
// {
// key: 'id',
// title: '',
// align: 'center',
// minWidth: 120,
// ellipsis: true,
// resizable: true
// },
{
key: 'branchName',
title: '机构名称',

View File

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

View File

@ -44,36 +44,36 @@ async function search() {
<NFormItemGi span="24 s:12 m:6" label="客户名称" path="customerName" class="pr-24px">
<NInput v-model:value="model.customerName" placeholder="请输入客户名称" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="证件类型" path="idType" class="pr-24px">
<NSelect
v-model:value="model.idType"
placeholder="请选择证件类型"
:options="[]"
clearable
/>
</NFormItemGi>
<!-- <NFormItemGi span="24 s:12 m:6" label="证件类型" path="idType" class="pr-24px">-->
<!-- <NSelect-->
<!-- v-model:value="model.idType"-->
<!-- placeholder="请选择证件类型"-->
<!-- :options="[]"-->
<!-- clearable-->
<!-- />-->
<!-- </NFormItemGi>-->
<NFormItemGi span="24 s:12 m:6" label="证件号码" path="idNumber" class="pr-24px">
<NInput v-model:value="model.idNumber" placeholder="请输入证件号码" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="签约手机号" path="mobile" class="pr-24px">
<NInput v-model:value="model.mobile" placeholder="请输入签约手机号" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="签约日期" path="signDate" class="pr-24px">
<NDatePicker
v-model:formatted-value="model.signDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
clearable
/>
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="迁移日期" path="migrationDate" class="pr-24px">
<NDatePicker
v-model:formatted-value="model.migrationDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
clearable
/>
</NFormItemGi>
<!-- <NFormItemGi span="24 s:12 m:6" label="签约手机号" path="mobile" class="pr-24px">-->
<!-- <NInput v-model:value="model.mobile" placeholder="请输入签约手机号" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="签约日期" path="signDate" class="pr-24px">-->
<!-- <NDatePicker-->
<!-- v-model:formatted-value="model.signDate"-->
<!-- type="datetime"-->
<!-- value-format="yyyy-MM-dd HH:mm:ss"-->
<!-- clearable-->
<!-- />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="迁移日期" path="migrationDate" class="pr-24px">-->
<!-- <NDatePicker-->
<!-- v-model:formatted-value="model.migrationDate"-->
<!-- type="datetime"-->
<!-- value-format="yyyy-MM-dd HH:mm:ss"-->
<!-- clearable-->
<!-- />-->
<!-- </NFormItemGi>-->
<NFormItemGi span="24 s:12 m:6" label="导入周期" path="importTime" class="pr-24px">
<NInput v-model:value="model.importTime" placeholder="请输入导入周期" />
</NFormItemGi>

View File

@ -61,14 +61,14 @@ const {
width: 64,
resizable: true
},
{
key: 'id',
title: '自增主键',
align: 'center',
minWidth: 120,
ellipsis: true,
resizable: true
},
// {
// key: 'id',
// title: '',
// align: 'center',
// minWidth: 120,
// ellipsis: true,
// resizable: true
// },
{
key: 'branchName',
title: '机构名称',

View File

@ -2,12 +2,12 @@
<script setup lang="ts">
import { h, ref, watch } from 'vue';
import type { UploadFileInfo } from 'naive-ui';
import dayjs from "dayjs";
import { getToken } from '@/store/modules/auth/shared';
import { useDownload } from '@/hooks/business/download';
import { getServiceBaseURL } from '@/utils/service';
import type FileUpload from '@/components/custom/file-upload.vue';
import { $t } from '@/locales';
import dayjs from "dayjs";
defineOptions({
name: 'MobileBankInactiveYearImportModal'
@ -183,7 +183,7 @@
<template #footer>
<NSpace justify="end" :size="16">
<!-- <NButton @click="handleDownloadTemplate">{{ $t('common.downloadTemplate') }}</NButton>-->
<NButton :disabled="message != ''" type="primary" @click="handleSubmit">{{ $t('common.import') }}</NButton>
<NButton type="primary" @click="handleSubmit">{{ $t('common.import') }}</NButton>
</NSpace>
</template>
</NModal>

View File

@ -44,36 +44,36 @@ async function search() {
<NFormItemGi span="24 s:12 m:6" label="客户名称" path="customerName" class="pr-24px">
<NInput v-model:value="model.customerName" placeholder="请输入客户名称" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="证件类型" path="idType" class="pr-24px">
<NSelect
v-model:value="model.idType"
placeholder="请选择证件类型"
:options="[]"
clearable
/>
</NFormItemGi>
<!-- <NFormItemGi span="24 s:12 m:6" label="证件类型" path="idType" class="pr-24px">-->
<!-- <NSelect-->
<!-- v-model:value="model.idType"-->
<!-- placeholder="请选择证件类型"-->
<!-- :options="[]"-->
<!-- clearable-->
<!-- />-->
<!-- </NFormItemGi>-->
<NFormItemGi span="24 s:12 m:6" label="证件号码" path="idNumber" class="pr-24px">
<NInput v-model:value="model.idNumber" placeholder="请输入证件号码" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="签约手机号" path="mobile" class="pr-24px">
<NInput v-model:value="model.mobile" placeholder="请输入签约手机号" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="签约日期" path="signDate" class="pr-24px">
<NDatePicker
v-model:formatted-value="model.signDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
clearable
/>
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="迁移日期" path="migrationDate" class="pr-24px">
<NDatePicker
v-model:formatted-value="model.migrationDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
clearable
/>
</NFormItemGi>
<!-- <NFormItemGi span="24 s:12 m:6" label="签约手机号" path="mobile" class="pr-24px">-->
<!-- <NInput v-model:value="model.mobile" placeholder="请输入签约手机号" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="签约日期" path="signDate" class="pr-24px">-->
<!-- <NDatePicker-->
<!-- v-model:formatted-value="model.signDate"-->
<!-- type="datetime"-->
<!-- value-format="yyyy-MM-dd HH:mm:ss"-->
<!-- clearable-->
<!-- />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="迁移日期" path="migrationDate" class="pr-24px">-->
<!-- <NDatePicker-->
<!-- v-model:formatted-value="model.migrationDate"-->
<!-- type="datetime"-->
<!-- value-format="yyyy-MM-dd HH:mm:ss"-->
<!-- clearable-->
<!-- />-->
<!-- </NFormItemGi>-->
<NFormItemGi span="24 s:12 m:6" label="导入周期" path="importTime" class="pr-24px">
<NInput v-model:value="model.importTime" placeholder="请输入导入周期" />
</NFormItemGi>

View File

@ -64,14 +64,14 @@ const {
width: 64,
resizable: true
},
{
key: 'id',
title: '自增主键',
align: 'center',
minWidth: 120,
ellipsis: true,
resizable: true
},
// {
// key: 'id',
// title: '',
// align: 'center',
// minWidth: 120,
// ellipsis: true,
// resizable: true
// },
{
key: 'branchName',
title: '机构名称',

View File

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

View File

@ -41,43 +41,43 @@ async function search() {
<NFormItemGi span="24 s:12 m:6" label="机构名称" path="branchName" class="pr-24px">
<NInput v-model:value="model.branchName" 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="branchCode" class="pr-24px">-->
<!-- <NInput v-model:value="model.branchCode" placeholder="请输入机构号" />-->
<!-- </NFormItemGi>-->
<NFormItemGi span="24 s:12 m:6" label="客户名称" path="customerName" class="pr-24px">
<NInput v-model:value="model.customerName" placeholder="请输入客户名称" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="证件类型" path="idType" class="pr-24px">
<NSelect
v-model:value="model.idType"
placeholder="请选择证件类型"
:options="[]"
clearable
/>
</NFormItemGi>
<!-- <NFormItemGi span="24 s:12 m:6" label="证件类型" path="idType" class="pr-24px">-->
<!-- <NSelect-->
<!-- v-model:value="model.idType"-->
<!-- placeholder="请选择证件类型"-->
<!-- :options="[]"-->
<!-- clearable-->
<!-- />-->
<!-- </NFormItemGi>-->
<NFormItemGi span="24 s:12 m:6" label="证件号码" path="idNumber" class="pr-24px">
<NInput v-model:value="model.idNumber" placeholder="请输入证件号码" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="签约主账户" path="mainAccount" class="pr-24px">
<NInput v-model:value="model.mainAccount" placeholder="请输入签约主账户" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="签约日期" path="signupDate" class="pr-24px">
<NDatePicker
v-model:formatted-value="model.signupDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
clearable
/>
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="认证方式" path="authMethod" class="pr-24px">
<NInput v-model:value="model.authMethod" placeholder="请输入认证方式" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="流水号" path="serialNumber" class="pr-24px">
<NInput v-model:value="model.serialNumber" placeholder="请输入流水号" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="柜员" path="teller" class="pr-24px">
<NInput v-model:value="model.teller" placeholder="请输入柜员" />
</NFormItemGi>
<!-- <NFormItemGi span="24 s:12 m:6" label="签约主账户" path="mainAccount" class="pr-24px">-->
<!-- <NInput v-model:value="model.mainAccount" placeholder="请输入签约主账户" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="签约日期" path="signupDate" class="pr-24px">-->
<!-- <NDatePicker-->
<!-- v-model:formatted-value="model.signupDate"-->
<!-- type="datetime"-->
<!-- value-format="yyyy-MM-dd HH:mm:ss"-->
<!-- clearable-->
<!-- />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="认证方式" path="authMethod" class="pr-24px">-->
<!-- <NInput v-model:value="model.authMethod" placeholder="请输入认证方式" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="流水号" path="serialNumber" class="pr-24px">-->
<!-- <NInput v-model:value="model.serialNumber" placeholder="请输入流水号" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="柜员" path="teller" class="pr-24px">-->
<!-- <NInput v-model:value="model.teller" placeholder="请输入柜员" />-->
<!-- </NFormItemGi>-->
<NFormItemGi span="24 s:12 m:6" label="导入周期" path="importTime" class="pr-24px">
<NInput v-model:value="model.importTime" placeholder="请输入导入周期" />
</NFormItemGi>

View File

@ -64,14 +64,14 @@ const {
width: 64,
resizable: true
},
{
key: 'id',
title: '自增主键',
align: 'center',
minWidth: 120,
ellipsis: true,
resizable: true
},
// {
// key: 'id',
// title: '',
// align: 'center',
// minWidth: 120,
// ellipsis: true,
// resizable: true
// },
{
key: 'branchName',
title: '机构名称',

View File

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

View File

@ -39,45 +39,45 @@ async function search() {
<NForm ref="formRef" :model="model" label-placement="left" :label-width="80">
<NGrid responsive="screen" item-responsive>
<NFormItemGi span="24 s:12 m:6" label="机构名称" path="branchName" class="pr-24px">
<NInput v-model:value="model.branchName" placeholder="请输入机构名称" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="机构号" path="branchCode" class="pr-24px">
<NInput v-model:value="model.branchCode" placeholder="请输入机构号" />
<NInput v-model:value="model.branchName" clearable placeholder="请输入机构名称" />
</NFormItemGi>
<!-- <NFormItemGi span="24 s:12 m:6" label="机构号" path="branchCode" class="pr-24px">-->
<!-- <NInput v-model:value="model.branchCode" clearable placeholder="请输入机构号" />-->
<!-- </NFormItemGi>-->
<NFormItemGi span="24 s:12 m:6" label="客户名称" path="customerName" class="pr-24px">
<NInput v-model:value="model.customerName" placeholder="请输入客户名称" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="证件类型" path="idType" class="pr-24px">
<NSelect
v-model:value="model.idType"
placeholder="请选择证件类型"
:options="[]"
clearable
/>
<NInput v-model:value="model.customerName" clearable placeholder="请输入客户名称" />
</NFormItemGi>
<!-- <NFormItemGi span="24 s:12 m:6" label="证件类型" path="idType" class="pr-24px">-->
<!-- <NSelect-->
<!-- v-model:value="model.idType"-->
<!-- placeholder="请选择证件类型"-->
<!-- :options="[]"-->
<!-- clearable-->
<!-- />-->
<!-- </NFormItemGi>-->
<NFormItemGi span="24 s:12 m:6" label="证件号码" path="idNumber" class="pr-24px">
<NInput v-model:value="model.idNumber" placeholder="请输入证件号码" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="签约主账户" path="mainAccount" class="pr-24px">
<NInput v-model:value="model.mainAccount" placeholder="请输入签约主账户" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="签约日期" path="signupDate" class="pr-24px">
<NDatePicker
v-model:formatted-value="model.signupDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
clearable
/>
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="认证方式" path="authMethod" class="pr-24px">
<NInput v-model:value="model.authMethod" placeholder="请输入认证方式" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="流水号" path="serialNumber" class="pr-24px">
<NInput v-model:value="model.serialNumber" placeholder="请输入流水号" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="柜员" path="teller" class="pr-24px">
<NInput v-model:value="model.teller" placeholder="请输入柜员" />
</NFormItemGi>
<!-- <NFormItemGi span="24 s:12 m:6" label="签约主账户" path="mainAccount" class="pr-24px">-->
<!-- <NInput v-model:value="model.mainAccount" placeholder="请输入签约主账户" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="签约日期" path="signupDate" class="pr-24px">-->
<!-- <NDatePicker-->
<!-- v-model:formatted-value="model.signupDate"-->
<!-- type="datetime"-->
<!-- value-format="yyyy-MM-dd HH:mm:ss"-->
<!-- clearable-->
<!-- />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="认证方式" path="authMethod" class="pr-24px">-->
<!-- <NInput v-model:value="model.authMethod" placeholder="请输入认证方式" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="流水号" path="serialNumber" class="pr-24px">-->
<!-- <NInput v-model:value="model.serialNumber" placeholder="请输入流水号" />-->
<!-- </NFormItemGi>-->
<!-- <NFormItemGi span="24 s:12 m:6" label="柜员" path="teller" class="pr-24px">-->
<!-- <NInput v-model:value="model.teller" placeholder="请输入柜员" />-->
<!-- </NFormItemGi>-->
<NFormItemGi span="24 s:12 m:6" label="导入周期" path="importTime" class="pr-24px">
<NInput v-model:value="model.importTime" placeholder="请输入导入周期" />
</NFormItemGi>

View File

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

View File

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

View File

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

View File

@ -80,7 +80,6 @@ public class OriginalMobileBankSignupCompanyImportVo implements Serializable {
*/
@ExcelProperty(value = "证件号码")
@NotBlank(message = "证件号码不能为空")
@IdCard
private String idNumber;
/**
@ -101,21 +100,18 @@ public class OriginalMobileBankSignupCompanyImportVo implements Serializable {
* 认证方式
*/
@ExcelProperty(value = "认证方式")
@NotBlank(message = "认证方式不能为空")
private String authMethod;
/**
* 流水号
*/
@ExcelProperty(value = "流水号")
@NotBlank(message = "流水号不能为空")
private String serialNumber;
/**
* 柜员
*/
@ExcelProperty(value = "柜员")
@NotBlank(message = "柜员不能为空")
private String teller;
/**

View File

@ -101,21 +101,18 @@ public class OriginalMobileBankSignupPersonImportVo implements Serializable {
* 认证方式
*/
@ExcelProperty(value = "认证方式")
@NotBlank(message = "认证方式不能为空")
private String authMethod;
/**
* 流水号
*/
@ExcelProperty(value = "流水号")
@NotBlank(message = "流水号不能为空")
private String serialNumber;
/**
* 柜员
*/
@ExcelProperty(value = "柜员")
@NotBlank(message = "柜员不能为空")
private String teller;
/**

View File

@ -139,7 +139,7 @@ public class OriginalBatchAccountInfoServiceImpl implements IOriginalBatchAccoun
lqw.eq(bo.getQuarterlyAvgBalance() != null, OriginalBatchAccountInfo::getQuarterlyAvgBalance, bo.getQuarterlyAvgBalance());
lqw.eq(bo.getMonthlyAvgBalance() != null, OriginalBatchAccountInfo::getMonthlyAvgBalance, bo.getMonthlyAvgBalance());
lqw.eq(bo.getAccountBalance() != null, OriginalBatchAccountInfo::getAccountBalance, bo.getAccountBalance());
lqw.eq(StringUtils.isNotBlank(bo.getOpeningBranch()), OriginalBatchAccountInfo::getOpeningBranch, bo.getOpeningBranch());
lqw.like(StringUtils.isNotBlank(bo.getOpeningBranch()), OriginalBatchAccountInfo::getOpeningBranch, bo.getOpeningBranch());
lqw.eq(StringUtils.isNotBlank(bo.getImportTime()), OriginalBatchAccountInfo::getImportTime, bo.getImportTime());
return lqw;
}

View File

@ -130,7 +130,7 @@ public class OriginalBatchBankCardInfoServiceImpl implements IOriginalBatchBankC
LambdaQueryWrapper<OriginalBatchBankCardInfo> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(OriginalBatchBankCardInfo::getId);
lqw.eq(StringUtils.isNotBlank(bo.getCardNumber()), OriginalBatchBankCardInfo::getCardNumber, bo.getCardNumber());
lqw.eq(StringUtils.isNotBlank(bo.getOpeningBranch()), OriginalBatchBankCardInfo::getOpeningBranch, bo.getOpeningBranch());
lqw.like(StringUtils.isNotBlank(bo.getOpeningBranch()), OriginalBatchBankCardInfo::getOpeningBranch, bo.getOpeningBranch());
lqw.eq(bo.getAccountBalance() != null, OriginalBatchBankCardInfo::getAccountBalance, bo.getAccountBalance());
lqw.eq(bo.getMonthlyAvgBalance() != null, OriginalBatchBankCardInfo::getMonthlyAvgBalance, bo.getMonthlyAvgBalance());
lqw.eq(bo.getQuarterlyAvgBalance() != null, OriginalBatchBankCardInfo::getQuarterlyAvgBalance, bo.getQuarterlyAvgBalance());