进窗列表：项目删除功能修改为逻辑删除，新增删除原因（必填项）支持在列表进行查看项目及删除原因。

pom.xml

@@ -230,6 +230,29 @@
             <version>3.0.1</version>
         </dependency>
 
+        <!-- Lombok -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- MapStruct 核心依赖 -->
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct</artifactId>
+            <version>1.5.5.Final</version>
+        </dependency>
+
+        <!-- MapStruct 编译期处理器 -->
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct-processor</artifactId>
+            <version>1.5.5.Final</version>
+            <scope>provided</scope>
+        </dependency>
+
+
     </dependencies>
 
     <build>

src/main/java/com/biutag/supervision/aop/CheckInterceptor.java

@@ -0,0 +1,50 @@
+package com.biutag.supervision.aop;
+
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.stereotype.Component;
+
+/**
+ * @ClassName CheckInterceptor
+ * @Description 参数规范
+ * @Author shihao
+ * @Date 2025/12/9 9:14
+ */
+@Component
+@Aspect
+@Slf4j
+public class CheckInterceptor {
+
+
+    @Pointcut("execution(* com.biutag.supervision.controller..*(..)) || execution(* com.biutag.supervision.service..*(..))")
+    public void pointCut() {
+    }
+
+
+    @Before("pointCut()")
+    public void check(JoinPoint joinPoint) {
+        Object[] args = joinPoint.getArgs();
+        for (Object arg : args) {
+            if (arg instanceof ParamChecked) {
+                ((ParamChecked) arg).check();
+            }
+        }
+    }
+
+
+    /**
+     * 只校验 com.biutag.supervision.pojo 包下面的类
+     */
+    private boolean inPojoPackage(Object arg) {
+        Package p = arg.getClass().getPackage();
+        if (p == null) {
+            return false;
+        }
+        String pkg = p.getName();
+        return pkg.startsWith("com.biutag.supervision.pojo");
+    }
+
+}

src/main/java/com/biutag/supervision/aop/ParamChecked.java

@@ -0,0 +1,8 @@
+package com.biutag.supervision.aop;
+
+import java.io.Serializable;
+
+public interface ParamChecked extends Serializable {
+
+    void check();
+}

src/main/java/com/biutag/supervision/common/UserContextHolder.java

@@ -2,6 +2,7 @@ package com.biutag.supervision.common;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.Header;
+import com.biutag.supervision.constants.AppConstants;
 import com.biutag.supervision.constants.RedisKeyConstants;
 import com.biutag.supervision.exception.AuthException;
 import com.biutag.supervision.pojo.model.UserAuth;
@@ -31,4 +32,10 @@ public class UserContextHolder {
         return getCurrentUser().getUserId();
     }
 
+
+    public static boolean isSuperUser() {
+        return AppConstants.USER_TYPE_SUPER.equals(getCurrentUser().getUserType());
+    }
+
+
 }

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

@@ -7,8 +7,6 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.support.ExcelTypeEnum;
-import com.alibaba.excel.write.handler.CellWriteHandler;
-import com.alibaba.excel.write.handler.context.CellWriteHandlerContext;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.fill.FillConfig;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -18,22 +16,19 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.biutag.supervision.common.UserContextHolder;
 import com.biutag.supervision.constants.AppConstants;
 import com.biutag.supervision.constants.enums.DeleteStatusEnum;
-import com.biutag.supervision.constants.enums.FlowNodeEnum;
 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.recessed.RecessedLog;
-import com.biutag.supervision.pojo.entity.report.ReportFlow;
 import com.biutag.supervision.pojo.entity.report.ReportProject;
-import com.biutag.supervision.pojo.entity.report.ReportReview;
 import com.biutag.supervision.pojo.enums.FlowEnum;
 import com.biutag.supervision.pojo.model.UserAuth;
 import com.biutag.supervision.pojo.param.Recessed.RecessedParam;
-import com.biutag.supervision.pojo.param.Report.ReportDeleteParam;
 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.entryWindow.EntryWindowVo;
 import com.biutag.supervision.pojo.vo.excel.ExcelControlPriceVo;
 import com.biutag.supervision.pojo.vo.report.ReportHomeVo;
@@ -42,24 +37,18 @@ import com.biutag.supervision.pojo.vo.statement.ConditionExcelVo;
 import com.biutag.supervision.pojo.vo.statement.ConditionVo;
 import com.biutag.supervision.service.InformMessageService;
 import com.biutag.supervision.service.Report.ReportProjectService;
-import com.biutag.supervision.service.Report.ReportReviewService;
 import com.biutag.supervision.service.SupDepartService;
 import com.biutag.supervision.util.BigDecimalUtils;
-import com.biutag.supervision.util.CustomFontLoader;
 import jakarta.servlet.ServletOutputStream;
 import jakarta.servlet.http.HttpServletResponse;
-import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.util.IOUtils;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
@@ -67,7 +56,9 @@ import java.math.RoundingMode;
 import java.net.URLEncoder;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * @author weipeng
@@ -151,6 +142,7 @@ public class ReportProjectController {
                 orgIds = departService.getAllNodeIds(user.getDepartId());
                 wrapper.in("p.project_unit_id", orgIds);
             }
+            wrapper.eq("p.delete_flag", DeleteStatusEnum.NO.getCode());
         }
         wrapper.orderByDesc("p.crt_time");
         wrapper.groupBy("p.id");
@@ -188,9 +180,8 @@ public class ReportProjectController {
                         wrapper.ge("p.report_money",new BigDecimal(200000));
                     }
                 }
-
-
                 wrapper.groupBy("p.id");
+                wrapper.eq("p.delete_flag", DeleteStatusEnum.NO.getCode());
         return Result.success(reportProjectService.getConditionPage(new Page<>(queryParam.getCurrent(),queryParam.getSize()),wrapper));
 
     }
@@ -329,14 +320,18 @@ public class ReportProjectController {
     }
 
 
-    @DeleteMapping("/{id}")
+//    @DeleteMapping("/{id}")
-    public Result<Void> delDetail(@PathVariable("id")String id){
+//    public Result<Void> delDetail(@PathVariable("id")String id){
-        ReportDeleteParam reportDeleteParam = new ReportDeleteParam();
+////        ReportDeleteParam reportDeleteParam = new ReportDeleteParam();
-        reportDeleteParam.setId(id);
+////        reportDeleteParam.setId(id);
-        reportDeleteParam.setIsDel(DeleteStatusEnum.YES.getCode());
+////        return reportProjectService.delete(reportDeleteParam);
-        return reportProjectService.delete(reportDeleteParam);
 //        reportProjectService.removeById(id);
 //        return  Result.success();
+//    }
+
+    @PostMapping("/deleteReportProject")
+    public Result<Void> deleteReportProject(@RequestBody ReportProjectDeleteRequest request){
+        return reportProjectService.deleteReportProject(request);
     }
 
 

src/main/java/com/biutag/supervision/controller/warning/WarningController.java

@@ -3,22 +3,18 @@ package com.biutag.supervision.controller.warning;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.biutag.supervision.common.UserContextHolder;
 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.InvertRecord;
 import com.biutag.supervision.pojo.entity.report.ReportFlow;
 import com.biutag.supervision.pojo.entity.report.ReportProject;
-import com.biutag.supervision.pojo.entity.report.ReportReview;
 import com.biutag.supervision.pojo.entity.warning.WarningContent;
 import com.biutag.supervision.pojo.entity.warning.WarningRecord;
-import com.biutag.supervision.pojo.enums.FlowEnum;
 import com.biutag.supervision.pojo.enums.FlowStateEnum;
 import com.biutag.supervision.pojo.enums.FlowWarningEnum;
 import com.biutag.supervision.pojo.model.UserAuth;
@@ -32,14 +28,12 @@ import com.biutag.supervision.service.Report.ReportProjectService;
 import com.biutag.supervision.service.SupDepartService;
 import com.biutag.supervision.service.Warning.WarningContentService;
 import com.biutag.supervision.service.Warning.WarningRecordService;
-import io.lettuce.core.dynamic.annotation.Param;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -66,7 +60,8 @@ public class WarningController {
                 .eq("f.report_link","end")
                 .eq("f.approver_state","end")
                 .eq(StrUtil.isNotBlank(queryParam.getWarningState()),"p.warning_state",queryParam.getWarningState())
-                .eq("p.node",FlowStateEnum.End.getLabel());
+                .eq("p.node",FlowStateEnum.End.getLabel())
+                .eq("p.delete_flag", DeleteStatusEnum.NO.getCode());
                     if (!AppConstants.USER_TYPE_SUPER.equals(user.getUserType()) && !user.getRoleCodes().contains(RoleCodeEnum.FIRST_ADMIN.getCode())) {
                         List<String> orgIds =new ArrayList<>();
                         if(!user.getAuthDepartIds().isEmpty()){

src/main/java/com/biutag/supervision/mapper/Report/ReportProjectMapper.java

@@ -30,4 +30,9 @@ public interface ReportProjectMapper extends BaseMapper<ReportProject> {
     List<ProjectWorkVo> getProjectWorkVoList(ProjectWorkQueryParam queryParam);
 
     ProjectTabWorkVo getProjectTabWorkVo(ProjectWorkQueryParam queryParam);
+
+    /**
+     * 管理员专用：根据 id 查询，包括逻辑删除的数据
+     */
+    ReportProject selectByIdIncludeDeleted(@Param("id") String id);
 }

src/main/java/com/biutag/supervision/pojo/entity/report/ReportProject.java

@@ -2,7 +2,9 @@ package com.biutag.supervision.pojo.entity.report;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.biutag.supervision.constants.AppConstants;
 import com.biutag.supervision.constants.enums.DeleteStatusEnum;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -160,4 +162,16 @@ public class ReportProject {
     private int isRecessed;
 
 
+    /**
+     * @see AppConstants
+     */
+    @Schema(description = "是否逻辑删除：0-未删除，1-已删除")
+    @TableLogic(value = AppConstants.UN_DEL, delval = AppConstants.DEL)
+    @TableField("delete_flag")
+    private Integer deleteFlag;
+
+    @TableField("delete_reason")
+    @Schema(description = "删除原因")
+    private String deleteReason;
+
 }

src/main/java/com/biutag/supervision/pojo/param/Report/ReportDeleteParam.java

@@ -11,13 +11,11 @@ import lombok.Data;
 @Data
 public class ReportDeleteParam {
 
-    //项目id
+    @Schema(description = "项目id")
     private String id;
 
-    /**
+
-     * @see com.biutag.supervision.constants.enums.DeleteStatusEnum
+    @Schema(description = "删除原因")
-     */
+    private String deleteReason;
-    @Schema(description = "是否删除")
-    private int isDel;
 }
 

src/main/java/com/biutag/supervision/pojo/request/reportProject/ReportProjectDeleteRequest.java

@@ -0,0 +1,32 @@
+package com.biutag.supervision.pojo.request.reportProject;
+
+import com.biutag.supervision.aop.ParamChecked;
+import dm.jdbc.util.StringUtil;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @ClassName ProjectDeleteRequest
+ * @Description 项目删除请求
+ * @Author shihao
+ * @Date 2025/12/8 18:48
+ */
+@Setter
+@Getter
+@Schema(description = "项目删除请求")
+public class ReportProjectDeleteRequest implements ParamChecked {
+
+    @Schema(description = "项目id")
+    private String id;
+
+    @Schema(description = "删除原因")
+    private String deleteReason;
+
+    @Override
+    public void check() {
+        if (StringUtil.isEmpty(id)){
+            throw new IllegalArgumentException("删除id不能为空！");
+        }
+    }
+}

src/main/java/com/biutag/supervision/pojo/transfer/ProjectTransfer.java

@@ -0,0 +1,20 @@
+package com.biutag.supervision.pojo.transfer;
+
+import com.biutag.supervision.pojo.param.Report.ReportDeleteParam;
+import com.biutag.supervision.pojo.request.reportProject.ReportProjectDeleteRequest;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * @ClassName ProjectTransfer
+ * @Description ProjectTransfer
+ * @Author shihao
+ * @Date 2025/12/8 18:55
+ */
+@Mapper
+public interface ProjectTransfer {
+
+    ProjectTransfer INSTANCE = Mappers.getMapper(ProjectTransfer.class);
+
+    ReportDeleteParam delRequestToDelParam(ReportProjectDeleteRequest request);
+}

src/main/java/com/biutag/supervision/service/Report/ReportProjectService.java

@@ -4,15 +4,11 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.excel.util.StringUtils;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.biutag.supervision.common.UserContextHolder;
@@ -27,20 +23,18 @@ import com.biutag.supervision.mapper.Report.ReportReviewMapper;
 import com.biutag.supervision.mapper.Warning.WarningContentMapper;
 import com.biutag.supervision.mapper.Warning.WarningRecordMapper;
 import com.biutag.supervision.pojo.Result;
-import com.biutag.supervision.pojo.entity.InformMessage;
-import com.biutag.supervision.pojo.entity.InvertRecord;
 import com.biutag.supervision.pojo.entity.report.ReportFile;
 import com.biutag.supervision.pojo.entity.report.ReportFlow;
 import com.biutag.supervision.pojo.entity.report.ReportProject;
 import com.biutag.supervision.pojo.entity.report.ReportReview;
-import com.biutag.supervision.pojo.entity.warning.WarningContent;
-import com.biutag.supervision.pojo.entity.warning.WarningRecord;
 import com.biutag.supervision.pojo.enums.FlowEnum;
 import com.biutag.supervision.pojo.enums.FlowStateEnum;
 import com.biutag.supervision.pojo.model.UserAuth;
 import com.biutag.supervision.pojo.param.Report.ReportDeleteParam;
 import com.biutag.supervision.pojo.param.Report.ReportProjectQueryParam;
 import com.biutag.supervision.pojo.param.Work.ProjectWorkQueryParam;
+import com.biutag.supervision.pojo.request.reportProject.ReportProjectDeleteRequest;
+import com.biutag.supervision.pojo.transfer.ProjectTransfer;
 import com.biutag.supervision.pojo.vo.FileVo;
 import com.biutag.supervision.pojo.vo.entryWindow.EntryWindowVo;
 import com.biutag.supervision.pojo.vo.report.ReportFileVo;
@@ -135,7 +129,12 @@ public class ReportProjectService extends ServiceImpl<ReportProjectMapper, Repor
     public ReportProjectVo getDetail(String id) {
         ReportProjectVo vo = new ReportProjectVo();
         //项目信息
-        ReportProject project = baseMapper.selectById(id);
+        ReportProject project = null;
+        if (UserContextHolder.isSuperUser()){
+            project = baseMapper.selectByIdIncludeDeleted(id);
+        }else {
+            project = baseMapper.selectById(id);
+        }
         if (ObjectUtil.isNotEmpty(project.getServiceStartTime()) && ObjectUtil.isNotEmpty(project.getServiceEndTime())) {
             List<LocalDateTime> dateTimes = new ArrayList<>();
             dateTimes.add(project.getServiceStartTime());
@@ -169,8 +168,9 @@ public class ReportProjectService extends ServiceImpl<ReportProjectMapper, Repor
             vo.setFiles(reportFileMap);
         }
         //
+        ReportProject finalReport = project;
         List<ReportFlow> flows = reportFlowService.list(new LambdaQueryWrapper<ReportFlow>().eq(ReportFlow::getReportId, id).eq(ReportFlow::getType, "report"));
-        flows = flows.stream().filter(s -> !s.getApproverState().equals(FlowStateEnum.Reject.getLabel()) && isFileFlow(project.getNode()).contains(s.getReportLink()))
+        flows = flows.stream().filter(s -> !s.getApproverState().equals(FlowStateEnum.Reject.getLabel()) && isFileFlow(finalReport.getNode()).contains(s.getReportLink()))
                 .collect(Collectors.toMap(
                         ReportFlow::getReportCode,
                         Function.identity(),
@@ -303,30 +303,43 @@ public class ReportProjectService extends ServiceImpl<ReportProjectMapper, Repor
     }
 
 
+//    @Transactional(rollbackFor = Exception.class)
+//    public Result<Void> delete(ReportDeleteParam reportDeleteParam) {
+//        String id = reportDeleteParam.getId();
+//        if (StringUtils.isBlank(id)) {
+//            return Result.failed("项目id不能为空");
+//        }
+//        this.removeById(id);
+//        deleteByColumn(reviewMapper, ReportReview::getReportId, id);
+//        deleteByColumn(reportFileMapper, ReportFile::getReportId, id);
+//        deleteByColumn(reportFlowMapper, ReportFlow::getReportId, id);
+//        deleteByColumn(informMessageMapper, InformMessage::getReportId, id);
+//        deleteByColumn(warningContentMapper, WarningContent::getWarningId, id);
+//        deleteByColumn(warningRecordMapper, WarningRecord::getReportId, id);
+//        deleteByColumn(invertRecordMapper, InvertRecord::getReportId, id);
+//        return  Result.success();
+//    }
+//
+//
+//    private <T> void deleteByColumn (BaseMapper<T> mapper, SFunction<T, ?> column, String id ){
+//        LambdaQueryWrapper<T> wrapper = Wrappers.<T>lambdaQuery().eq(column, id);
+//        mapper.delete(wrapper);
+//    }
+
     @Transactional(rollbackFor = Exception.class)
-    public Result<Void> delete(ReportDeleteParam reportDeleteParam) {
+    public Result<Void> deleteReportProject(ReportProjectDeleteRequest request) {
-        String id = reportDeleteParam.getId();
+        ReportDeleteParam reportDeleteParam = ProjectTransfer.INSTANCE.delRequestToDelParam(request);
-        if (StringUtils.isBlank(id)) {
+        ReportProject reportProject = this.getById(reportDeleteParam.getId());
-            return Result.failed("项目id不能为空");
+        if (ObjectUtil.isNull(reportProject)){
+            throw  new RuntimeException("项目数据不存在！");
         }
-        this.removeById(id);
+        reportProject.setDeleteReason(reportDeleteParam.getDeleteReason());
-        deleteByColumn(reviewMapper, ReportReview::getReportId, id);
+        this.updateById(reportProject);
-        deleteByColumn(reportFileMapper, ReportFile::getReportId, id);
+        this.removeById(reportProject);
-        deleteByColumn(reportFlowMapper, ReportFlow::getReportId, id);
-        deleteByColumn(informMessageMapper, InformMessage::getReportId, id);
-        deleteByColumn(warningContentMapper, WarningContent::getWarningId, id);
-        deleteByColumn(warningRecordMapper, WarningRecord::getReportId, id);
-        deleteByColumn(invertRecordMapper, InvertRecord::getReportId, id);
         return Result.success();
     }
 
 
-    private <T> void deleteByColumn (BaseMapper<T> mapper, SFunction<T, ?> column, String id ){
-        LambdaQueryWrapper<T> wrapper = Wrappers.<T>lambdaQuery().eq(column, id);
-        mapper.delete(wrapper);
-    }
-
-
 }
 
 

src/main/resources/mapper/ReportProjectMapper.xml

@@ -23,6 +23,10 @@
         LEFT JOIN report_project as p2 on p2.id = w.report_id
         <where>
             flow.is_init is null
+            AND (
+            (w.id IS NULL AND project.delete_flag = 0)
+            OR (w.id IS NOT NULL AND p2.delete_flag = 0)
+            )
             <if test="userId != null and userId != ''">
                 and flow.approver_id = #{userId}
             </if>
@@ -46,7 +50,7 @@
             report_flow flow
         LEFT JOIN report_project as project on project.id = flow.report_id
         <where>
-            flow.is_init is null and project.is_recessed = 0
+            flow.is_init is null and project.is_recessed = 0  AND project.delete_flag = 0
             <if test="userId != null and userId != ''">
               and   flow.approver_id = #{userId}
             </if>
@@ -85,4 +89,9 @@
                 left join report_review rv on p.id = rv.report_id
             ${ew.getCustomSqlSegment}
     </select>
+    <select id="selectByIdIncludeDeleted" resultType="com.biutag.supervision.pojo.entity.report.ReportProject">
+        SELECT *
+        FROM report_project
+        WHERE id = #{id}
+    </select>
 </mapper>