From f8296ab0199d56e96e3c463b3e5b82a498a278f2 Mon Sep 17 00:00:00 2001 From: zhuangdashia Date: Tue, 28 Oct 2025 15:13:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E5=BD=95=E5=85=A5?= =?UTF-8?q?=E6=98=8E=E7=BB=86=20=E5=AF=BC=E5=87=BA=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E7=B3=BB=E7=BB=9F=E5=90=8Dup=20=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=A8=A1=E6=9D=BFup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mps/mapper/MpsDetailEntryMapper.java | 44 ++++++------- .../impl/MpsDetailEntryServiceImpl.java | 4 +- .../service/impl/MpsMarketServiceImpl.java | 2 +- .../domain/vo/OriginalHntSgsInfoImportVo.java | 2 +- .../mapper/mps/MpsDetailEntryMapper.xml | 61 +++++++++++++++++++ 5 files changed, 87 insertions(+), 26 deletions(-) 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"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 6ee1930df590886566e4bb0b93da70e0228ca1b3 Mon Sep 17 00:00:00 2001 From: zhuangdashia Date: Tue, 28 Oct 2025 15:15:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=90=8Dup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cds-fontend-2025.V1/.env | 4 +-- cds-fontend-2025.V1/src/App.vue | 2 +- .../src/locales/langs/zh-cn.ts | 2 +- .../src/router/elegant/imports.ts | 2 +- cds-fontend-2025.V1/src/theme/settings.ts | 2 +- .../src/typings/components.d.ts | 33 +++++++++++++++++-- .../src/typings/elegant-router.d.ts | 6 ++-- 7 files changed, 40 insertions(+), 11 deletions(-) diff --git a/cds-fontend-2025.V1/.env b/cds-fontend-2025.V1/.env index a17aef6..0613e8c 100644 --- a/cds-fontend-2025.V1/.env +++ b/cds-fontend-2025.V1/.env @@ -2,9 +2,9 @@ # if use a sub directory, it must be end with "/", like "/admin/" but not "/admin" VITE_BASE_URL=/ -VITE_APP_TITLE=全员营销计价 +VITE_APP_TITLE=分岗管户质效评价 -VITE_APP_DESC=全员营销计价系统 +VITE_APP_DESC=分岗管户质效评价系统 # the prefix of the icon name VITE_ICON_PREFIX=icon diff --git a/cds-fontend-2025.V1/src/App.vue b/cds-fontend-2025.V1/src/App.vue index d10d2d0..f88c072 100644 --- a/cds-fontend-2025.V1/src/App.vue +++ b/cds-fontend-2025.V1/src/App.vue @@ -26,7 +26,7 @@ const naiveDateLocale = computed(() => { }); const watermarkProps = computed(() => { - const appTitle = import.meta.env.VITE_APP_TITLE || '全员营销计价'; + const appTitle = import.meta.env.VITE_APP_TITLE || '分岗管户质效评价'; const content = themeStore.watermark.enableUserName && userInfo.user?.userName ? `${userInfo.user?.nickName}@${appTitle} ${userInfo.user?.userName}` diff --git a/cds-fontend-2025.V1/src/locales/langs/zh-cn.ts b/cds-fontend-2025.V1/src/locales/langs/zh-cn.ts index 1224936..6bc61af 100644 --- a/cds-fontend-2025.V1/src/locales/langs/zh-cn.ts +++ b/cds-fontend-2025.V1/src/locales/langs/zh-cn.ts @@ -8,7 +8,7 @@ const local: App.I18n.Schema = { sbkjh: '社保卡激活' }, system: { - title: '全员营销计价', + title: '分岗管户质效评价', updateTitle: '系统版本更新通知', updateContent: '检测到系统有新版本发布，是否立即刷新页面？', updateConfirm: '立即刷新', diff --git a/cds-fontend-2025.V1/src/router/elegant/imports.ts b/cds-fontend-2025.V1/src/router/elegant/imports.ts index 5a61c8d..4ac0c96 100644 --- a/cds-fontend-2025.V1/src/router/elegant/imports.ts +++ b/cds-fontend-2025.V1/src/router/elegant/imports.ts @@ -70,9 +70,9 @@ export const views: Record Promise import("@/views/oss/oss/index.vue"), "report_detail-entry": () => import("@/views/report/detail-entry/index.vue"), "report_payroll-records": () => import("@/views/report/payroll-records/index.vue"), - "report_performance-md": () => import("@/views/report/performance-MD/index.vue"), "report_performance-h": () => import("@/views/report/performance-h/index.vue"), "report_performance-m": () => import("@/views/report/performance-m/index.vue"), + "report_performance-md": () => import("@/views/report/performance-md/index.vue"), "report_performance-q": () => import("@/views/report/performance-q/index.vue"), "report_performance-y": () => import("@/views/report/performance-y/index.vue"), report_performance: () => import("@/views/report/performance/index.vue"), diff --git a/cds-fontend-2025.V1/src/theme/settings.ts b/cds-fontend-2025.V1/src/theme/settings.ts index c338803..08e6bdd 100644 --- a/cds-fontend-2025.V1/src/theme/settings.ts +++ b/cds-fontend-2025.V1/src/theme/settings.ts @@ -82,7 +82,7 @@ export const themeSettings: App.Theme.ThemeSetting = { }, watermark: { visible: import.meta.env.VITE_WATERMARK === 'Y', - text: '全员营销计价', + text: '分岗管户质效评价', enableUserName: true }, table: { diff --git a/cds-fontend-2025.V1/src/typings/components.d.ts b/cds-fontend-2025.V1/src/typings/components.d.ts index d38b725..66bd9e4 100644 --- a/cds-fontend-2025.V1/src/typings/components.d.ts +++ b/cds-fontend-2025.V1/src/typings/components.d.ts @@ -42,47 +42,76 @@ declare module 'vue' { MenuTreeSelect: typeof import('./../components/custom/menu-tree-select.vue')['default'] MonacoEditor: typeof import('./../components/common/monaco-editor.vue')['default'] NA: typeof import('naive-ui')['NA'] + NAlert: typeof import('naive-ui')['NAlert'] NAvatar: typeof import('naive-ui')['NAvatar'] NBadge: typeof import('naive-ui')['NBadge'] NBreadcrumb: typeof import('naive-ui')['NBreadcrumb'] NBreadcrumbItem: typeof import('naive-ui')['NBreadcrumbItem'] NButton: typeof import('naive-ui')['NButton'] - NButtonGroup: typeof import('naive-ui')['NButtonGroup'] NCard: typeof import('naive-ui')['NCard'] NCheckbox: typeof import('naive-ui')['NCheckbox'] + NCheckboxGroup: typeof import('naive-ui')['NCheckboxGroup'] + NCode: typeof import('naive-ui')['NCode'] + NCollapse: typeof import('naive-ui')['NCollapse'] + NCollapseItem: typeof import('naive-ui')['NCollapseItem'] NColorPicker: typeof import('naive-ui')['NColorPicker'] + NDataTable: typeof import('naive-ui')['NDataTable'] NDatePicker: typeof import('naive-ui')['NDatePicker'] + NDescriptions: typeof import('naive-ui')['NDescriptions'] + NDescriptionsItem: typeof import('naive-ui')['NDescriptionsItem'] NDialogProvider: typeof import('naive-ui')['NDialogProvider'] NDivider: typeof import('naive-ui')['NDivider'] NDrawer: typeof import('naive-ui')['NDrawer'] NDrawerContent: typeof import('naive-ui')['NDrawerContent'] NDropdown: typeof import('naive-ui')['NDropdown'] + NDynamicInput: typeof import('naive-ui')['NDynamicInput'] NEllipsis: typeof import('naive-ui')['NEllipsis'] NEmpty: typeof import('naive-ui')['NEmpty'] NForm: typeof import('naive-ui')['NForm'] NFormItem: typeof import('naive-ui')['NFormItem'] + NFormItemGi: typeof import('naive-ui')['NFormItemGi'] NGi: typeof import('naive-ui')['NGi'] NGrid: typeof import('naive-ui')['NGrid'] + NGridItem: typeof import('naive-ui')['NGridItem'] NInput: typeof import('naive-ui')['NInput'] NInputGroup: typeof import('naive-ui')['NInputGroup'] + NInputGroupLabel: typeof import('naive-ui')['NInputGroupLabel'] + NInputNumber: typeof import('naive-ui')['NInputNumber'] + NLayout: typeof import('naive-ui')['NLayout'] + NLayoutContent: typeof import('naive-ui')['NLayoutContent'] + NLayoutSider: typeof import('naive-ui')['NLayoutSider'] NLoadingBarProvider: typeof import('naive-ui')['NLoadingBarProvider'] NMenu: typeof import('naive-ui')['NMenu'] NMessageProvider: typeof import('naive-ui')['NMessageProvider'] NModal: typeof import('naive-ui')['NModal'] NNotificationProvider: typeof import('naive-ui')['NNotificationProvider'] + NP: typeof import('naive-ui')['NP'] NPopconfirm: typeof import('naive-ui')['NPopconfirm'] NPopover: typeof import('naive-ui')['NPopover'] + NRadio: typeof import('naive-ui')['NRadio'] + NRadioButton: typeof import('naive-ui')['NRadioButton'] + NRadioGroup: typeof import('naive-ui')['NRadioGroup'] NScrollbar: typeof import('naive-ui')['NScrollbar'] NSelect: typeof import('naive-ui')['NSelect'] NSpace: typeof import('naive-ui')['NSpace'] NSpin: typeof import('naive-ui')['NSpin'] - NStatistic: typeof import('naive-ui')['NStatistic'] NSwitch: typeof import('naive-ui')['NSwitch'] NTab: typeof import('naive-ui')['NTab'] + NTable: typeof import('naive-ui')['NTable'] + NTabPane: typeof import('naive-ui')['NTabPane'] NTabs: typeof import('naive-ui')['NTabs'] NTag: typeof import('naive-ui')['NTag'] + NTbody: typeof import('naive-ui')['NTbody'] + NTd: typeof import('naive-ui')['NTd'] + NText: typeof import('naive-ui')['NText'] + NTh: typeof import('naive-ui')['NTh'] + NThead: typeof import('naive-ui')['NThead'] NTooltip: typeof import('naive-ui')['NTooltip'] + NTr: typeof import('naive-ui')['NTr'] + NTree: typeof import('naive-ui')['NTree'] NTreeSelect: typeof import('naive-ui')['NTreeSelect'] + NUpload: typeof import('naive-ui')['NUpload'] + NUploadDragger: typeof import('naive-ui')['NUploadDragger'] NWatermark: typeof import('naive-ui')['NWatermark'] OssUpload: typeof import('./../components/custom/oss-upload.vue')['default'] PinToggler: typeof import('./../components/common/pin-toggler.vue')['default'] diff --git a/cds-fontend-2025.V1/src/typings/elegant-router.d.ts b/cds-fontend-2025.V1/src/typings/elegant-router.d.ts index da7b2cd..1c0058d 100644 --- a/cds-fontend-2025.V1/src/typings/elegant-router.d.ts +++ b/cds-fontend-2025.V1/src/typings/elegant-router.d.ts @@ -241,9 +241,9 @@ declare module "@elegant-router/types" { | "oss_oss" | "report_detail-entry" | "report_payroll-records" - | "report_performance-md" | "report_performance-h" | "report_performance-m" + | "report_performance-md" | "report_performance-q" | "report_performance-y" | "report_performance" @@ -339,7 +339,7 @@ declare module "@elegant-router/types" { component: `view.${K}`; } : never; - + /** * the center level route */ @@ -362,7 +362,7 @@ declare module "@elegant-router/types" { children: (CenterLevelRoute> | LastLevelRoute>)[]; } : never; - + /** * the custom first level route */