修改监控调阅

project_data/sql/0.0.3/soc/soc.sql

@@ -146,3 +146,5 @@ DROP PROCEDURE IF EXISTS schema_change ??
 END ??
 DELIMITER;
 CALL schema_change ();
+
+update sys_menu set menu_name='调阅情况跟踪' where menu_name='监控调阅任务管理';

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/retrieval/vo/CoreMonitoringRetrievalTaskExcelVo.java

@@ -34,12 +34,23 @@ public class CoreMonitoringRetrievalTaskExcelVo {
      */
     @ExcelProperty("任务名称")
     private String taskName;
+
+    /**
+     * 状态
+     */
+    @ExcelIgnore
+    @ApiModelProperty(value = "任务进度")
+    private String status;
+
+    @ExcelProperty("任务进度")
+    private String statusText;
     /**
      * 调阅周期
      */
     @ExcelIgnore
     @ApiModelProperty(value = "调阅周期")
     private String cycle;
+
     @ExcelIgnore
     @ExcelProperty("调阅周期")
     private String cycleText;
@@ -58,31 +69,28 @@ public class CoreMonitoringRetrievalTaskExcelVo {
     private Date planEndTime;
 
     /**
-     * 状态
-     */
-    @ExcelIgnore
-    @ApiModelProperty(value = "任务进度")
-    private String status;
-    @ExcelProperty("任务进度")
-    private String statusText;
-
-    /**
      * 调阅机构
      */
     @ExcelProperty("调阅机构")
     private String orgName;
+
+
+
+
     /**
      * 调阅角色
      */
-    @ExcelIgnore
-    @ExcelProperty("调阅角色")
+    @ExcelProperty("调阅人员")
     private String roleName;
-
+    /**
+     * 调阅人
+     */
+    @ExcelProperty("登记人")
+    private String retrievalUserName;
 
     /**
      * 调阅开始时间
      */
-    @ExcelIgnore
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ExcelProperty("调阅开始时间")
     private Date startTime;
@@ -90,17 +98,12 @@ public class CoreMonitoringRetrievalTaskExcelVo {
     /**
      * 调阅结束时间
      */
-    @ExcelIgnore
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ExcelProperty("调阅结束时间")
     private Date endTime;
 
-    /**
-     * 调阅人
-     */
-    @ExcelProperty("调阅人")
-    private String retrievalUserName;
-
+    @ExcelIgnore
     @ExcelProperty("异常数")
     private Integer exceptionCount;
 

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/retrieval/vo/CoreMonitoringRetrievalTaskVo.java

@@ -104,14 +104,14 @@ public class CoreMonitoringRetrievalTaskVo extends BaseEntity {
     /**
      * 开始时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy年MM月dd日", timezone = "GMT+8")
     @ApiModelProperty(value = "开始时间")
     private Date planStartTime;
 
     /**
      * 结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy年MM月dd日", timezone = "GMT+8")
     @ApiModelProperty(value = "结束时间")
     private Date planEndTime;