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 c24b5639..04396e7c 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 @@ -215,14 +215,14 @@ public class SarLawsInformation extends BasePage implements Serializable { */ @ApiModelProperty(value = "排序字段") @TableField(exist = false) - private String sortField = "ID"; + private String sortField = "uploadTime"; /** * 排序方式 */ @ApiModelProperty(value = "排序方式") @TableField(exist = false) - private String sortMode = "asc"; + private String sortMode = "desc"; /** * 收藏ID 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 072b1504..8c293143 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 @@ -175,8 +175,8 @@ public class SarLawsInformationServiceImpl extends ServiceImpl { - List queryByPageCount(SarLawsTopicVO page); + Integer queryByPageCount(SarLawsTopicVO page); List queryByPage(SarLawsTopicVO page); 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 0a5cd210..2f63e423 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 @@ -234,9 +234,9 @@ public class SarLawsTopicVO extends BasePage { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date modifyTime; - private String sortField = "ID"; + private String sortField = "startTime"; - private String sortMode = "asc"; + private String sortMode = "desc"; // 排序字段 private String startTimeBegin; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java index 17dc63bd..946fb658 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java @@ -214,10 +214,10 @@ public class SarLawsTopicServiceImpl extends ServiceImpl sarLawsTopicVOList = this.baseMapper.queryByPage(page); for (SarLawsTopicVO lawsTopicVO : sarLawsTopicVOList) { 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 239e92b8..daffc2e8 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 @@ -54,6 +54,12 @@ and MEETING_ORGANIZER like concat('%',#{meetingOrganizer},'%') + + and MEETING_TIME >= DATE_FORMAT(#{meetingTimeBegin}, '%Y-%m-%d') + + + and MEETING_TIME <= DATE_FORMAT(#{meetingTimeEnd}, '%Y-%m-%d') + and MEETING_TIME between DATE_FORMAT(#{meetingTimeBegin}, '%Y-%m-%d') and DATE_FORMAT(#{meetingTimeEnd}, '%Y-%m-%d') @@ -90,24 +96,24 @@ - select count(slt.ID) from sar_laws_topic slt left join sar_laws_topic_meeting sltm on slt.ID = sltm.LAWS_TOPIC_ID - left join sar_laws_contact_information slci1 on slt.ID = slci1.LAWS_TOPIC_ID and slci1.GROUP_TYPE = 'topicGroup' - left join sar_laws_contact_information slci2 on slt.ID = slci2.LAWS_TOPIC_ID and slci2.GROUP_TYPE = 'inside' - where slt.VALID_FLAG = 0 - - - - group by slt.ID + select count(1) from ( + select count(slt.ID) from (select * from sar_laws_topic where VALID_FLAG = 0 ) slt + left join sar_laws_topic_meeting sltm on slt.ID = sltm.LAWS_TOPIC_ID + left join sar_laws_contact_information slci1 on slt.ID = slci1.LAWS_TOPIC_ID and slci1.GROUP_TYPE = 'topicGroup' + left join sar_laws_contact_information slci2 on slt.ID = slci2.LAWS_TOPIC_ID and slci2.GROUP_TYPE = 'inside' + where slt.VALID_FLAG = 0 + + + group by slt.ID + ) a