diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopic.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopic.java
index 56652901..9423112d 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopic.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopic.java
@@ -51,14 +51,14 @@ public class SarLawsTopic implements Serializable {
/**
* 开始时间
*/
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@TableField(value = "START_TIME")
private Date startTime;
/**
* 结题时间
*/
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@TableField(value = "CLOSE_TIME")
private Date closeTime;
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicMeeting.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicMeeting.java
index b6f86cef..b0a749d5 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicMeeting.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicMeeting.java
@@ -38,9 +38,8 @@ public class SarLawsTopicMeeting implements Serializable {
/**
* 会议时间
*/
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(value = "MEETING_TIME")
- private Date meetingTime;
+ private String meetingTime;
/**
* 会议地点
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 f9958fa6..553b40fa 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
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;
@@ -46,13 +47,15 @@ public class SarLawsTopicVO extends BasePage {
/**
* 开始时间
*/
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date startTime;
/**
* 结题时间
*/
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date closeTime;
/**
@@ -83,8 +86,7 @@ public class SarLawsTopicVO extends BasePage {
/**
* 会议时间
*/
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- private Date meetingTime;
+ private String meetingTime;
/**
* 会议地点
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 68611183..8aa24169 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
@@ -10,8 +10,8 @@
-
-
+
+
@@ -28,8 +28,8 @@
-
-
+
+
@@ -71,8 +71,8 @@
slt.ID,slt.TOPIC_NAME,slt.ORGANIZER,
slt.GUIDANCE_UNIT,slt.PARTICIPATING_UNIT,slt.START_TIME,
slt.CLOSE_TIME,slt.TOPIC_STATUS,slt.TOPIC_COST,slt.AGREEMENT,
- sltm.ID,
- sltm.LAWS_TOPIC_ID,
+ sltm.ID as sltmId,
+ sltm.LAWS_TOPIC_ID as sltmLawsTopicId,
sltm.MEETING_NAME,
sltm.MEETING_TIME,
sltm.MEETING_ADDRESS,
@@ -114,10 +114,10 @@
and PARTICIPATING_UNIT like concat('%',#{participatingUnit},'%')
-
+
and START_TIME ${startTimeOperator} #{startTime}
-
+
and CLOSE_TIME ${startTimeOperator} #{closeTime}
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsTopic/SarLawsTopicMeetingMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsTopic/SarLawsTopicMeetingMapper.xml
index 4dd92828..b2dbba0f 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsTopic/SarLawsTopicMeetingMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsTopic/SarLawsTopicMeetingMapper.xml
@@ -8,7 +8,7 @@
-
+