From 2d0c081ddf8fd34f2b91436bce59aec889fd0905 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Thu, 9 Nov 2023 14:16:48 +0800 Subject: [PATCH] =?UTF-8?q?bug:=20=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E6=94=BF=E7=AD=96=E8=B5=84=E6=96=99=EF=BC=8C=E5=86=85?= =?UTF-8?q?=E5=A4=96=E9=83=A8=E4=BC=9A=E8=AE=AE=E7=9A=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=94=B9=E4=B8=BA=E5=8C=BA=E9=97=B4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E3=80=82=E6=94=BF=E7=AD=96=E8=B5=84=E6=96=99=E5=8F=AF?= =?UTF-8?q?=E8=A7=81=E4=BA=BA=E5=92=8C=E5=8F=AF=E6=9F=A5=E7=9C=8B=E4=BA=BA?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/InsideOutsideMeetingVO.java | 4 ++- .../entity/SarLawsInformation.java | 6 ++++ .../impl/SarLawsInformationServiceImpl.java | 34 ++++++++++++++----- .../sarLawsTopic/entity/SarLawsTopicVO.java | 5 +-- .../InsideOntSideMeeting.xml | 4 +-- .../SarLawsInformationMapper.xml | 16 ++++++--- .../sarLawsTopic/SarLawsTopicMapper.xml | 7 ++-- 7 files changed, 53 insertions(+), 23 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutsideMeetingVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutsideMeetingVO.java index d4297649..4967e9aa 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutsideMeetingVO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutsideMeetingVO.java @@ -86,7 +86,9 @@ public class InsideOutsideMeetingVO extends BasePage { private String sortMode = "asc"; - private String meetingTimeOperator = "="; + // 会议时间查询字段 + private Date meetingTimeBegin; + private Date meetingTimeEnd; // 导出使用字段 // 被前端选中的记录的ids diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformation.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformation.java index 8883148f..c3d40cb8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformation.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformation.java @@ -242,4 +242,10 @@ public class SarLawsInformation extends BasePage implements Serializable { @TableField(exist = false) private static final long serialVersionUID = 1L; + + // 上传时间查询字段 + @TableField(exist = false) + private Date uploadTimeBegin; + @TableField(exist = false) + private Date uploadTimeEnd; } \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java index 4cd5ecf0..d545cdaf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java @@ -106,16 +106,20 @@ public class SarLawsInformationServiceImpl extends ServiceImpl queryByPage(SarLawsInformation page) { // 设置排序字段 - if (StringUtils.isNotBlank(page.getSortField())) { + if("name".equals(page.getSortField()) || "uploadTime".equals(page.getSortField())) { String sortField = StringUtils.join(StringUtils.splitByCharacterTypeCamelCase(page.getSortField()),"_").toUpperCase(); page.setSortField(sortField); - } else { - page.setSortField("ID"); - page.setSortMode("asc"); + } + if (StringUtils.isBlank(page.getSortField())) { + page.setSortField("ID"); + page.setSortMode("asc"); } Integer rowCount = this.baseMapper.queryByPageCount(page); page.getPager().setRowCount(rowCount); List sarLawsInformationList = this.baseMapper.queryByPage(page); + // 对一级类别或二级类别做排序 + // TODO 对类别做排序 +// if (page.getSortField().contains("_")) for (SarLawsInformation sarLawsInformation : sarLawsInformationList) { // 将字典编号变更为字典值 convertCodeToName(sarLawsInformation); @@ -143,8 +147,22 @@ public class SarLawsInformationServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); @@ -428,7 +446,7 @@ public class SarLawsInformationServiceImpl extends ServiceImpl ignoreFieldList = Arrays.asList(ignoreFields); // 获取SarLawsInformation类的所有字段 Field[] fields = SarLawsInformation.class.getDeclaredFields(); @@ -466,7 +484,7 @@ public class SarLawsInformationServiceImpl extends ServiceImpl oldFileList = (List)method.invoke(oldInfo); List oldFileNameList = new ArrayList<>(); if (oldFileList != null && oldFileList.size() > 0) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicVO.java index ecc187da..c3ae5219 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicVO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicVO.java @@ -238,8 +238,9 @@ public class SarLawsTopicVO extends BasePage { private String sortMode = "asc"; - private String startTimeOperator = "="; - private String closeTimeOperator = "="; + // 排序字段 + private Date startTimeBegin; + private Date startTimeEnd; // 导出使用的属性 // 导出文件名 diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml index 5d069c4e..dda636cf 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml @@ -50,8 +50,8 @@ and MEETING_ORGANIZER like concat('%',#{meetingOrganizer},'%') - - and MEETING_TIME ${meetingTimeOperator} #{meetingTime} + + and MEETING_TIME between #{meetingTimeBegin} and #{meetingTimeEnd} and MEETING_ADDRESS like concat('%',#{meetingAddress},'%') diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsInformation/SarLawsInformationMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsInformation/SarLawsInformationMapper.xml index aed4403b..6c20578d 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsInformation/SarLawsInformationMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsInformation/SarLawsInformationMapper.xml @@ -35,9 +35,15 @@ THIRD_TYPE, FOURTH_TYPE, `NAME`, - DEPARTMENT,AUTHOR,UPLOAD_TIME, - `DESCRIPTION`,INFORMATION_FILE,VIEWABLE_BY, - DOWNLOADABLE_BY,VALID_FLAG,CREATE_TIME, + DEPARTMENT, + AUTHOR, + UPLOAD_TIME, + `DESCRIPTION`, + INFORMATION_FILE, + VIEWABLE_BY, + DOWNLOADABLE_BY, + VALID_FLAG, + CREATE_TIME, MODIFY_TIME @@ -50,8 +56,8 @@ and `NAME` like concat('%',#{name},'%') - - and UPLOAD_TIME = #{uploadTime} + + and UPLOAD_TIME between #{uploadTimeBegin} and ${uploadTimeEnd} and TREE_NODE_ID = #{treeNodeId} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsTopic/SarLawsTopicMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsTopic/SarLawsTopicMapper.xml index e874943b..6980ed91 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsTopic/SarLawsTopicMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsTopic/SarLawsTopicMapper.xml @@ -114,11 +114,8 @@ and PARTICIPATING_UNIT like concat('%',#{participatingUnit},'%') - - and START_TIME ${startTimeOperator} #{startTime} - - - and CLOSE_TIME ${startTimeOperator} #{closeTime} + + and START_TIME between #{startTimeBegin} and ${startTimeEnd} and TOPIC_STATUS = #{topicStatus}