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

Compare commits

base: GTsoft:8b7efd3e2cdb03fc4b734e7297c478f457aa6420
Branches Tags
GTsoft:main
GTsoft:jasperReport
..
compare: GTsoft:5eabb4fc32775fab684a3f703a0ad1051bf9f56f
Branches Tags
GTsoft:main
GTsoft:jasperReport

No commits in common. "8b7efd3e2cdb03fc4b734e7297c478f457aa6420" and "5eabb4fc32775fab684a3f703a0ad1051bf9f56f" have entirely different histories.
8b7efd3e2c ... 5eabb4fc32

2 changed files with 4 additions and 14 deletions
Show Stats Expand all files Collapse all files

2
cds-fontend-2025.V1/src/views/mps/market/modules/market-operate-drawer.vue
View File

@ -161,7 +161,7 @@ const rules: Record<RuleKey, App.Global.FormRule | App.Global.FormRule[]> = comp
custId: [idCardPatternRule, createRequiredRule('客户身份证号不能为空')],
// custAcctNo: [accountPatternRule,createRequiredRule('账户号不能为空')],
custAcctNo: {
required: !['BIZ032', 'BIZ020', 'BIZ021', 'BIZ022', 'BIZ034'].includes(<string>model.subcategoryId),
required: model.subcategoryId !== 'BIZ032',
message: '账户号不能为空'
},
custType: createRequiredRule('客户类型不能为空'),

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

@ -225,7 +225,7 @@ public class MpsMarketServiceImpl implements IMpsMarketService {
Set<String> set = new HashSet<>();
set.add("BIZ032");//公积金缴纳账户
set.add("BIZ020");//代收交警罚没款
// set.add("BIZ022");//代收水费
set.add("BIZ022");//代收水费
set.add("BIZ021");//代收电费
set.add("BIZ009");//磁条卡更换登记
Set<String> set1 = new HashSet<>();
@ -245,17 +245,7 @@ public class MpsMarketServiceImpl implements IMpsMarketService {
if (!result.isEmpty()) {
throw new ServiceException("当前年度该取暖费户号已存在！");
}
} else if ("BIZ022".equals(entity.getSubcategoryId())) {
//水费 不校验身份证，户号+月份不能重 月份取entry_date前7位
MpsMarket mpsMarket = new MpsMarket();
mpsMarket.setHeatingNo(entity.getHeatingNo());
LambdaQueryWrapper<MpsMarket> lqw = new LambdaQueryWrapper<>(mpsMarket);
lqw.like(StringUtils.isNotEmpty(entity.getEntryDate()), MpsMarket::getEntryDate, entity.getEntryDate().substring(0,7));
List<MpsMarketVo> result = baseMapper.selectVoList(lqw);
if (!result.isEmpty()) {
throw new ServiceException("当月水费户号已存在！");
}
}else if (set1.contains(entity.getSubcategoryId())) {
} else if (set1.contains(entity.getSubcategoryId())) {
//在set1中的业务类型身份证号+月份不能重复
//没有对公业务，不判断custtype
MpsMarket bo = new MpsMarket();
@ -355,7 +345,7 @@ public class MpsMarketServiceImpl implements IMpsMarketService {
MpsTraffic traffic = new MpsTraffic();
traffic.setTrafficNo(mpsTraffic.getTrafficNo());
LambdaQueryWrapper<MpsTraffic> lqw1 = new LambdaQueryWrapper<>(traffic);
lqw1.eq( MpsTraffic::getTrafficNo, mpsTraffic.getTrafficNo());
lqw1.ne( MpsTraffic::getId, mpsTraffic.getId());
List<MpsTrafficVo> result1 = TrafficMapper.selectVoList(lqw1);
if (!result1.isEmpty()) {
throw new ServiceException("该代缴交警罚没款已存在，编号："+mpsTraffic.getTrafficNo());