From 38ba73e70e9f13a2e6313e145111b462043b4ea6 Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Wed, 21 Jan 2026 15:50:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E7=AA=97=E6=8C=89=E9=92=AE=E5=8F=AA?= =?UTF-8?q?=E8=83=BD=E6=98=AF=E5=86=85=E5=AE=A1=E5=8D=95=E4=BD=8D=E6=89=8D?= =?UTF-8?q?=E8=83=BD=E7=9C=8B=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/ReportProjectController.java | 14 +++++++++++++ .../supervision/pojo/dto/QuerySecondDTO.java | 20 +++++++++++++++++++ .../pojo/vo/entryWindow/EntryWindowVo.java | 3 +++ .../supervision/service/SupDepartService.java | 16 +++++++++++++++ 4 files changed, 53 insertions(+) create mode 100644 src/main/java/com/biutag/supervision/pojo/dto/QuerySecondDTO.java diff --git a/src/main/java/com/biutag/supervision/controller/report/ReportProjectController.java b/src/main/java/com/biutag/supervision/controller/report/ReportProjectController.java index 0685025..41b61d0 100644 --- a/src/main/java/com/biutag/supervision/controller/report/ReportProjectController.java +++ b/src/main/java/com/biutag/supervision/controller/report/ReportProjectController.java @@ -19,6 +19,7 @@ import com.biutag.supervision.constants.enums.DeleteStatusEnum; import com.biutag.supervision.constants.enums.RoleCodeEnum; import com.biutag.supervision.mapper.Recessed.RecessedLogMapper; import com.biutag.supervision.pojo.Result; +import com.biutag.supervision.pojo.dto.QuerySecondDTO; import com.biutag.supervision.pojo.entity.InformMessage; import com.biutag.supervision.pojo.entity.SupDepart; import com.biutag.supervision.pojo.entity.recessed.RecessedLog; @@ -169,6 +170,19 @@ public class ReportProjectController { }else { s.setProjectUnitStr(projectById.getShortName() +"/"); } + if (!AppConstants.USER_TYPE_SUPER.equals(user.getUserType())){ + QuerySecondDTO querySecondDTO = new QuerySecondDTO(); + querySecondDTO.setDepartId(s.getAuditUnitId()); + // 项目的二级机构 + SupDepart auditUnitSecondSupDepart = departService.getSecondSupDepart(querySecondDTO); + querySecondDTO.setDepartId(UserContextHolder.getCurrentUser().getDepartId()); + // 账号的二级机构 + SupDepart secondSupDepart = departService.getSecondSupDepart(querySecondDTO); + // 是否内审 + s.setIsSelfData(auditUnitSecondSupDepart.getId().equals(secondSupDepart.getId())? "1": "0"); + }else { + s.setIsSelfData("1"); + } }); return Result.success(vo); } diff --git a/src/main/java/com/biutag/supervision/pojo/dto/QuerySecondDTO.java b/src/main/java/com/biutag/supervision/pojo/dto/QuerySecondDTO.java new file mode 100644 index 0000000..08a4682 --- /dev/null +++ b/src/main/java/com/biutag/supervision/pojo/dto/QuerySecondDTO.java @@ -0,0 +1,20 @@ +package com.biutag.supervision.pojo.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +/** + * @ClassName QuerySecondDTO + * @Description 查询二级单位信息DTO + * @Author shihao + * @Date 2026/1/21 11:14 + */ +@Getter +@Setter +@Schema(description = "查询二级单位信息DTO") +public class QuerySecondDTO { + + @Schema(description = "单位id") + private String departId; +} 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 7d25f5d..8bcd3b9 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 @@ -28,4 +28,7 @@ public class EntryWindowVo extends ReportProject { @Schema(description = "项目单位字符串 带父级单位") private String projectUnitStr; + @Schema(description = "是否是本单位的数据, 1是, 0否") + private String isSelfData; + } diff --git a/src/main/java/com/biutag/supervision/service/SupDepartService.java b/src/main/java/com/biutag/supervision/service/SupDepartService.java index 95a8fc8..a809ad9 100644 --- a/src/main/java/com/biutag/supervision/service/SupDepartService.java +++ b/src/main/java/com/biutag/supervision/service/SupDepartService.java @@ -9,6 +9,7 @@ import com.biutag.supervision.constants.AppConstants; import com.biutag.supervision.constants.enums.RoleCodeEnum; import com.biutag.supervision.constants.enums.StatusEnum; import com.biutag.supervision.mapper.SupDepartMapper; +import com.biutag.supervision.pojo.dto.QuerySecondDTO; import com.biutag.supervision.pojo.entity.SupDepart; import com.biutag.supervision.pojo.model.UserAuth; import com.biutag.supervision.pojo.param.DepartQueryParam; @@ -309,4 +310,19 @@ public class SupDepartService extends ServiceImpl { } } + /** + * 传入3级或2级单位 获取二级单位信息 + * @return + */ + public SupDepart getSecondSupDepart(QuerySecondDTO querySecondDTO){ + SupDepart res = new SupDepart(); + String departId = querySecondDTO.getDepartId(); + res = getById(departId); + if (3==res.getLevel()){ + res = getById(res.getPid()); + } + return res; + } + + }