lyhzzz преди 2 месеца
родител
ревизия
f44b368477

+ 1 - 2
src/main/java/com/fdkankan/fusion/entity/CaseInquestCriminal.java

@@ -126,8 +126,7 @@ public class CaseInquestCriminal implements Serializable {
      * 时间
      */
     @TableField("inquest_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date inquestTime;
+    private String inquestTime;
 
     @TableField(typeHandler = JsonArrayTypeHandler.class)
     private JSONArray times;

+ 2 - 2
src/main/java/com/fdkankan/fusion/response/CaseInquestCriminalVo.java

@@ -33,7 +33,7 @@ public class CaseInquestCriminalVo extends CaseInquestCriminal {
         if(super.getInquestTime() == null){
             return "";
         }
-        return DateUtil.format(super.getInquestTime(),DatePattern.CHINESE_DATE_TIME_FORMAT);
+        return DateUtil.format(DateUtil.parse(super.getInquestTime()),DatePattern.CHINESE_DATE_TIME_FORMAT);
     }
 
     public String getMakeTimeStr() {
@@ -64,7 +64,7 @@ public class CaseInquestCriminalVo extends CaseInquestCriminal {
         if(super.getInquestTime() == null){
             return "";
         }
-        return DateUtils.getCnDateStr(DateUtil.format(super.getInquestTime(), DatePattern.CHINESE_DATE_FORMAT));
+        return DateUtils.getCnDateStr(DateUtil.format(DateUtil.parse(super.getInquestTime()), DatePattern.CHINESE_DATE_FORMAT));
     }
 
 }