diff --git a/src/main/java/com/biutag/supervision/controller/warning/WarningController.java b/src/main/java/com/biutag/supervision/controller/warning/WarningController.java index cc28c86..48ce8f6 100644 --- a/src/main/java/com/biutag/supervision/controller/warning/WarningController.java +++ b/src/main/java/com/biutag/supervision/controller/warning/WarningController.java @@ -11,6 +11,7 @@ import com.biutag.supervision.constants.AppConstants; import com.biutag.supervision.constants.enums.DeleteStatusEnum; import com.biutag.supervision.constants.enums.RoleCodeEnum; import com.biutag.supervision.pojo.Result; +import com.biutag.supervision.pojo.entity.SupDepart; import com.biutag.supervision.pojo.entity.report.ReportFlow; import com.biutag.supervision.pojo.entity.report.ReportProject; import com.biutag.supervision.pojo.entity.warning.WarningContent; @@ -34,7 +35,6 @@ import org.springframework.web.bind.annotation.*; import java.time.LocalDateTime; import java.util.ArrayList; -import java.util.Comparator; import java.util.List; import java.util.function.Function; import java.util.stream.Collectors; @@ -107,10 +107,23 @@ public class WarningController { .isNotNull(WarningContent::getRemark)); s.setWarningContent(counts); } + SupDepart auditById = departService.getById(s.getAuditUnitId()); + SupDepart projectById = departService.getById(s.getProjectUnitId()); + if (3==(auditById.getLevel())){ + SupDepart byPId = departService.getById(auditById.getPid()); + s.setAuditUnitStr(byPId.getShortName() +"/" + auditById.getShortName()); + }else { + s.setAuditUnitStr(auditById.getShortName() +"/"); + } + if (3==projectById.getLevel()){ + SupDepart byPId = departService.getById(projectById.getPid()); + s.setProjectUnitStr(byPId.getShortName() +"/" + projectById.getShortName()); + }else { + s.setProjectUnitStr(projectById.getShortName() +"/"); + } }); page.setRecords(entryWindowVos); return Result.success(page); - } /** * 获取最新的预警记录 diff --git a/src/main/java/com/biutag/supervision/pojo/vo/entryWindow/EntryWindowVo.java b/src/main/java/com/biutag/supervision/pojo/vo/entryWindow/EntryWindowVo.java index 73c5e65..7d25f5d 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/entryWindow/EntryWindowVo.java +++ b/src/main/java/com/biutag/supervision/pojo/vo/entryWindow/EntryWindowVo.java @@ -1,6 +1,7 @@ package com.biutag.supervision.pojo.vo.entryWindow; import com.biutag.supervision.pojo.entity.report.ReportProject; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** @@ -21,4 +22,10 @@ public class EntryWindowVo extends ReportProject { //是否已下发问题了 private String stateData; + @Schema(description = "审计单位字符串 带父级单位") + private String auditUnitStr; + + @Schema(description = "项目单位字符串 带父级单位") + private String projectUnitStr; + }