Browse Source

修改概览页分析开始时间结束时间格式展示

chenhongyan1989 2 weeks ago
parent
commit
09d2a63ab2

+ 2 - 2
energy-manage-common/src/main/java/com/energy/manage/common/po/analysis/AnalysisResultPo.java

@@ -95,13 +95,13 @@ public class AnalysisResultPo {
     /**
      * 数据开始时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date dataStartTime;
 
     /**
      * 数据结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date dataEndTime;
 
     /**

+ 4 - 4
energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/analysis/AnalysisRelateInfoVo.java

@@ -37,7 +37,7 @@ public class AnalysisRelateInfoVo {
     /**
      * 数据开始时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date dataStartTime;
 
     /**
@@ -56,19 +56,19 @@ public class AnalysisRelateInfoVo {
     /**
      * 数据结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date dataEndTime;
 
     /**
      * 分析完成时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date analysisFinishTime;
 
     /**
      * 分析完成时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date createTime;
 
     /**

+ 2 - 2
energy-manage-service/src/main/resources/mybatis/analysis/AnalysisResultMapper.xml

@@ -22,8 +22,8 @@
         <result column="data_end_time" property="dataEndTime" jdbcType="DATE"/>
         <result column="sketch" property="sketch" jdbcType="VARCHAR"/>
         <result column="data_type_code" property="dataTypeCode" jdbcType="VARCHAR"/>
-        <result column="analysis_start_time" property="analysisStartTime" jdbcType="DATE"/>
-        <result column="analysis_finish_time" property="analysisFinishTime" jdbcType="DATE"/>
+        <result column="analysis_start_time" property="analysisStartTime" jdbcType="TIMESTAMP"/>
+        <result column="analysis_finish_time" property="analysisFinishTime" jdbcType="TIMESTAMP"/>
         <result column="analysis_flag" property="analysisFlag" jdbcType="INTEGER"/>
 
     </resultMap>