From ffefa7fcdee0040cd6660bd8d4ef9578a8fc6522 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Wed, 18 Oct 2023 15:15:10 +0800
Subject: [PATCH] =?UTF-8?q?add:=20=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../slrs/sarLawsTopic/entity/SarLawsTopic.java   |  4 ++--
 .../sarLawsTopic/entity/SarLawsTopicMeeting.java |  3 +--
 .../slrs/sarLawsTopic/entity/SarLawsTopicVO.java | 10 ++++++----
 .../mapper/sarLawsTopic/SarLawsTopicMapper.xml   | 16 ++++++++--------
 .../sarLawsTopic/SarLawsTopicMeetingMapper.xml   |  2 +-
 5 files changed, 18 insertions(+), 17 deletions(-)

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 @@
         <result property="organizer" column="ORGANIZER" jdbcType="VARCHAR"/>
         <result property="guidanceUnit" column="GUIDANCE_UNIT" jdbcType="VARCHAR"/>
         <result property="participatingUnit" column="PARTICIPATING_UNIT" jdbcType="VARCHAR"/>
-        <result property="startTime" column="START_TIME" jdbcType="TIMESTAMP"/>
-        <result property="closeTime" column="CLOSE_TIME" jdbcType="TIMESTAMP"/>
+        <result property="startTime" column="START_TIME" jdbcType="DATE"/>
+        <result property="closeTime" column="CLOSE_TIME" jdbcType="DATE"/>
         <result property="topicStatus" column="TOPIC_STATUS" jdbcType="VARCHAR"/>
         <result property="topicCost" column="TOPIC_COST" jdbcType="VARCHAR"/>
         <result property="agreement" column="AGREEMENT" jdbcType="VARCHAR"/>
@@ -28,8 +28,8 @@
         <result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
         <result property="modifyTime" column="MODIFY_TIME" jdbcType="TIMESTAMP"/>
         <collection property="meetingList" ofType="com.adc.da.slrs.sarLawsTopic.entity.SarLawsTopicMeeting">
-            <id property="id" column="ID" jdbcType="VARCHAR"/>
-            <result property="lawsTopicId" column="LAWS_TOPIC_ID"/>
+            <id property="id" column="sltmId" jdbcType="VARCHAR"/>
+            <result property="lawsTopicId" column="sltmLawsTopicId"/>
             <result property="meetingName" column="MEETING_NAME"/>
             <result property="meetingTime" column="MEETING_TIME"/>
             <result property="meetingAddress" column="MEETING_ADDRESS"/>
@@ -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 @@
             <if test="participatingUnit != null and participatingUnit != ''" >
                 and PARTICIPATING_UNIT like concat('%',#{participatingUnit},'%')
             </if>
-            <if test="startTime != null and startTime !=''">
+            <if test="startTime != null">
                 and START_TIME ${startTimeOperator} #{startTime}
             </if>
-            <if test="closeTime != null and closeTime !=''">
+            <if test="closeTime != null">
                 and CLOSE_TIME ${startTimeOperator} #{closeTime}
             </if>
             <if test="topicStatus != null and topicStatus != ''" >
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 @@
             <id property="id" column="ID" jdbcType="VARCHAR"/>
             <result property="lawsTopicId" column="LAWS_TOPIC_ID" jdbcType="VARCHAR"/>
             <result property="meetingName" column="MEETING_NAME" jdbcType="VARCHAR"/>
-            <result property="meetingTime" column="MEETING_TIME" jdbcType="TIMESTAMP"/>
+            <result property="meetingTime" column="MEETING_TIME" jdbcType="VARCHAR"/>
             <result property="meetingAddress" column="MEETING_ADDRESS" jdbcType="VARCHAR"/>
             <result property="participants" column="PARTICIPANTS" jdbcType="VARCHAR"/>
             <result property="meetingContent" column="MEETING_CONTENT" jdbcType="VARCHAR"/>