From f0074c32f6193c28814d540f6c8ab6b8904569db Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Fri, 14 Jul 2023 13:34:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=95=B0=E9=87=8F=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E3=80=81=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=20=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/dto/ScreenEventReportDTO.java | 7 ++++++- .../elink/esua/epdc/dto/ScreenVolunteerActivityDTO.java | 6 ++++++ .../elink/esua/epdc/entity/ScreenEventReportEntity.java | 7 ++++++- .../esua/epdc/entity/ScreenVolunteerActivityEntity.java | 5 +++++ .../epdc/service/impl/ScreenEventReportServiceImpl.java | 2 +- .../service/impl/ScreenVolunteerActivityServiceImpl.java | 2 +- .../src/main/resources/mapper/ScreenEventReportDao.xml | 1 + .../main/resources/mapper/ScreenVolunteerActivityDao.xml | 1 + 8 files changed, 27 insertions(+), 4 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenEventReportDTO.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenEventReportDTO.java index 7a791335..9f85d384 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenEventReportDTO.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenEventReportDTO.java @@ -49,11 +49,16 @@ public class ScreenEventReportDTO implements Serializable { private String time; /** - * 类型 + * 类型 1：month2：quarter3：year */ private Integer type; + /** + * 排序 + */ + private Integer sort; + /** * 创建人 */ diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenVolunteerActivityDTO.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenVolunteerActivityDTO.java index 991c5252..2bd50900 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenVolunteerActivityDTO.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenVolunteerActivityDTO.java @@ -53,6 +53,12 @@ public class ScreenVolunteerActivityDTO implements Serializable { */ private Integer type; + /** + * 排序 + */ + private Integer sort; + + /** * 创建人 */ diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenEventReportEntity.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenEventReportEntity.java index 649c8fab..9cec53d7 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenEventReportEntity.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenEventReportEntity.java @@ -49,9 +49,14 @@ public class ScreenEventReportEntity extends BaseEpdcEntity { private String time; /** - * 类型 + * 类型 1：month2：quarter3：year */ private Integer type; + /** + * 排序 + */ + private Integer sort; + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenVolunteerActivityEntity.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenVolunteerActivityEntity.java index 1f6b8eaf..17a41f77 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenVolunteerActivityEntity.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenVolunteerActivityEntity.java @@ -53,4 +53,9 @@ public class ScreenVolunteerActivityEntity extends BaseEpdcEntity { */ private Integer type; + /** + * 排序 + */ + private Integer sort; + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenEventReportServiceImpl.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenEventReportServiceImpl.java index 2b852acd..37a61e9a 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenEventReportServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenEventReportServiceImpl.java @@ -71,7 +71,7 @@ public class ScreenEventReportServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - wrapper.orderByAsc("time"); + wrapper.orderByAsc("SORT"); return wrapper; } diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenVolunteerActivityServiceImpl.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenVolunteerActivityServiceImpl.java index 6fa019aa..558ced01 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenVolunteerActivityServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenVolunteerActivityServiceImpl.java @@ -75,7 +75,7 @@ public class ScreenVolunteerActivityServiceImpl extends BaseServiceImpl + diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenVolunteerActivityDao.xml b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenVolunteerActivityDao.xml index 1c9042e2..c4008159 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenVolunteerActivityDao.xml +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenVolunteerActivityDao.xml @@ -8,6 +8,7 @@ +