diff --git a/src/main/java/com/biutag/supervision/pojo/entity/SupRota.java b/src/main/java/com/biutag/supervision/pojo/entity/SupRota.java index 7d3701c..d9d21fc 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/SupRota.java +++ b/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") -// private String scheduleId; + @TableField("schedule_id") + private String scheduleId; } diff --git a/src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeVo.java b/src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeVo.java index 5779f4b..bc60deb 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeVo.java +++ b/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; diff --git a/src/main/java/com/biutag/supervision/service/NegativeTaskService.java b/src/main/java/com/biutag/supervision/service/NegativeTaskService.java index 371f5b7..ae0f11c 100644 --- a/src/main/java/com/biutag/supervision/service/NegativeTaskService.java +++ b/src/main/java/com/biutag/supervision/service/NegativeTaskService.java @@ -89,6 +89,8 @@ public class NegativeTaskService extends ServiceImpl data, String negativeTaskId) { List suspectProblem = dictDataService.listByDictType("suspectProblem"); + + List specialSupervisionDict = dictDataService.listByDictType("specialSupervision"); List list = new ArrayList<>(); List blameVoList = new ArrayList<>(); if (!data.isEmpty()) { @@ -106,6 +108,13 @@ public class NegativeTaskService extends ServiceImpldict.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 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