Przeglądaj źródła

报告删除功能

沈永艺 2 lat temu
rodzic
commit
8fbc3a872e

+ 6 - 6
RMS/src/main/java/cn/cslg/report/controller/AssoTaskPersonelController.java

@@ -24,12 +24,12 @@ public class AssoTaskPersonelController {
     /*
     根据报告表中的id删除任务人员关联表的数据
      */
-    @RequestMapping(value = "/deleAssoTaskPersonel", method = RequestMethod.GET)
-    @Operation(summary = "删除人员关系")
-    public String deleAssoTaskPersonel(Integer id)throws IOException{
-
-        return assoTaskPersonelService.deleAssoTaskPersonel(id);
-    }
+//    @RequestMapping(value = "/deleAssoTaskPersonel", method = RequestMethod.GET)
+//    @Operation(summary = "删除人员关系")
+//    public String deleAssoTaskPersonel(Integer id)throws IOException{
+//
+//        return assoTaskPersonelService.deleAssoTaskPersonel(id);
+//    }
 
 
 }

+ 3 - 1
RMS/src/main/java/cn/cslg/report/controller/ReportController.java

@@ -5,6 +5,7 @@ import cn.cslg.report.common.model.vo.ReportVO;
 import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.common.utils.StringUtils;
 import cn.cslg.report.entity.Report;
+import cn.cslg.report.service.business.AssoTaskPersonelService;
 import cn.cslg.report.service.business.CompareFilesService;
 import cn.cslg.report.service.business.ReportService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -24,7 +25,7 @@ import java.io.IOException;
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class ReportController {
     private final ReportService reportService;
-
+   private final AssoTaskPersonelService assoTaskPersonelService;
 
     /**
      * @param report 报告类
@@ -79,6 +80,7 @@ public class ReportController {
     @RequestMapping(value = "/deleReport", method = RequestMethod.GET)
     @Operation(summary = "删除报告")
     public String deleReport(Integer id)throws IOException {
+        assoTaskPersonelService.deleAssoTaskPersonel(id);
         return reportService.reportDele(id);
     }
 

+ 2 - 0
RMS/src/main/java/cn/cslg/report/mapper/ReportMapper.java

@@ -3,7 +3,9 @@ package cn.cslg.report.mapper;
 import cn.cslg.report.entity.Report;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface ReportMapper extends BaseMapper<Report> {
+    int dele(@Param("id") Integer id);
 }

+ 13 - 2
RMS/src/main/java/cn/cslg/report/service/business/ReportService.java

@@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import lombok.val;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -34,6 +35,7 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class ReportService extends ServiceImpl<ReportMapper, Report> {
     private final OutInterfaceService outInterfaceService;
+    private final ReportMapper reportMapper;
 
     /**
      * @param report 报告类
@@ -119,9 +121,18 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
 
         return reports;
     }
+//    public String reportDele(int id) throws IOException{
+//        this.removeById(id);
+//        return Response.success();
+//    }
     public String reportDele(int id) throws IOException{
-        this.removeById(id);
-        return Response.success();
+       int  dele  = reportMapper.dele(id);
+        if(dele>0){
+            return Response.success();
+        }
+        return   Response.error("没有数据");
+
     }
 
+
 }

+ 8 - 0
RMS/src/main/resources/mapper/Report.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="cn.cslg.report.mapper.ReportMapper">
+  <delete id="dele">
+    delete from REPORT where ID=#{id}
+  </delete>
+
+</mapper>