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

@@ -31,7 +31,6 @@ import com.biutag.supervision.pojo.param.Report.ReportProjectQueryParam;
 import com.biutag.supervision.pojo.param.entryWindow.EntryWindowQueryParam;
 import com.biutag.supervision.pojo.param.statement.StatementQueryParam;
 import com.biutag.supervision.pojo.request.reportProject.ReportProjectDeleteRequest;
-import com.biutag.supervision.pojo.vo.DepartTree;
 import com.biutag.supervision.pojo.vo.entryWindow.EntryWindowExcelVo;
 import com.biutag.supervision.pojo.vo.entryWindow.EntryWindowVo;
 import com.biutag.supervision.pojo.vo.excel.ExcelControlPriceVo;
@@ -259,11 +258,6 @@ public class ReportProjectController {
     @PostMapping("/pageConditionVo")
     public Result<Page<ConditionVo>> pageConditionVo(@RequestBody StatementQueryParam queryParam){
         QueryWrapper<ReportProject> wrapper=new QueryWrapper<>();
-        List<SupDepart> departs = departService.list(new LambdaQueryWrapper<SupDepart>()
-                .orderByAsc(SupDepart::getOrderNo));
-        List<DepartTree> departTree = departService.buildTreeAll(departs);
-        Map<String, SupDepart> departMap = departs.stream()
-                .collect(Collectors.toMap(SupDepart::getId, depart -> depart));
 
         wrapper.eq(StrUtil.isNotBlank(queryParam.getNode()),"p.node",queryParam.getNode())
                 .like(StrUtil.isNotBlank(queryParam.getReportName()),"p.report_name",queryParam.getReportName())
@@ -284,10 +278,10 @@ public class ReportProjectController {
                 }
         if (StrUtil.isNotBlank(queryParam.getAuditUnitId())) {
             // 获取选择的审计单位及其所有子部门的ID
-            wrapper.in("p.audit_unit_id", departService.getAllNodeIds(queryParam.getAuditUnitId(), departTree));
+            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(), departTree));
+            wrapper.in("p.project_unit_id", departService.getAllNodeIds(queryParam.getProjectUnitId()));
         }
                 wrapper.groupBy("p.id");
                 wrapper.eq("p.delete_flag", DeleteStatusEnum.NO.getCode());
@@ -297,12 +291,12 @@ public class ReportProjectController {
         boolean superAuth = AppConstants.USER_TYPE_SUPER.equals(user.getUserType());
         boolean firstAuth = superAuth || user.getRoleCodes().contains(RoleCodeEnum.FIRST_ADMIN.getCode());
         List<String> userAuthOrgIds = firstAuth
-                ? departService.getAllNodeIds(ROOTID, departTree)
-                : (user.getAuthDepartIds().isEmpty() ? departService.getAllNodeIds(user.getDepartId(), departTree) : departService.getAllNodeIds(user.getAuthDepartIds(), departTree));
+                ? departService.getAllNodeIds(ROOTID)
+                : (user.getAuthDepartIds().isEmpty() ? departService.getAllNodeIds(user.getDepartId()) : departService.getAllNodeIds(user.getAuthDepartIds()));
         if (!superAuth) {
             wrapper.and(p -> p.in("p.audit_unit_id", userAuthOrgIds).or().in("p.project_unit_id", userAuthOrgIds));
         }
-        List<String> dszdOrgIds = departService.getAllNodeIds(AppConstants.DSZD, departTree);
+        List<String> dszdOrgIds = departService.getAllNodeIds(AppConstants.DSZD);
         // 页面鉴权
         Map<String, Consumer<QueryWrapper<ReportProject>>> authStrategy = Map.of(
                 // “审计单位”为督审支队的项目
@@ -325,30 +319,25 @@ public class ReportProjectController {
 
         Page<ConditionVo> conditionPage = reportProjectService.getConditionPage(new Page<>(queryParam.getCurrent(), queryParam.getSize()), wrapper);
         conditionPage.getRecords().forEach(s->{
-            s.setAuditUnitStr(getConditionUnitStr(departMap, s.getAuditUnitId(),
-                    StrUtil.blankToDefault(s.getAuditUnitStr(), s.getAuditUnit())));
-            s.setProjectUnitStr(getConditionUnitStr(departMap, s.getProjectUnitId(),
-                    StrUtil.blankToDefault(s.getProjectUnitStr(), s.getProjectUnit())));
+            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);
 
     }
 
-    private String getConditionUnitStr(Map<String, SupDepart> departMap, String departId, String fallbackName) {
-        SupDepart depart = departMap.get(departId);
-        if (depart == null) {
-            return StrUtil.blankToDefault(fallbackName, "");
-        }
-        if (Integer.valueOf(3).equals(depart.getLevel())) {
-            SupDepart parent = departMap.get(depart.getPid());
-            if (parent == null) {
-                return StrUtil.blankToDefault(fallbackName, "");
-            }
-            return parent.getShortName() + "/" + depart.getShortName();
-        }
-        return depart.getShortName() + "/";
-    }
-
     //审计情况表导出
     @PostMapping("/excelConditionVo")
     public void excelConditionVo(@RequestBody StatementQueryParam queryParam, HttpServletResponse response) throws Exception {

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

@@ -88,27 +88,4 @@ public class ConditionExcelVo {
     @ExcelProperty(value = "归档日期")
     private LocalDateTime archiving;
 
-    @ExcelProperty(value = "报审类型")
-    private String reportType;
-
-    @ExcelProperty(value = "报审人")
-    private String applicant;
-
-    @ExcelProperty(value = "项目负责人")
-    private String projectPrincipal;
-
-    @ExcelProperty(value = "项目负责人联系方式")
-    private String projectPhone;
-
-    @ExcelProperty(value = "立项金额(元)")
-    private BigDecimal projectApprovalMoney;
-
-    @ExcelProperty(value = "合同金额(元)")
-    private BigDecimal contractMount;
-
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ExcelProperty(value = "合同签订日期")
-    private LocalDateTime contractTime;
-
 }

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

@@ -106,24 +106,4 @@ public class ConditionVo  {
     //项目单位id
     private String projectUnitId;
 
-    @Schema(description = "报审人")
-    private String applicant;
-
-    @Schema(description = "项目负责人")
-    private String projectPrincipal;
-
-    @Schema(description = "项目负责人联系方式")
-    private String projectPhone;
-
-    @Schema(description = "立项金额(元)")
-    private BigDecimal projectApprovalMoney;
-
-    @Schema(description = "合同金额(元)")
-    private BigDecimal contractMount;
-
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Schema(description = "合同签订日期")
-    private LocalDateTime contractTime;
-
 }

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

@@ -70,16 +70,6 @@ public class SupDepartService extends ServiceImpl<SupDepartMapper, SupDepart> {
         return getAllNode(departIds).stream().map(DepartTree::getId).toList();
     }
 
-    public List<String> getAllNodeIds(String departId, List<DepartTree> treeList) {
-        return getAllNodeIds(List.of(departId), treeList);
-    }
-
-    public List<String> getAllNodeIds(Collection<String> departIds, List<DepartTree> treeList) {
-        List<DepartTree> nodes = new ArrayList<>();
-        getAllNodeRecursive(departIds, treeList, nodes);
-        return nodes.stream().map(DepartTree::getId).toList();
-    }
-
     public List<DepartTree> getAllNode(Collection<String> departIds) {
         List<DepartTree> treeList = buildTreeAll();
         List<DepartTree> nodes = new ArrayList<>();

src/main/resources/mapper/ReportProjectMapper.xml

@@ -145,7 +145,7 @@
                 LIMIT 1
             ) as approvalSupervisor,
             rv.review_content as content
-            from report_project p
+            from report_project p LEFT JOIN report_flow flow on p.id = flow.report_id
                 left join report_review rv on p.id = rv.report_id
             ${ew.getCustomSqlSegment}
     </select>