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

水费:户号+月份校验

Browse Source 
罚没款验重bug修复
This commit is contained in:
zhuangdashia 2025-10-14 11:21:47 +08:00
parent 5eabb4fc32
commit a07139c573
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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,7 +245,17 @@ public class MpsMarketServiceImpl implements IMpsMarketService {
if (!result.isEmpty()) {
throw new ServiceException("当前年度该取暖费户号已存在！");
}
} else if (set1.contains(entity.getSubcategoryId())) {
} 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())) {
//在set1中的业务类型身份证号+月份不能重复
//没有对公业务，不判断custtype
MpsMarket bo = new MpsMarket();
@ -345,7 +355,7 @@ public class MpsMarketServiceImpl implements IMpsMarketService {
MpsTraffic traffic = new MpsTraffic();
traffic.setTrafficNo(mpsTraffic.getTrafficNo());
LambdaQueryWrapper<MpsTraffic> lqw1 = new LambdaQueryWrapper<>(traffic);
lqw1.ne( MpsTraffic::getId, mpsTraffic.getId());
lqw1.eq( MpsTraffic::getTrafficNo, mpsTraffic.getTrafficNo());
List<MpsTrafficVo> result1 = TrafficMapper.selectVoList(lqw1);
if (!result1.isEmpty()) {
throw new ServiceException("该代缴交警罚没款已存在，编号："+mpsTraffic.getTrafficNo());