From eea982ec336800b4e5ff7544aeeace2c70dd2101 Mon Sep 17 00:00:00 2001 From: zhuangdashia Date: Mon, 10 Nov 2025 09:41:39 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=84=E5=8A=A0=E9=A1=B9=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=20=E5=AF=BC=E5=85=A5=E4=BC=98=E5=8C=96=E3=80=81=20=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=81=20=E6=AF=8F=E6=97=A5=E5=BD=95=E5=85=A5=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E9=A1=B5=E9=9D=A2=E5=AF=BC=E5=87=BA=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=81=20=E8=BA=AB=E4=BB=BD=E8=AF=81=E9=9D=9E=E7=A9=BA?= =?UTF-8?q?=EF=BC=8Cx=E6=94=B9=E5=A4=A7=E5=86=99=20=E7=BD=9A=E6=B2=A1?= =?UTF-8?q?=E6=AC=BE=E5=A2=9E=E5=8A=A0=E7=BC=96=E5=8F=B7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/emp-add-items-import-modal.vue | 2 +- .../modules/import-special-search.vue | 78 +++++++++---------- .../traffic/modules/traffic-search.vue | 6 +- .../impl/MpsEmpAddItemsServiceImpl.java | 4 +- .../service/impl/MpsMarketServiceImpl.java | 4 + .../mapper/mps/MpsDetailEntryMapper.xml | 6 +- 6 files changed, 52 insertions(+), 48 deletions(-) diff --git a/cds-fontend-2025.V1/src/views/mps/emp-add-items/modules/emp-add-items-import-modal.vue b/cds-fontend-2025.V1/src/views/mps/emp-add-items/modules/emp-add-items-import-modal.vue index d9a6b7b..ef8f871 100644 --- a/cds-fontend-2025.V1/src/views/mps/emp-add-items/modules/emp-add-items-import-modal.vue +++ b/cds-fontend-2025.V1/src/views/mps/emp-add-items/modules/emp-add-items-import-modal.vue @@ -180,7 +180,7 @@ diff --git a/cds-fontend-2025.V1/src/views/original/import-special/modules/import-special-search.vue b/cds-fontend-2025.V1/src/views/original/import-special/modules/import-special-search.vue index d47f0c2..5d79319 100644 --- a/cds-fontend-2025.V1/src/views/original/import-special/modules/import-special-search.vue +++ b/cds-fontend-2025.V1/src/views/original/import-special/modules/import-special-search.vue @@ -50,51 +50,51 @@ async function search() { - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/cds-fontend-2025.V1/src/views/original/traffic/modules/traffic-search.vue b/cds-fontend-2025.V1/src/views/original/traffic/modules/traffic-search.vue index 8aeacbf..6b7f455 100644 --- a/cds-fontend-2025.V1/src/views/original/traffic/modules/traffic-search.vue +++ b/cds-fontend-2025.V1/src/views/original/traffic/modules/traffic-search.vue @@ -47,9 +47,9 @@ async function search() { - - - + + + diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsEmpAddItemsServiceImpl.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsEmpAddItemsServiceImpl.java index 6fbb493..f44833f 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsEmpAddItemsServiceImpl.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsEmpAddItemsServiceImpl.java @@ -148,8 +148,8 @@ public class MpsEmpAddItemsServiceImpl implements IMpsEmpAddItemsService { */ @Override public Boolean insertByBo(MpsEmpAddItemsBo bo) { - String month = DateUtils.parseDateToStr(FormatsType.YYYY_MM,Date.from(Instant.ofEpochMilli(Long.parseLong(bo.getRecordMonth())))); - bo.setRecordMonth(month); +// String month = DateUtils.parseDateToStr(FormatsType.YYYY_MM,Date.from(Instant.ofEpochMilli(Long.parseLong(bo.getRecordMonth())))); + bo.setRecordMonth(bo.getRecordMonth()); MpsEmpAddItems add = MapstructUtils.convert(bo, MpsEmpAddItems.class); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; 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 ed0b6ce..2279783 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 @@ -191,6 +191,10 @@ public class MpsMarketServiceImpl implements IMpsMarketService { public Boolean insertByBo(MpsMarketBo bo) { MpsMarket add = MapstructUtils.convert(bo, MpsMarket.class); add.setEntryDate(DateUtil.format(new Date(), "yyyy-MM-dd")); + + //身份证非空，x改大写 + add.setCustId(add.getCustId() != null ? add.getCustId().toUpperCase() : null); + validEntityBefore(add); System.out.println("add:--->"+add); boolean flag = baseMapper.insert(add) > 0; 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 bc78bf0..2499d6c 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 @@ -58,9 +58,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM mps_market m LEFT JOIN mps_traffic t ON m.traffic_id = t.traffic_id LEFT JOIN mps_magneticcard c ON m.magnetic_card_id = c.magnetic_card_id - LEFT JOIN sys_user s ON m.yx_id = s.mkt_no - LEFT JOIN sys_dept d ON s.dept_id = d.dept_id - LEFT JOIN sys_dept de ON m.dept_id = de.dept_id + LEFT JOIN sys_user s ON m.yx_id = s.mkt_no and s.del_flag='0' + LEFT JOIN sys_dept d ON s.dept_id = d.dept_id and d.del_flag='0' + LEFT JOIN sys_dept de ON m.dept_id = de.dept_id and de.del_flag='0' where m.del_flag='0' ) temp ${ew.customSqlSegment}