fit:值班接口 + 综合查询批量导出

src/main/java/com/biutag/supervision/pojo/entity/SupRota.java

@@ -46,6 +46,6 @@ public class SupRota {
     @TableField("phone")
     private String phone;
 
-//    @TableField("schedule_id")
+    @TableField("schedule_id")
-//    private String scheduleId;
+    private String scheduleId;
 }

src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeVo.java

@@ -38,6 +38,8 @@ public class ExportNegativeVo {
     @ExcelProperty({"问题基本信息","问题来源"})
     private String problemSources;
 
+    @ExcelProperty({"问题基本信息","专项督察"})
+    private String specialSupervision;
     // 业务类别名称
     @ExcelProperty({"问题基本信息","业务类别"})
     private String businessTypeName;

src/main/java/com/biutag/supervision/service/NegativeTaskService.java

@@ -89,6 +89,8 @@ public class NegativeTaskService extends ServiceImpl<NegativeTaskMapper, Negativ
     @Async
     public void exportExcel(List<NegativeQueryVo> data, String negativeTaskId) {
         List<SupDictData> suspectProblem = dictDataService.listByDictType("suspectProblem");
+
+        List<SupDictData> specialSupervisionDict = dictDataService.listByDictType("specialSupervision");
         List<ExportNegativeVo> list = new ArrayList<>();
         List<ExportNegativeBlameVo> blameVoList = new ArrayList<>();
         if (!data.isEmpty()) {
@@ -106,6 +108,13 @@ public class NegativeTaskService extends ServiceImpl<NegativeTaskMapper, Negativ
                     vo.setInvolveProblem(involveProblem);
                 }
                 vo.setProcessingStatus(ProcessingStatusEnum.getLabel(item.getProcessingStatus()));
+
+                //专项督察
+                if(CollectionUtil.isNotEmpty(specialSupervisionDict)){
+                    String specialSupervision = specialSupervisionDict.stream().filter(dict->dict.getDictValue().equals(vo.getSpecialSupervision())).findFirst().map(SupDictData::getDictLabel).orElse("");
+                    vo.setSpecialSupervision(specialSupervision);
+                }
+
                 // 问题类型
                 String problemTypeList = negativeProblemRelations.stream().filter(problem -> item.getId().equals(problem.getNegativeId()) && StrUtil.isNotBlank(problem.getOneLevelContent())).map(problem -> {
                     if ("其他".equals(problem.getThreeLevelContent())) {
@@ -126,6 +135,7 @@ public class NegativeTaskService extends ServiceImpl<NegativeTaskMapper, Negativ
                 vo.setAccountabilityTarget(AccountabilityTargetEnum.getLabel(item.getAccountabilityTarget()));
                 // 涉及人员
                 List<NegativeBlame> blameList = blames.stream().filter(blame -> blame.getNegativeId().equals(item.getId())).toList();
+                //todo 涉及人员
                 String blameStr = blameList.stream()
                         .filter(blame -> blame.getBlameName() != null)
                         .map(blame -> String.format("(%s)%s-%s", BlameType.personal.name().equals(blame.getType())?"个人": "单位", blame.getBlameName(), blame.getBlameEmpNo()))
@@ -149,6 +159,10 @@ public class NegativeTaskService extends ServiceImpl<NegativeTaskMapper, Negativ
                     blameVo.setProblemType(problemType);
                     // 人员属性
                     blameVo.setIvPersonType(PersonTypeEnum.getLabel(negativeBlame.getIvPersonTypeCode()));
+                    if(AccountabilityTargetEnum.PERSONAL_AND_DEPARTMENT.getLabel().equals(blameVo.getAccountabilityTarget())){
+                        blameVo.setAccountabilityTarget(BlameType.personal.name().equals(negativeBlame.getType())?"涉及个人": "涉及单位");
+                    }
+
                     blameVoList.add(blameVo);
                 }
                 return vo;