Parcourir la source

列表时间字段不显示秒

jingyuanchao il y a 1 an
Parent
commit
e6494fd7d1

+ 2 - 2
soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/vo/CoreDrillTaskDetailVo.java

@@ -64,11 +64,11 @@ public class CoreDrillTaskDetailVo {
     @ApiModelProperty(value = "记录人名称")
     private String recorderName;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     @ApiModelProperty(value = "计划任务开始日期")
     private LocalDateTime startDate;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     @ApiModelProperty(value = "计划任务截止日期")
     private LocalDateTime endDate;
 

+ 2 - 2
soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/vo/CoreEduTrainingTaskDetailVo.java

@@ -57,11 +57,11 @@ public class CoreEduTrainingTaskDetailVo {
     @ApiModelProperty(value = "记录人名称")
     private String recorderName;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     @ApiModelProperty(value = "计划任务开始日期")
     private LocalDateTime startDate;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     @ApiModelProperty(value = "计划任务截止日期")
     private LocalDateTime endDate;
 

+ 2 - 2
soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/vo/SysLearningMaterialsPageVo.java

@@ -46,10 +46,10 @@ public class SysLearningMaterialsPageVo {
     private String createBy;
 
     @ApiModelProperty(value = "上传时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private Date createTime;
     @ApiModelProperty(value = "更新时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private Date updateTime;
 
     @ApiModelProperty(value = "附件")

+ 1 - 1
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskServiceImpl.java

@@ -315,7 +315,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
             safeScoreResumptionDataVo.setTaskName(task.getTaskName());
             safeScoreResumptionDataVo.setOrgName(task.getOrgName());
             safeScoreResumptionDataVo.setExecPostName(map.get(task.getRoleId()));
-            safeScoreResumptionDataVo.setPlanTimeStart(task.getPlanEndTime());
+            safeScoreResumptionDataVo.setPlanTimeStart(task.getPlanStartTime());
             safeScoreResumptionDataVo.setPlanTimeEnd(task.getPlanEndTime());
             list.add(safeScoreResumptionDataVo);
         }