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

Compare commits

base: GTsoft:54c4c54cc709ecb7c2611fb1d9c2d2786522a8d6
Branches Tags
GTsoft:main
GTsoft:jasperReport
..
compare: GTsoft:de0c9afa813718d9874610537b7722a0ebdf91b9
Branches Tags
GTsoft:main
GTsoft:jasperReport

No commits in common. "54c4c54cc709ecb7c2611fb1d9c2d2786522a8d6" and "de0c9afa813718d9874610537b7722a0ebdf91b9" have entirely different histories.
54c4c54cc7 ... de0c9afa81

5 changed files with 3 additions and 29 deletions
Show Stats Expand all files Collapse all files

3
cds-fontend-2025.V1/src/typings/api/mps.market.api.d.ts vendored
View File

@ -77,8 +77,6 @@ declare namespace Api {
tenantId: CommonType.IdType;
/** 删除标志（0代表存在 1代表删除） */
delFlag: string;
/** 创建时间 */
entryDate: string;
}>;
/** market search params */
@ -152,7 +150,6 @@ declare namespace Api {
| 'checkUser'
| 'checkType'
| 'checkMsg'
| 'entryDate'
>
>;

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

@ -83,8 +83,7 @@ function createDefaultModel(): Model {
checkTime: null,
checkUser: '',
checkType: '0',
checkMsg: '',
entryDate: null
checkMsg: ''
};
}
@ -250,8 +249,7 @@ async function handleSubmit() {
checkTime,
checkUser,
checkType,
checkMsg,
entryDate
checkMsg
} = model;
// request
@ -323,8 +321,7 @@ async function handleSubmit() {
checkTime,
checkUser,
checkType,
checkMsg,
entryDate
checkMsg
});
if (error) return;
}

5
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/bo/MpsMarketBo.java
View File

@ -194,10 +194,5 @@ public class MpsMarketBo extends BaseEntity {
*/
private String checkMsg;
/**
* 创建时间
*/
private String entryDate;
}

6
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsMarketVo.java
View File

@ -225,11 +225,5 @@ public class MpsMarketVo implements Serializable {
@ExcelProperty(value = "核对结果")
private String checkMsg;
/**
* 创建时间
*/
@ExcelProperty(value = "创建时间")
private String entryDate;
}

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

@ -361,7 +361,6 @@ public class MpsMarketServiceImpl implements IMpsMarketService {
mpsMarket.setCustId(entity.getCustId());
mpsMarket.setSubcategoryId(entity.getSubcategoryId());
LambdaQueryWrapper<MpsMarket> 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<MpsMarketVo> result = baseMapper.selectVoList(lqw);
if (!result.isEmpty()) {
@ -384,7 +383,6 @@ public class MpsMarketServiceImpl implements IMpsMarketService {
mpsMarket.setCustAcctNo(entity.getCustAcctNo());
mpsMarket.setSubcategoryId(entity.getSubcategoryId());
LambdaQueryWrapper<MpsMarket> lqw = new LambdaQueryWrapper<>(mpsMarket);
lqw.ne(entity.getDataId()!=null, MpsMarket::getDataId, entity.getDataId());
List<MpsMarketVo> result = baseMapper.selectVoList(lqw);
if (!result.isEmpty()) {
throw new ServiceException("银行卡号已存在！");
@ -408,7 +406,6 @@ public class MpsMarketServiceImpl implements IMpsMarketService {
mpsMarket.setAcquiringId(entity.getAcquiringId());
mpsMarket.setSubcategoryId(entity.getSubcategoryId());
LambdaQueryWrapper<MpsMarket> lqw = new LambdaQueryWrapper<>(mpsMarket);
lqw.ne(entity.getDataId()!=null, MpsMarket::getDataId, entity.getDataId());
List<MpsMarketVo> result = baseMapper.selectVoList(lqw);
if (!result.isEmpty()) {
throw new ServiceException("商户号不可重复！");
@ -418,7 +415,6 @@ public class MpsMarketServiceImpl implements IMpsMarketService {
mpsMarket.setHeatingNo(entity.getHeatingNo());
mpsMarket.setSubcategoryId(entity.getSubcategoryId());
LambdaQueryWrapper<MpsMarket> 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<MpsMarketVo> result = baseMapper.selectVoList(lqw);
if (!result.isEmpty()) {
@ -430,7 +426,6 @@ public class MpsMarketServiceImpl implements IMpsMarketService {
mpsMarket.setHeatingNo(entity.getHeatingNo());
mpsMarket.setSubcategoryId(entity.getSubcategoryId());
LambdaQueryWrapper<MpsMarket> 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<MpsMarketVo> result = baseMapper.selectVoList(lqw);
if (!result.isEmpty()) {
@ -440,13 +435,11 @@ public class MpsMarketServiceImpl implements IMpsMarketService {
//在set1中的业务类型,账号+年份不能重复
//没有对公业务，不判断custtype
// 排除新开有效银行卡可重复的影响
//修改时排除本条数据的影响
mpsMarket.setCustAcctNo(entity.getCustAcctNo());
LambdaQueryWrapper<MpsMarket> 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<MpsMarketVo> result = baseMapper.selectVoList(lqw);
if (!result.isEmpty()) {
throw new ServiceException("该营销记录(四选一)已存在！");
@ -457,7 +450,6 @@ public class MpsMarketServiceImpl implements IMpsMarketService {
mpsMarket.setCustId(entity.getCustId());
LambdaQueryWrapper<MpsMarket> lqw = new LambdaQueryWrapper<>(mpsMarket);
lqw.like(MpsMarket::getEntryDate, entity.getEntryDate().substring(0,7));
lqw.ne(entity.getDataId()!=null, MpsMarket::getDataId, entity.getDataId());
List<MpsMarketVo> result = baseMapper.selectVoList(lqw);
if (!result.isEmpty()) {
throw new ServiceException("该营销记录已存在！");
@ -468,7 +460,6 @@ public class MpsMarketServiceImpl implements IMpsMarketService {
mpsMarket.setCustAcctNo(entity.getCustAcctNo());
LambdaQueryWrapper<MpsMarket> lqw = new LambdaQueryWrapper<>(mpsMarket);
lqw.like(MpsMarket::getEntryDate, entity.getEntryDate().substring(0,7));
lqw.ne(entity.getDataId()!=null, MpsMarket::getDataId, entity.getDataId());
List<MpsMarketVo> result = baseMapper.selectVoList(lqw);
if (!result.isEmpty()) {
throw new ServiceException("该营销记录已存在！");