缺陷修复

project_data/sql/0.0.2/soc/soc.sql

@@ -1420,3 +1420,7 @@ alter table core_drill_dictionary auto_increment = 10000;
 -- 用户导出管理人员
 delete from `sys_menu` where `menu_name` ='用户导出管理人员';
 INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (00000000000000002358, '用户导出管理人员', 100, 9, '', NULL, NULL, 1, 0, 'F', '0', '0', 'system:user:exportManager', '1', NULL, NULL, '演示安全检查', '2023-09-27 16:10:58', '', NULL, '');
+
+ALTER TABLE `core_protection` 
+MODIFY COLUMN `device_id` bigint NULL DEFAULT NULL COMMENT '设备ID' AFTER `id`,
+MODIFY COLUMN `alarm_host_code` bigint NULL DEFAULT NULL COMMENT '报警主机唯一标识' AFTER `org_name`;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/domain/Protection.java

@@ -30,7 +30,7 @@ public class Protection extends BaseEntity {
     /**
      * 设备
      */
-    private String deviceId;
+    private Long deviceId;
 
     /**
      * 防区的唯一标识
@@ -38,7 +38,7 @@ public class Protection extends BaseEntity {
     private String code;
 
 
-    private String alarmHostCode;
+    private Long alarmHostCode;
 
     /**
      * 防区的名称

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/ResumptionRecordServiceImpl.java

@@ -346,13 +346,16 @@ public class ResumptionRecordServiceImpl extends ServiceImpl<ResumptionRecordMap
         Map<String, SysDictData> dicts = remoteDictDataService.selectDictByeType("resumption_status", SecurityConstants.INNER)
                 .stream().collect(Collectors.toMap(SysDictData::getDictValue, v -> v));
         List<ResumptionRecordPageVo> limit = data.stream().limit(10000).collect(Collectors.toList());
-        limit.forEach(r -> {
+        int index=1;
+        for (ResumptionRecordPageVo r : limit) {
+            r.setIndex(index++);
             if (dicts.containsKey(r.getStatus())) {
                 r.setStatusText(dicts.get(r.getStatus()).getDictLabel());
             } else {
                 r.setStatusText("未知");
             }
-        });
+        }
+
         response.setContentType("application/vnd.ms-excel");
 //        response.setCharacterEncoding("utf-8");
         // 调用EasyExcel的导出方法

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/resumptionRecord/ResumptionRecordPageVo.java

@@ -19,6 +19,11 @@ import java.util.Date;
  */
 @Data
 public class ResumptionRecordPageVo {
+    @ExcelProperty(value = "序号",index = 0)
+    @ColumnWidth(10)
+    @JsonIgnore
+    private int index;
+
     @ApiModelProperty("履职任务id")
     @ExcelIgnore
     private String resumptionId;
@@ -26,7 +31,7 @@ public class ResumptionRecordPageVo {
     /**
      * 任务名称
      */
-    @ExcelProperty("任务名称")
+    @ExcelProperty(value = "任务名称",index = 1)
     @ColumnWidth(30)
     private String name;
 
@@ -36,13 +41,13 @@ public class ResumptionRecordPageVo {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("任务开始时间")
-    @ExcelProperty("任务开始时间")
+    @ExcelProperty(value ="任务开始时间",index=5)
     @ColumnWidth(30)
     private Date planStartTime;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty("任务结束时间")
-    @ExcelProperty("任务结束时间")
+    @ApiModelProperty(value ="任务结束时间")
+    @ExcelProperty(value ="截止时间",index = 6)
     @ColumnWidth(30)
     private Date planEndTime;
 
@@ -53,12 +58,11 @@ public class ResumptionRecordPageVo {
     private Long orgId;
 
     @ApiModelProperty("上级机构")
-    @ExcelProperty("上级机构")
-    @ColumnWidth(20)
+    @ExcelIgnore
     private String parentOrgName;
 
     @ApiModelProperty("机构名称")
-    @ExcelProperty("履职机构")
+    @ExcelProperty(value="履职机构",index = 2)
     @ColumnWidth(20)
     private String orgName;
 
@@ -67,32 +71,33 @@ public class ResumptionRecordPageVo {
     private Long roleId;
 
     @ApiModelProperty("履职角色")
-    @ExcelProperty("履职角色")
+    @ExcelProperty(value="履职角色",index = 3)
     @ColumnWidth(20)
     private String roleName;
 
     @ApiModelProperty("提交人")
-    @ExcelProperty("提交人")
+    @ExcelProperty(value = "提交人",index = 7)
     @ColumnWidth(15)
     private String submitter;
 
     @ApiModelProperty("提交时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ExcelProperty("提交时间")
+    @ExcelProperty(value = "提交时间",index = 8)
     @ColumnWidth(20)
     private Date submitTime;
 
-    @ApiModelProperty("异常要点数量")
-    @ExcelProperty("异常个数")
+    @ApiModelProperty("隐患问题数")
+    @ExcelProperty(value = "隐患问题数",index = 9)
     @ColumnWidth(15)
-    private int abnormalDataNums;
+    private Integer abnormalDataNums;
 
     //    @ApiModelProperty("状态 0:待履职 1:按时完成 3:未完成 5:补登完成")
     @ExcelIgnore
     private String status;
 
     @JsonIgnore
-    @ExcelProperty("履职状态")
+    @ExcelProperty(value = "履职进度",index = 4)
+    @ColumnWidth(15)
     private String statusText;
 
     /**