feat:1、进窗列表：新增项目“当前环节”、“归档时间”、“审计层级” 2、审计报表：所有导出数据的单位需展示三级机构，如有展示二级机构+/+三级机构

src/main/java/com/biutag/supervision/constants/AppConstants.java

@@ -29,4 +29,6 @@ public class AppConstants {
 
     public static final String DEL = "1";
 
+    // 督审支队的单位id
+    public static final String DSZD = "2785";
 }

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

@@ -117,6 +117,10 @@ public class ReportProjectController {
         if(CollectionUtil.isNotEmpty(query.getContractTime())){
             wrapper.between("p.contract_time",query.getContractTime().get(0),query.getContractTime().get(1));
         }
+        //归档时间
+        if(CollectionUtil.isNotEmpty(query.getArchivingTime())){
+            wrapper.between("p.archiving",query.getArchivingTime().get(0),query.getArchivingTime().get(1));
+        }
         //服务日期
         if(query.getServiceStartTime()!= null & query.getServiceEndTime()!= null){
             wrapper.ge("p.service_start_time",query.getServiceStartTime());
@@ -127,6 +131,17 @@ public class ReportProjectController {
         if(StrUtil.isNotBlank(query.getCode()) &&!"all".equals(query.getCode()) ){
             wrapper.eq("p.is_recessed",Integer.parseInt(query.getCode()));
         }
+        if (CollectionUtil.isNotEmpty(query.getNodeList())) {
+            wrapper.in("p.node", query.getNodeList());
+        }
+        if (StrUtil.isNotBlank(query.getAuditLevel())) {
+            List<String> cityAuditUnitIds = departService.getAllNodeIds(AppConstants.DSZD);
+            if ("city".equals(query.getAuditLevel())) {
+                wrapper.in("p.audit_unit_id", cityAuditUnitIds);
+            } else if ("second".equals(query.getAuditLevel())) {
+                wrapper.notIn("p.audit_unit_id", cityAuditUnitIds);
+            }
+        }
         if (StrUtil.isNotBlank(query.getAuditUnitId())) {
             // 获取选择的审计单位及其所有子部门的ID
             wrapper.in("p.audit_unit_id", departService.getAllNodeIds(query.getAuditUnitId()));
@@ -137,7 +152,8 @@ public class ReportProjectController {
         //获取登陆人信息
         UserAuth user = UserContextHolder.getCurrentUser();
         log.info("user",user);
-        boolean firstAuth = AppConstants.USER_TYPE_SUPER.equals(user.getUserType()) || user.getRoleCodes().contains(RoleCodeEnum.FIRST_ADMIN.getCode());
+        boolean superAuth = AppConstants.USER_TYPE_SUPER.equals(user.getUserType());
+        boolean firstAuth = superAuth || user.getRoleCodes().contains(RoleCodeEnum.FIRST_ADMIN.getCode());
         //非超级管理员 && 非市级管理员
         if( !firstAuth ){
             List<String> orgIds = new ArrayList<>();
@@ -149,8 +165,13 @@ public class ReportProjectController {
                 orgIds = departService.getAllNodeIds(user.getDepartId());
                 wrapper.in("p.project_unit_id", orgIds);
             }
+        }
+        // 逻辑删除数据仅超级管理员可见
+        if (!superAuth) {
             wrapper.eq("p.delete_flag", DeleteStatusEnum.NO.getCode());
         }
+        // 审计层级
+        wrapper.eq("p.delete_flag", DeleteStatusEnum.NO.getCode());
         wrapper.orderByDesc("p.crt_time");
         wrapper.groupBy("p.id");
         Page<EntryWindowVo> vo = reportProjectService.getPage(new Page<>(query.getCurrent(), query.getSize()), wrapper);
@@ -268,6 +289,12 @@ public class ReportProjectController {
                 s.setReductionRate(s.getReductionRate().setScale(2,RoundingMode.HALF_UP));
                 s.setNode(FlowEnum.contains(s.getNode()));
             });
+            for (int i = 0; i < list.size(); i++) {
+                ConditionVo source = list.get(i);
+                ConditionExcelVo target = dataList.get(i);
+                target.setProjectUnit(source.getProjectUnitStr());
+                target.setAuditUnit(source.getAuditUnitStr());
+            }
 
             //报审金额(元)
             BigDecimal reportMoneySum = dataList.stream().map(ConditionExcelVo::getReportMoney).filter(Objects::nonNull)

src/main/java/com/biutag/supervision/pojo/param/entryWindow/EntryWindowQueryParam.java

@@ -2,6 +2,8 @@ package com.biutag.supervision.pojo.param.entryWindow;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.biutag.supervision.pojo.param.BasePage;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -23,6 +25,10 @@ public class EntryWindowQueryParam extends BasePage {
     private String auditUnitId;
     //审计单位
     private String auditUnit;
+
+    @Schema(description = "审计层级 city:市局审批 second:二级机构审批")
+    private String auditLevel;
+
     //项目单位id
     private String projectUnitId;
     //项目单位
@@ -44,22 +50,31 @@ public class EntryWindowQueryParam extends BasePage {
 
     //报审日期
     @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private List<LocalDateTime> applicantTime;
     //立项日期
     @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private List<LocalDateTime> projectApprovalTime;
     //申报政府采购日期
     @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private List<LocalDateTime> applyGovernmentTime;
     //采购方式
     @TableField("purchase_type")
     private String purchaseType;
     //采购日期
     @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private List<LocalDateTime> purchaseTime;
     //合同签订日期
     @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private List<LocalDateTime> contractTime;
+    //归档时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private List<LocalDateTime> archivingTime;
     //合同金额
     @TableField("contract_mount")
     private BigDecimal contractMount;
@@ -69,9 +84,14 @@ public class EntryWindowQueryParam extends BasePage {
 
     //服务日期（开始）
     @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime serviceStartTime;
 
     //服务日期（结束)
     @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime serviceEndTime;
+
+    @Schema(description = "当前环节  进度")
+    private List<String> nodeList;
 }