删除-step1 永久删除

src/main/java/com/biutag/supervision/constants/enums/DeleteStatusEnum.java

@@ -0,0 +1,30 @@
+package com.biutag.supervision.constants.enums;
+
+/**
+ * @Auther: sh
+ * @Version 1.0
+ * @Description: 是否删除枚举
+ */
+public enum DeleteStatusEnum {
+
+    YES(1, "是"),
+    NO(0, "否"),
+    ;
+    private final int code;
+    private final String desc;
+
+    DeleteStatusEnum(int code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+}
+

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

@@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 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;
@@ -29,6 +30,7 @@ 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;
@@ -328,9 +330,13 @@ public class ReportProjectController {
 
 
     @DeleteMapping("/{id}")
-    public Result delDetail(@PathVariable("id")String id){
+    public Result<Void> delDetail(@PathVariable("id")String id){
-        reportProjectService.removeById(id);
+        ReportDeleteParam reportDeleteParam = new ReportDeleteParam();
-        return  Result.success();
+        reportDeleteParam.setId(id);
+        reportDeleteParam.setIsDel(DeleteStatusEnum.YES.getCode());
+        return reportProjectService.delete(reportDeleteParam);
+//        reportProjectService.removeById(id);
+//        return  Result.success();
     }
 
 

src/main/java/com/biutag/supervision/pojo/entity/InformMessage.java

@@ -2,11 +2,14 @@ package com.biutag.supervision.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
 
 @Data
+@TableName("inform_message")
 public class InformMessage {
 
     @TableId

src/main/java/com/biutag/supervision/pojo/entity/InvertRecord.java

@@ -3,11 +3,14 @@ package com.biutag.supervision.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
 
 @Data
+@TableName("invert_record")
 public class InvertRecord {
 
     @TableId

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

@@ -2,8 +2,10 @@ package com.biutag.supervision.pojo.entity.report;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.biutag.supervision.pojo.vo.FileVo;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -15,6 +17,7 @@ import java.time.LocalDateTime;
  */ //报审项目附件
 @Getter
 @Setter
+@TableName("report_file")
 public class ReportFile {
     @TableId
     private String id;

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

@@ -2,6 +2,8 @@ package com.biutag.supervision.pojo.entity.report;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
@@ -11,6 +13,7 @@ import java.time.LocalDateTime;
 
 @Getter
 @Setter
+@TableName("report_flow")
 public class ReportFlow {
     @TableId
     private String id;

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

@@ -2,7 +2,10 @@ package com.biutag.supervision.pojo.entity.report;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.biutag.supervision.constants.enums.DeleteStatusEnum;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.cglib.core.Local;
@@ -15,6 +18,7 @@ import java.util.List;
 //报审项目
 @Getter
 @Setter
+@TableName("report_project")
 public class ReportProject {
 
     @TableId

src/main/java/com/biutag/supervision/pojo/entity/report/ReportReview.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.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.cglib.core.Local;
@@ -14,6 +16,7 @@ import java.time.LocalDateTime;
 //报审信息
 @Getter
 @Setter
+@TableName("report_review")
 public class ReportReview {
     @TableId
     private String id;

src/main/java/com/biutag/supervision/pojo/entity/warning/WarningContent.java

@@ -2,9 +2,12 @@ package com.biutag.supervision.pojo.entity.warning;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 @Data
+@TableName("warning_content")
 public class WarningContent {
     @TableId
     private String id;

src/main/java/com/biutag/supervision/pojo/entity/warning/WarningRecord.java

@@ -2,6 +2,7 @@ package com.biutag.supervision.pojo.entity.warning;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.biutag.supervision.pojo.entity.InvertRecord;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -10,6 +11,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 
 @Data
+@TableName("warning_record")
 public class WarningRecord {
     @TableId
     private String id;

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

@@ -0,0 +1,23 @@
+package com.biutag.supervision.pojo.param.Report;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @Auther: sh
+ * @Version 1.0
+ * @Description: 删除参数
+ */
+@Data
+public class ReportDeleteParam {
+
+    //项目id
+    private String id;
+
+    /**
+     * @see com.biutag.supervision.constants.enums.DeleteStatusEnum
+     */
+    @Schema(description = "是否删除")
+    private int isDel;
+}
+

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

@@ -4,63 +4,62 @@ 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.EasyExcel;
+import com.alibaba.excel.util.StringUtils;
-import com.alibaba.excel.ExcelWriter;
-import com.alibaba.excel.write.metadata.WriteSheet;
-import com.alibaba.excel.write.metadata.fill.FillConfig;
-import com.alibaba.excel.write.metadata.fill.FillWrapper;
 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.extension.conditions.query.LambdaQueryChainWrapper;
+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;
 import com.biutag.supervision.constants.AppConstants;
 import com.biutag.supervision.constants.enums.RoleCodeEnum;
+import com.biutag.supervision.mapper.InformMessageMapper;
+import com.biutag.supervision.mapper.Invest.InvertRecordMapper;
 import com.biutag.supervision.mapper.Report.ReportFileMapper;
+import com.biutag.supervision.mapper.Report.ReportFlowMapper;
 import com.biutag.supervision.mapper.Report.ReportProjectMapper;
+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.param.entryWindow.EntryWindowQueryParam;
 import com.biutag.supervision.pojo.vo.FileVo;
 import com.biutag.supervision.pojo.vo.entryWindow.EntryWindowVo;
-import com.biutag.supervision.pojo.vo.excel.ExcelControlPriceVo;
 import com.biutag.supervision.pojo.vo.report.ReportFileVo;
 import com.biutag.supervision.pojo.vo.report.ReportHomeVo;
 import com.biutag.supervision.pojo.vo.report.ReportProjectVo;
 import com.biutag.supervision.pojo.vo.statement.ConditionVo;
 import com.biutag.supervision.pojo.vo.work.ProjectTabWorkVo;
 import com.biutag.supervision.pojo.vo.work.ProjectWorkVo;
-import io.swagger.v3.core.util.Json;
+import jakarta.annotation.Resource;
-import jakarta.servlet.ServletOutputStream;
-import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.poi.util.IOUtils;
-import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
+
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.net.http.HttpResponse;
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -78,6 +77,26 @@ public class ReportProjectService extends ServiceImpl<ReportProjectMapper, Repor
 
     private final ReportFlowService reportFlowService;
 
+    @Resource
+    private ReportReviewMapper reviewMapper;
+
+    @Resource
+    private ReportFileMapper reportFileMapper;
+
+    @Resource
+    private ReportFlowMapper reportFlowMapper;
+
+    @Resource
+    private InformMessageMapper informMessageMapper;
+
+    @Resource
+    private WarningContentMapper warningContentMapper;
+
+    @Resource
+    private WarningRecordMapper warningRecordMapper;
+
+    @Resource
+    private InvertRecordMapper invertRecordMapper;
 
 
     public Page<EntryWindowVo> getPage(Page<ReportProject> page, QueryWrapper<ReportProject> lambdaQueryWrapper) {
@@ -90,14 +109,14 @@ public class ReportProjectService extends ServiceImpl<ReportProjectMapper, Repor
 
     /**
      * 获取数据
-     * */
+     */
     public Page<ConditionVo> getConditionPage(Page<ReportProject> page, QueryWrapper<ReportProject> lambdaQueryWrapper) {
         return baseMapper.queryPageCondition(page, lambdaQueryWrapper);
     }
 
     /**
      * 获取数据详情
-     * */
+     */
     public List<ReportProject> getProjectList(ReportProjectQueryParam queryParam) {
         UserAuth user = UserContextHolder.getCurrentUser();
         LambdaQueryWrapper<ReportProject> queryWrapper = new LambdaQueryWrapper<ReportProject>()
@@ -109,9 +128,10 @@ public class ReportProjectService extends ServiceImpl<ReportProjectMapper, Repor
         }
         return baseMapper.selectList(queryWrapper);
     }
+
     /**
      * 获取报审项目详情
-     * */
+     */
     public ReportProjectVo getDetail(String id) {
         ReportProjectVo vo = new ReportProjectVo();
         //项目信息
@@ -196,7 +216,7 @@ public class ReportProjectService extends ServiceImpl<ReportProjectMapper, Repor
 
     /**
      * 新增或修改
-     * */
+     */
     @Transactional(rollbackFor = Exception.class)
     public ReportProjectVo addOrUpdate(ReportProjectQueryParam queryParam) {
         UserAuth user = UserContextHolder.getCurrentUser();
@@ -251,9 +271,10 @@ public class ReportProjectService extends ServiceImpl<ReportProjectMapper, Repor
         }
         return getDetail(queryParam.getProject().getId());
     }
+
     /**
      * 删除报审项目
-     * */
+     */
     public Boolean delData(ReportProjectQueryParam queryParam) {
         if (CollectionUtil.isNotEmpty(queryParam.getFiles())) {
             for (String key : queryParam.getFiles().keySet()) {
@@ -272,8 +293,6 @@ public class ReportProjectService extends ServiceImpl<ReportProjectMapper, Repor
         return baseMapper.getProjectTabWorkVo(queryParam);
     }
 
-
-
     public boolean upFinalizationPath(ReportProjectQueryParam queryParam) {
 
         return reportReviewService.update(new LambdaUpdateWrapper<ReportReview>()
@@ -283,4 +302,31 @@ 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);
+    }
+
+
 }
+
+