查询可以根据上级单位来查询

src/main/java/com/biutag/supervision/controller/report/ReportProjectController.java

@@ -20,6 +20,7 @@ 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.entity.InformMessage;
+import com.biutag.supervision.pojo.entity.SupDepart;
 import com.biutag.supervision.pojo.entity.recessed.RecessedLog;
 import com.biutag.supervision.pojo.entity.report.ReportProject;
 import com.biutag.supervision.pojo.enums.FlowEnum;
@@ -84,7 +85,7 @@ public class ReportProjectController {
         wrapper.eq(StrUtil.isNotBlank(query.getReportType()),"p.report_type",query.getReportType())
                 .like(StrUtil.isNotBlank(query.getReportName()),"p.report_name",query.getReportName())
                 .eq(StrUtil.isNotBlank(query.getProjectType()),"p.project_type",query.getProjectType())
-                .eq(StrUtil.isNotBlank(query.getAuditUnitId()),"p.audit_unit_id",query.getAuditUnitId())
+//                .eq(StrUtil.isNotBlank(query.getAuditUnitId()),"p.audit_unit_id",query.getAuditUnitId())
                 .like(StrUtil.isNotBlank(query.getProjectPrincipal()),"p.project_principal",query.getProjectPrincipal())
                 .like(StrUtil.isNotBlank(query.getProjectPhone()),"p.project_phone",query.getProjectPhone())
                 .eq(StrUtil.isNotBlank(query.getPurchaseMethod()),"p.purchase_method",query.getPurchaseMethod())
@@ -125,8 +126,13 @@ public class ReportProjectController {
         if(StrUtil.isNotBlank(query.getCode()) &&!"all".equals(query.getCode()) ){
             wrapper.eq("p.is_recessed",Integer.parseInt(query.getCode()));
         }
-
+        if (StrUtil.isNotBlank(query.getAuditUnitId())) {
-
+            // 获取选择的审计单位及其所有子部门的ID
+            wrapper.in("p.audit_unit_id", departService.getAllNodeIds(query.getAuditUnitId()));
+        }
+        if (StrUtil.isNotBlank(query.getProjectUnitId())){
+            wrapper.in("p.project_unit_id", departService.getAllNodeIds(query.getProjectUnitId()));
+        }
         //获取登陆人信息
         UserAuth user = UserContextHolder.getCurrentUser();
         log.info("user",user);
@@ -146,7 +152,25 @@ public class ReportProjectController {
         }
         wrapper.orderByDesc("p.crt_time");
         wrapper.groupBy("p.id");
-        return Result.success(reportProjectService.getPage(new Page<>(query.getCurrent(),query.getSize()),wrapper));
+        Page<EntryWindowVo> vo = reportProjectService.getPage(new Page<>(query.getCurrent(), query.getSize()), wrapper);
+        List<EntryWindowVo> entryWindowVos = vo.getRecords();
+        entryWindowVos.forEach(s->{
+            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() +"/");
+            }
+        });
+        return Result.success(vo);
     }
 
     //审计情况表报表
@@ -157,8 +181,8 @@ public class ReportProjectController {
         wrapper.eq(StrUtil.isNotBlank(queryParam.getNode()),"p.node",queryParam.getNode())
                 .like(StrUtil.isNotBlank(queryParam.getReportName()),"p.report_name",queryParam.getReportName())
                 .like(StrUtil.isNotBlank(queryParam.getProjectType()),"p.project_type",queryParam.getProjectType())
-                .eq(StrUtil.isNotBlank(queryParam.getAuditUnitId()),"p.audit_unit_id",queryParam.getAuditUnitId())
+//                .eq(StrUtil.isNotBlank(queryParam.getAuditUnitId()),"p.audit_unit_id",queryParam.getAuditUnitId())
-                .eq(StrUtil.isNotBlank(queryParam.getProjectUnitId()),"p.project_unit_id",queryParam.getProjectUnitId())
+//                .eq(StrUtil.isNotBlank(queryParam.getProjectUnitId()),"p.project_unit_id",queryParam.getProjectUnitId())
                 .eq(StrUtil.isNotBlank(queryParam.getPurchaseMethod()),"p.purchase_method",queryParam.getPurchaseMethod())
                 .like(StrUtil.isNotBlank(queryParam.getReferenceNumber()),"p.reference_number",queryParam.getReferenceNumber());
                 if(StrUtil.isNotBlank(queryParam.getReportType()) && !"all".equals(queryParam.getReportType())) {
@@ -180,9 +204,33 @@ public class ReportProjectController {
                         wrapper.ge("p.report_money",new BigDecimal(200000));
                     }
                 }
+        if (StrUtil.isNotBlank(queryParam.getAuditUnitId())) {
+            // 获取选择的审计单位及其所有子部门的ID
+            wrapper.in("p.audit_unit_id", departService.getAllNodeIds(queryParam.getAuditUnitId()));
+        }
+        if (StrUtil.isNotBlank(queryParam.getProjectUnitId())){
+            wrapper.in("p.project_unit_id", departService.getAllNodeIds(queryParam.getProjectUnitId()));
+        }
                 wrapper.groupBy("p.id");
                 wrapper.eq("p.delete_flag", DeleteStatusEnum.NO.getCode());
-        return Result.success(reportProjectService.getConditionPage(new Page<>(queryParam.getCurrent(),queryParam.getSize()),wrapper));
+        Page<ConditionVo> conditionPage = reportProjectService.getConditionPage(new Page<>(queryParam.getCurrent(), queryParam.getSize()), wrapper);
+        conditionPage.getRecords().forEach(s->{
+            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() +"/");
+            }
+        });
+        return Result.success(conditionPage);
 
     }
 

src/main/java/com/biutag/supervision/pojo/vo/statement/ConditionVo.java

@@ -2,8 +2,8 @@ package com.biutag.supervision.pojo.vo.statement;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.biutag.supervision.pojo.entity.report.ReportProject;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -91,4 +91,16 @@ public class ConditionVo  {
     @ExcelProperty(value = "归档日期")
     private LocalDateTime archiving;
 
+    @Schema(description = "审计单位字符串 带父级单位")
+    private String auditUnitStr;
+
+    @Schema(description = "项目单位字符串 带父级单位")
+    private String projectUnitStr;
+
+    //审计单位id
+    private String auditUnitId;
+
+    //项目单位id
+    private String projectUnitId;
+
 }