From a1547f8c78cd9115c349488b5a3164ec16e91f5a Mon Sep 17 00:00:00 2001 From: "SGK\\17962" <1796293269@qq.com> Date: Mon, 20 Oct 2025 21:14:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9=E5=88=A4?= =?UTF-8?q?=E9=87=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cds-fontend-2025.V1/src/typings/api/mps.market.api.d.ts | 3 +++ .../views/mps/market/modules/market-operate-drawer.vue | 9 ++++++--- .../main/java/org/dromara/mps/domain/bo/MpsMarketBo.java | 5 +++++ .../main/java/org/dromara/mps/domain/vo/MpsMarketVo.java | 6 ++++++ .../dromara/mps/service/impl/MpsMarketServiceImpl.java | 9 +++++++++ 5 files changed, 29 insertions(+), 3 deletions(-) diff --git a/cds-fontend-2025.V1/src/typings/api/mps.market.api.d.ts b/cds-fontend-2025.V1/src/typings/api/mps.market.api.d.ts index 3d47d99..333125c 100644 --- a/cds-fontend-2025.V1/src/typings/api/mps.market.api.d.ts +++ b/cds-fontend-2025.V1/src/typings/api/mps.market.api.d.ts @@ -77,6 +77,8 @@ declare namespace Api { tenantId: CommonType.IdType; /** 删除标志（0代表存在 1代表删除） */ delFlag: string; + /** 创建时间 */ + entryDate: string; }>; /** market search params */ @@ -150,6 +152,7 @@ declare namespace Api { | 'checkUser' | 'checkType' | 'checkMsg' + | 'entryDate' > >; diff --git a/cds-fontend-2025.V1/src/views/mps/market/modules/market-operate-drawer.vue b/cds-fontend-2025.V1/src/views/mps/market/modules/market-operate-drawer.vue index dc9f566..e992240 100644 --- a/cds-fontend-2025.V1/src/views/mps/market/modules/market-operate-drawer.vue +++ b/cds-fontend-2025.V1/src/views/mps/market/modules/market-operate-drawer.vue @@ -83,7 +83,8 @@ function createDefaultModel(): Model { checkTime: null, checkUser: '', checkType: '0', - checkMsg: '' + checkMsg: '', + entryDate: null }; } @@ -249,7 +250,8 @@ async function handleSubmit() { checkTime, checkUser, checkType, - checkMsg + checkMsg, + entryDate } = model; // request @@ -321,7 +323,8 @@ async function handleSubmit() { checkTime, checkUser, checkType, - checkMsg + checkMsg, + entryDate }); if (error) return; } diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/bo/MpsMarketBo.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/bo/MpsMarketBo.java index eadb064..86252b0 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/bo/MpsMarketBo.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/bo/MpsMarketBo.java @@ -194,5 +194,10 @@ public class MpsMarketBo extends BaseEntity { */ private String checkMsg; + /** + * 创建时间 + */ + private String entryDate; + } diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsMarketVo.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsMarketVo.java index f759a57..bd04adc 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsMarketVo.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsMarketVo.java @@ -225,5 +225,11 @@ public class MpsMarketVo implements Serializable { @ExcelProperty(value = "核对结果") private String checkMsg; + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private String entryDate; + } diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsMarketServiceImpl.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsMarketServiceImpl.java index a3dcb2d..b7c0cad 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsMarketServiceImpl.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsMarketServiceImpl.java @@ -361,6 +361,7 @@ public class MpsMarketServiceImpl implements IMpsMarketService { mpsMarket.setCustId(entity.getCustId()); mpsMarket.setSubcategoryId(entity.getSubcategoryId()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(mpsMarket); + lqw.ne(entity.getDataId()!=null, MpsMarket::getDataId, entity.getDataId()); lqw.like(StringUtils.isNotEmpty(entity.getEntryDate()), MpsMarket::getEntryDate, entity.getEntryDate().substring(0, 4)); List result = baseMapper.selectVoList(lqw); if (!result.isEmpty()) { @@ -383,6 +384,7 @@ public class MpsMarketServiceImpl implements IMpsMarketService { mpsMarket.setCustAcctNo(entity.getCustAcctNo()); mpsMarket.setSubcategoryId(entity.getSubcategoryId()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(mpsMarket); + lqw.ne(entity.getDataId()!=null, MpsMarket::getDataId, entity.getDataId()); List result = baseMapper.selectVoList(lqw); if (!result.isEmpty()) { throw new ServiceException("银行卡号已存在！"); @@ -406,6 +408,7 @@ public class MpsMarketServiceImpl implements IMpsMarketService { mpsMarket.setAcquiringId(entity.getAcquiringId()); mpsMarket.setSubcategoryId(entity.getSubcategoryId()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(mpsMarket); + lqw.ne(entity.getDataId()!=null, MpsMarket::getDataId, entity.getDataId()); List result = baseMapper.selectVoList(lqw); if (!result.isEmpty()) { throw new ServiceException("商户号不可重复！"); @@ -415,6 +418,7 @@ public class MpsMarketServiceImpl implements IMpsMarketService { mpsMarket.setHeatingNo(entity.getHeatingNo()); mpsMarket.setSubcategoryId(entity.getSubcategoryId()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(mpsMarket); + lqw.ne(entity.getDataId()!=null, MpsMarket::getDataId, entity.getDataId()); lqw.like(StringUtils.isNotEmpty(entity.getEntryDate()), MpsMarket::getEntryDate, entity.getEntryDate().substring(0,4)); List result = baseMapper.selectVoList(lqw); if (!result.isEmpty()) { @@ -426,6 +430,7 @@ public class MpsMarketServiceImpl implements IMpsMarketService { mpsMarket.setHeatingNo(entity.getHeatingNo()); mpsMarket.setSubcategoryId(entity.getSubcategoryId()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(mpsMarket); + lqw.ne(entity.getDataId()!=null, MpsMarket::getDataId, entity.getDataId()); lqw.like(StringUtils.isNotEmpty(entity.getEntryDate()), MpsMarket::getEntryDate, entity.getEntryDate().substring(0,7)); List result = baseMapper.selectVoList(lqw); if (!result.isEmpty()) { @@ -435,11 +440,13 @@ public class MpsMarketServiceImpl implements IMpsMarketService { //在set1中的业务类型,账号+年份不能重复 //没有对公业务，不判断custtype // 排除新开有效银行卡可重复的影响 + //修改时排除本条数据的影响 mpsMarket.setCustAcctNo(entity.getCustAcctNo()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(mpsMarket); lqw.like(MpsMarket::getEntryDate, entity.getEntryDate().substring(0,4)); lqw.in(MpsMarket::getSubcategoryId, set1); lqw.ne("BIZ010".equals(entity.getSubcategoryId()),MpsMarket::getSubcategoryId, "BIZ010"); + lqw.ne(entity.getDataId()!=null, MpsMarket::getDataId, entity.getDataId()); List result = baseMapper.selectVoList(lqw); if (!result.isEmpty()) { throw new ServiceException("该营销记录(四选一)已存在！"); @@ -450,6 +457,7 @@ public class MpsMarketServiceImpl implements IMpsMarketService { mpsMarket.setCustId(entity.getCustId()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(mpsMarket); lqw.like(MpsMarket::getEntryDate, entity.getEntryDate().substring(0,7)); + lqw.ne(entity.getDataId()!=null, MpsMarket::getDataId, entity.getDataId()); List result = baseMapper.selectVoList(lqw); if (!result.isEmpty()) { throw new ServiceException("该营销记录已存在！"); @@ -460,6 +468,7 @@ public class MpsMarketServiceImpl implements IMpsMarketService { mpsMarket.setCustAcctNo(entity.getCustAcctNo()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(mpsMarket); lqw.like(MpsMarket::getEntryDate, entity.getEntryDate().substring(0,7)); + lqw.ne(entity.getDataId()!=null, MpsMarket::getDataId, entity.getDataId()); List result = baseMapper.selectVoList(lqw); if (!result.isEmpty()) { throw new ServiceException("该营销记录已存在！");