diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/mapper/MpsDetailEntryMapper.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/mapper/MpsDetailEntryMapper.java index 22fa8a7..520f3e5 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/mapper/MpsDetailEntryMapper.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/mapper/MpsDetailEntryMapper.java @@ -40,28 +40,28 @@ public interface MpsDetailEntryMapper extends BaseMapperPlus selectMpsDetailEntryExportList(@Param(Constants.WRAPPER) Wrapper queryWrapper); } diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsDetailEntryServiceImpl.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsDetailEntryServiceImpl.java index 0146256..3b97707 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsDetailEntryServiceImpl.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsDetailEntryServiceImpl.java @@ -107,7 +107,7 @@ public class MpsDetailEntryServiceImpl implements IMpsDetailEntryService { @Override public List queryList(MpsDetailEntryBo bo) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); -// lqw.eq(""MpsDetailEntry::getDelFlag"", '0'); + lqw.eq(MpsDetailEntry::getDelFlag, '0'); return baseMapper.selectMpsDetailEntryExportList(lqw); // return baseMapper.selectVoList(lqw); } @@ -115,7 +115,7 @@ public class MpsDetailEntryServiceImpl implements IMpsDetailEntryService { private LambdaQueryWrapper buildQueryWrapper(MpsDetailEntryBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); -// lqw.orderByAsc(MpsDetailEntry::getDataId); + lqw.orderByDesc(MpsDetailEntry::getDate); lqw.eq(StringUtils.isNotBlank(bo.getSubcategoryId()), MpsDetailEntry::getSubcategoryId, bo.getSubcategoryId()); lqw.like(StringUtils.isNotBlank(bo.getSubcategoryName()), MpsDetailEntry::getSubcategoryName, bo.getSubcategoryName()); lqw.like(StringUtils.isNotBlank(bo.getYxName()), MpsDetailEntry::getYxName, bo.getYxName()); 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 d6d2a84..ed0b6ce 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 @@ -456,7 +456,7 @@ public class MpsMarketServiceImpl implements IMpsMarketService { */ String[] arr = new String[]{"62152109", "62169009", "62231909", "62232009", "62326591", "90010509"}; if (!Arrays.asList(arr).contains(entity.getCustAcctNo().substring(0, 8))) { - throw new ServiceException("银行卡前8位不支持!"); + throw new ServiceException("非本行开立银行卡!"); } mpsMarket.setCustAcctNo(entity.getCustAcctNo()); mpsMarket.setSubcategoryId(entity.getSubcategoryId()); diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalHntSgsInfoImportVo.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalHntSgsInfoImportVo.java index f70be49..351c410 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalHntSgsInfoImportVo.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalHntSgsInfoImportVo.java @@ -46,7 +46,7 @@ public class OriginalHntSgsInfoImportVo implements Serializable { */ @ExcelProperty(value = { "签约ID" - }, index = 1) + }) @NotBlank(message = "签约ID不能为空") private String contractId; diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/resources/mapper/mps/MpsDetailEntryMapper.xml b/cds-platform-2025.V1/cds-modules/cds-system/src/main/resources/mapper/mps/MpsDetailEntryMapper.xml index 86b9b95..bc78bf0 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/resources/mapper/mps/MpsDetailEntryMapper.xml +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/resources/mapper/mps/MpsDetailEntryMapper.xml @@ -3,5 +3,66 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +