教育培训 预案演练导出 新增序号列

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/vo/CoreDrillTaskExportVo.java

@@ -21,76 +21,82 @@ import java.util.List;
 @ContentRowHeight(16) //数据行高
 public class CoreDrillTaskExportVo {
 
+
+    @ColumnWidth(10)
+    @ExcelProperty(value = "序号", index = 0)
+    @ApiModelProperty(value = "序号")
+    private int index;
+
     @ColumnWidth(25)
-    @ExcelProperty(value = "任务名称", index = 0)
+    @ExcelProperty(value = "任务名称", index = 1)
     @ApiModelProperty(value = "任务名称")
     private String title;
 
     @ColumnWidth(25)
-    @ExcelProperty(value = "演练机构", index = 1)
+    @ExcelProperty(value = "演练机构", index = 2)
     @ApiModelProperty(value = "演练机构")
     private String orgName;
 
     @ColumnWidth(25)
-    @ExcelProperty(value = "演练项目", index = 2)
+    @ExcelProperty(value = "演练项目", index = 3)
     @ApiModelProperty(value = "演练项目")
     private String typeText;
 
-    @ExcelProperty(value = "任务进度", index = 3)
+    @ExcelProperty(value = "任务进度", index = 4)
     private String statusText;
 
     @ColumnWidth(42)
-    @ExcelProperty(value = "任务时间", index = 4)
+    @ExcelProperty(value = "任务时间", index = 5)
     @ApiModelProperty(value = "任务时间")
     private String taskDate;
 
 
-    @ExcelProperty(value = "演练地点", index = 5)
+    @ExcelProperty(value = "演练地点", index = 6)
     @ApiModelProperty(value = "演练地点")
     private String drillSite;
 
 
-    @ExcelProperty(value = "指挥人", index = 6)
+    @ExcelProperty(value = "指挥人", index = 7)
     @ApiModelProperty(value = "指挥人")
     private String hostName;
 
-    @ExcelProperty(value = "登记人", index = 7)
+    @ExcelProperty(value = "登记人", index = 8)
     @ApiModelProperty(value = "登记人")
     private String recorderName;
 
     @ColumnWidth(25)
-    @ExcelProperty(value = "演练开始时间", index = 8)
+    @ExcelProperty(value = "演练开始时间", index = 9)
     @ApiModelProperty(value = "演练开始时间")
     private String drillStartTime;
 
     @ColumnWidth(25)
-    @ExcelProperty(value = "演练截止时间", index = 9)
-    @ApiModelProperty(value = "演练截止时间")
+    @ExcelProperty(value = "演练结束时间", index = 10)
+    @ApiModelProperty(value = "演练结束时间")
     private String drillEndTime;
 
     @ColumnWidth(50)
-    @ExcelProperty(value = "预设案由", index = 10)
+    @ExcelProperty(value = "预设案由", index = 11)
     @ApiModelProperty(value = "预设案由")
     private String presetCase;
 
     @ColumnWidth(50)
-    @ExcelProperty(value = "演练情况", index = 11)
+    @ExcelProperty(value = "演练情况", index = 12)
     @ApiModelProperty(value = "演练情况")
     private String drillSituation;
 
-    @ExcelProperty(value = "参会人员", index = 12)
+    @ExcelProperty(value = "参会人员", index = 13)
     @ApiModelProperty(value = "参与人员名称")
     private String taskUserNames;
 
-    @ExcelProperty(value = "缺席人员", index = 13)
+    @ExcelProperty(value = "缺席人员", index = 14)
     @ApiModelProperty(value = "缺席人员名称")
     private String absenceNames;
 
-    @ExcelProperty(value = "评分", index = 14)
+    @ExcelProperty(value = "评分", index = 15)
     @ApiModelProperty(value = "评分")
     private Integer commentScore;
 
-    @ExcelProperty(value = "评语", index = 15)
+    @ExcelProperty(value = "评语", index = 16)
     @ApiModelProperty(value = "评语")
     private String comment;
 

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/vo/CoreEduTrainingTaskExportVo.java

@@ -14,54 +14,61 @@ import lombok.Data;
 @ContentRowHeight(16) //数据行高
 public class CoreEduTrainingTaskExportVo {
 
-    @ExcelProperty(value = "任务名称", index = 0)
-    @ApiModelProperty(value = "任务名称")
+    @ColumnWidth(10)
+    @ExcelProperty(value = "序号", index = 0)
+    @ApiModelProperty(value = "序号")
+    private int index;
+
+    @ExcelProperty(value = "培训主题", index = 1)
+    @ApiModelProperty(value = "培训主题")
     private String title;
 
-    @ExcelProperty(value = "任务进度", index = 1)
+
+    @ColumnWidth(25)
+    @ExcelProperty(value = "受训机构", index = 2)
+    @ApiModelProperty(value = "受训机构")
+    private String orgName;
+
+    @ExcelProperty(value = "任务进度", index = 3)
     private String statusText;
 
     @ColumnWidth(35)
-    @ExcelProperty(value = "任务时间", index = 2)
+    @ExcelProperty(value = "任务时间", index = 4)
     @ApiModelProperty(value = "任务时间")
     private String taskDate;
 
-    @ColumnWidth(25)
-    @ExcelProperty(value = "培训机构", index = 3)
-    @ApiModelProperty(value = "培训机构")
-    private String orgName;
 
-    @ExcelProperty(value = "主持人", index = 4)
+    @ExcelProperty(value = "主持人", index = 5)
     @ApiModelProperty(value = "主持人名称")
     private String hostName;
 
-    @ExcelProperty(value = "登记人", index = 5)
+    @ExcelProperty(value = "登记人", index = 6)
     @ApiModelProperty(value = "记录人名称")
     private String recorderName;
 
     @ColumnWidth(25)
-    @ExcelProperty(value = "培训开始时间", index = 6)
+    @ExcelProperty(value = "培训开始时间", index = 7)
     @ApiModelProperty(value = "培训开始时间")
     private String trainingStartDateTime;
 
     @ColumnWidth(25)
-    @ExcelProperty(value = "培训截止时间", index = 7)
-    @ApiModelProperty(value = "培训截止时间")
+    @ExcelProperty(value = "培训结束时间", index = 8)
+    @ApiModelProperty(value = "培训结束时间")
     private String trainingEndDateTime;
 
-    @ExcelProperty(value = "培训内容", index = 8)
+    @ExcelProperty(value = "培训内容", index = 9)
     @ApiModelProperty(value = "内容")
     private String content;
 
-    @ExcelProperty(value = "培训总结", index = 9)
+    @ExcelProperty(value = "培训总结", index = 10)
     @ApiModelProperty(value = "总结")
     private String note;
 
-    @ExcelProperty(value = "参会人员", index = 10)
+    @ExcelProperty(value = "参会人员", index = 11)
     @ApiModelProperty(value = "参与人员名称")
     private String taskUserNames;
 
-    @ExcelProperty(value = "缺席人员", index = 11)
+    @ExcelProperty(value = "缺席人员", index = 12)
     @ApiModelProperty(value = "缺席人员名称")
     private String absenceNames;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -977,8 +977,10 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
                 .stream().collect(Collectors.toMap(SysDictData::getDictValue, v -> v));
         List<Long> taskIds = list.stream().map(x -> x.getId()).collect(Collectors.toList());
         List<CoreDrillTaskToUser> allTaskUserList = taskToUserMapper.selectList(new LambdaQueryWrapper<CoreDrillTaskToUser>().in(CoreDrillTaskToUser::getDrillTaskId, taskIds));
-
+        int index=1;
         for (CoreDrillTaskExportVo task : list) {
+            task.setIndex(index);
+            index++;
             task.setStatusText(DrillDoStatus.getName(task.getStatus()));
             if (dicts.containsKey(task.getType())) {
                 task.setTypeText(dicts.get(task.getType()).getDictLabel());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -913,7 +913,10 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         if (ObjectUtil.isEmpty(list)){
             throw new SystemException("未获取到数据");
         }
+        int index=1;
         for (CoreEduTrainingTaskExportVo task : list) {
+            task.setIndex(index);
+            index++;
             task.setStatusText(EduTrainingDoStatus.getName(task.getStatus()));
             List<CoreEduTrainingTaskToUser> userList = taskToUserMapper.selectList(new LambdaQueryWrapper<CoreEduTrainingTaskToUser>()
                     .eq(CoreEduTrainingTaskToUser::getEduTrainingTaskId, task.getId()));