From c47dce9bff15d65894b59a4b253230094803261e Mon Sep 17 00:00:00 2001 From: zhuangdashia Date: Mon, 13 Oct 2025 16:22:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=AF=BC=E5=85=A5=E8=AE=A1?= =?UTF-8?q?=E4=BB=B7=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/vo/MpsManualPricingImportVo.java | 67 ++++++++++--------- .../mps/domain/vo/MpsManualPricingVo.java | 28 ++++---- .../MpsManualPricingImportListener.java | 2 +- .../impl/MpsManualPricingServiceImpl.java | 2 +- 4 files changed, 51 insertions(+), 48 deletions(-) diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsManualPricingImportVo.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsManualPricingImportVo.java index a10365e..f92c442 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsManualPricingImportVo.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsManualPricingImportVo.java @@ -1,6 +1,8 @@ package org.dromara.mps.domain.vo; import java.math.BigDecimal; + +import cn.idev.excel.annotation.ExcelIgnore; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; @@ -32,109 +34,110 @@ public class MpsManualPricingImportVo implements Serializable { /** * 主键 */ - @ExcelProperty(value = "主键") + @ExcelIgnore + @ExcelProperty(value = "ID") private Long id; /** * 支行 */ - @ExcelProperty(value = "支行", index = 0) + @ExcelProperty(value = "支行") private String branch; /** * 员工身份证号 */ - @ExcelProperty(value = "证件号码", index = 1) + @ExcelProperty(value = "证件号码") private String idcardNo; /** * 员工姓名 */ - @ExcelProperty(value = "姓名", index = 2) + @ExcelProperty(value = "姓名") private String name; /** * 岗位 */ - @ExcelProperty(value = "岗位", index = 3) + @ExcelProperty(value = "岗位") private String position; /** * 营销人员营销号 */ - @ExcelProperty(value = "营销号", index = 4) + @ExcelProperty(value = "营销号") private String marketingCode; /** * 存量综合收单商户留存率提升 */ - @ExcelProperty(value = "存量综合收单商户留存率提升", index = 5) + @ExcelProperty(value = "存量综合收单商户留存率提升") private BigDecimal merchantRetentionRate; /** * 新增党费缴费单位 */ - @ExcelProperty(value = "新增党费缴费单位", index = 6) + @ExcelProperty(value = "新增党费缴费单位") private BigDecimal newPartyFeeUnits; /** * 新增工会费缴费单位 */ - @ExcelProperty(value = "新增工会费缴费单位", index = 7) + @ExcelProperty(value = "新增工会费缴费单位") private BigDecimal newUnionFeeUnits; /** * 新增物业费缴费单位 */ - @ExcelProperty(value = "新增物业费缴费单位", index = 8) + @ExcelProperty(value = "新增物业费缴费单位") private BigDecimal newPropertyFeeUnits; /** * 新增餐费缴费单位 */ - @ExcelProperty(value = "新增餐费缴费单位", index = 9) + @ExcelProperty(value = "新增餐费缴费单位") private BigDecimal newCateringFeeUnits; /** * 新开立外汇账户有效户 */ - @ExcelProperty(value = "新开立外汇账户有效户", index = 10) + @ExcelProperty(value = "新开立外汇账户有效户") private BigDecimal newForeignAccounts; /** * 新增理财销售有效户(个人) */ - @ExcelProperty(value = "新增理财销售有效户(个人)", index = 11) + @ExcelProperty(value = "新增理财销售有效户(个人)") private BigDecimal newIndividualTreasury; /** * 新增理财销售有效户(对公) */ - @ExcelProperty(value = "新增理财销售有效户(对公)", index = 12) + @ExcelProperty(value = "新增理财销售有效户(对公)") private BigDecimal newCorporateTreasury; /** * 理财销售系统业务量 */ - @ExcelProperty(value = "理财销售系统业务量",index = 13) + @ExcelProperty(value = "理财销售系统业务量") private BigDecimal treasuryTransactions; /** * 代销定期类理财产品 */ - @ExcelProperty(value = "代销定期类理财产品",index = 14) + @ExcelProperty(value = "代销定期类理财产品") private BigDecimal regularProducts; /** * 新增公积金缴存账户 */ - @ExcelProperty(value = "新增公积金缴存账户",index = 15) + @ExcelProperty(value = "新增公积金缴存账户") private BigDecimal newHousingFund; /** * 合计计价 */ - @ExcelProperty(value = "合计计价",index = 16) + @ExcelProperty(value = "合计计价") private BigDecimal totalScore; /** @@ -144,45 +147,45 @@ public class MpsManualPricingImportVo implements Serializable { private String importTime; /** - * 冗余1 + * 项目1 */ - @ExcelProperty(value = "冗余1") + @ExcelProperty(value = "项目1") private BigDecimal fill1; /** - * 冗余2 + * 项目2 */ - @ExcelProperty(value = "冗余2") + @ExcelProperty(value = "项目2") private BigDecimal fill2; /** - * 冗余4 + * 项目4 */ - @ExcelProperty(value = "冗余4") + @ExcelProperty(value = "项目4") private BigDecimal fill3; /** - * 冗余4 + * 项目4 */ - @ExcelProperty(value = "冗余4") + @ExcelProperty(value = "项目4") private BigDecimal fill4; /** - * 冗余5 + * 项目5 */ - @ExcelProperty(value = "冗余5") + @ExcelProperty(value = "项目5") private BigDecimal fill5; /** - * 冗余6 + * 项目6 */ - @ExcelProperty(value = "冗余6") + @ExcelProperty(value = "项目6") private BigDecimal fill6; /** - * 冗余7 + * 项目7 */ - @ExcelProperty(value = "冗余7") + @ExcelProperty(value = "项目7") private BigDecimal fill7; diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsManualPricingVo.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsManualPricingVo.java index 16a7cf0..20b2343 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsManualPricingVo.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsManualPricingVo.java @@ -144,45 +144,45 @@ public class MpsManualPricingVo implements Serializable { private String importTime; /** - * 冗余1 + * 项目1 */ - @ExcelProperty(value = "冗余1") + @ExcelProperty(value = "项目1") private BigDecimal fill1; /** - * 冗余2 + * 项目2 */ - @ExcelProperty(value = "冗余2") + @ExcelProperty(value = "项目2") private BigDecimal fill2; /** - * 冗余4 + * 项目4 */ - @ExcelProperty(value = "冗余4") + @ExcelProperty(value = "项目4") private BigDecimal fill3; /** - * 冗余4 + * 项目4 */ - @ExcelProperty(value = "冗余4") + @ExcelProperty(value = "项目4") private BigDecimal fill4; /** - * 冗余5 + * 项目5 */ - @ExcelProperty(value = "冗余5") + @ExcelProperty(value = "项目5") private BigDecimal fill5; /** - * 冗余6 + * 项目6 */ - @ExcelProperty(value = "冗余6") + @ExcelProperty(value = "项目6") private BigDecimal fill6; /** - * 冗余7 + * 项目7 */ - @ExcelProperty(value = "冗余7") + @ExcelProperty(value = "项目7") private BigDecimal fill7; diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/listener/MpsManualPricingImportListener.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/listener/MpsManualPricingImportListener.java index f80cf7e..7599a51 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/listener/MpsManualPricingImportListener.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/listener/MpsManualPricingImportListener.java @@ -64,11 +64,11 @@ public class MpsManualPricingImportListener extends AnalysisEventListener buildQueryWrapper(MpsManualPricingBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(MpsManualPricing::getId); + lqw.orderByDesc(MpsManualPricing::getImportTime); lqw.eq(StringUtils.isNotBlank(bo.getBranch()), MpsManualPricing::getBranch, bo.getBranch()); lqw.eq(StringUtils.isNotBlank(bo.getIdcardNo()), MpsManualPricing::getIdcardNo, bo.getIdcardNo()); lqw.like(StringUtils.isNotBlank(bo.getName()), MpsManualPricing::getName, bo.getName());