소스 검색

Merge remote-tracking branch 'origin/master'

lwhhszx 1 년 전
부모
커밋
71d3c4d8dd

+ 1 - 1
src/main/java/cn/cslg/pas/common/dto/business/ReportAffairDTO.java

@@ -15,7 +15,7 @@ import java.util.Date;
 @Data
 public class ReportAffairDTO {
     /**
-     * 事务类型(0为口审记录,1为无效请求书,2为陈述意见书,3为无效决定书,4为行政诉讼书)
+     * 事务类型(0为口审记录,1为无效请求书,2为陈述意见书,3为无效决定书,4为行政诉讼书,5为行政诉讼判决书
      */
     private Integer affairType;
 

+ 26 - 0
src/main/java/cn/cslg/pas/common/dto/invalidDTO/AddJudgmentDTO.java

@@ -0,0 +1,26 @@
+package cn.cslg.pas.common.dto.invalidDTO;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 行政诉讼判决书
+ * @Author xiexiang
+ * @Date 2023/12/29
+ */
+@Data
+public class AddJudgmentDTO {
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date judgmentTime;
+
+    private Integer projectId;
+
+    private List<String> fileGuids;
+
+    private String description;
+}

+ 2 - 2
src/main/java/cn/cslg/pas/common/dto/invalidDTO/AddOralTrailDTO.java

@@ -26,7 +26,7 @@ public class AddOralTrailDTO {
 
     private List<String> fileGuids;
 
-    private String description;
+    private String recordDescription;
 
-    private String remark;
+    private String description;
 }

+ 0 - 2
src/main/java/cn/cslg/pas/common/dto/invalidDTO/AddStateOpinionDTO.java

@@ -19,8 +19,6 @@ public class AddStateOpinionDTO {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private Date stateReplyTime;
 
-    private String conclusion;
-
     private List<String> fileGuids;
 
     private String description;

+ 27 - 0
src/main/java/cn/cslg/pas/common/dto/invalidDTO/UpdateJudgmentDTO.java

@@ -0,0 +1,27 @@
+package cn.cslg.pas.common.dto.invalidDTO;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 行政诉讼判决书
+ * @Author xiexiang
+ * @Date 2023/12/29
+ */
+@Data
+public class UpdateJudgmentDTO {
+    private Integer judgmentId;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date judgmentTime;
+
+    private Integer projectId;
+
+    private List<String> fileGuids;
+
+    private String description;
+}

+ 2 - 2
src/main/java/cn/cslg/pas/common/dto/invalidDTO/UpdateOralTrailDTO.java

@@ -27,7 +27,7 @@ public class UpdateOralTrailDTO {
 
     private List<String> fileGuids;
 
-    private String description;
+    private String recordDescription;
 
-    private String remark;
+    private String description;
 }

+ 0 - 2
src/main/java/cn/cslg/pas/common/dto/invalidDTO/UpdateStateOpinionDTO.java

@@ -20,8 +20,6 @@ public class UpdateStateOpinionDTO {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private Date stateReplyTime;
 
-    private String conclusion;
-
     private List<String> fileGuids;
 
     private String description;

+ 28 - 0
src/main/java/cn/cslg/pas/common/vo/invalidVO/JudgementVO.java

@@ -0,0 +1,28 @@
+package cn.cslg.pas.common.vo.invalidVO;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 查询行政诉讼判决书VO
+ *
+ * @Author xiexiang
+ * @Date 2023/12/29
+ */
+@Data
+public class JudgementVO {
+    private Integer judgmentId;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date judgmentTime;
+
+    private Integer projectId;
+
+    private List<String> fileGuids;
+
+    private String description;
+}

+ 5 - 0
src/main/java/cn/cslg/pas/common/vo/invalidVO/ReportAffairVO.java

@@ -79,4 +79,9 @@ public class ReportAffairVO {
      * 陈述意见书返回VO
      */
     private StateOpinionVO stateOpinionVO;
+
+    /**
+     * 行政诉讼判决书返回VO
+     */
+    private JudgementVO judgementVO;
 }

+ 18 - 0
src/main/java/cn/cslg/pas/controller/ReportAffairController.java

@@ -146,4 +146,22 @@ public class ReportAffairController {
         records.setData(id);
         return Response.success(records);
     }
+
+    @Operation(summary = "上传行政诉讼判决书")
+    @PostMapping("/addAdminProceedJudgment")
+    public Response addAdminProceedJudgment(@RequestBody AddJudgmentDTO addJudgmentDTO) throws Exception {
+        Integer id = adminProceedService.addJudgment(addJudgmentDTO);
+        Records records = new Records();
+        records.setData(id);
+        return Response.success(records);
+    }
+
+    @Operation(summary = "修改行政诉讼判决书")
+    @PostMapping("/updateAdminProceedJudgment")
+    public Response updateAdminProceedJudgment(@RequestBody UpdateJudgmentDTO updateJudgmentDTO) throws Exception {
+        Integer id = adminProceedService.updateJudgment(updateJudgmentDTO);
+        Records records = new Records();
+        records.setData(id);
+        return Response.success(records);
+    }
 }

+ 94 - 5
src/main/java/cn/cslg/pas/service/business/AdminProceedService.java

@@ -2,8 +2,11 @@ package cn.cslg.pas.service.business;
 
 import cn.cslg.pas.common.dto.business.ReportAffairDTO;
 import cn.cslg.pas.common.dto.invalidDTO.AddAdminProceedDTO;
+import cn.cslg.pas.common.dto.invalidDTO.AddJudgmentDTO;
 import cn.cslg.pas.common.dto.invalidDTO.UpdateAdminProceedDTO;
+import cn.cslg.pas.common.dto.invalidDTO.UpdateJudgmentDTO;
 import cn.cslg.pas.common.vo.invalidVO.AdminProceedVO;
+import cn.cslg.pas.common.vo.invalidVO.JudgementVO;
 import cn.cslg.pas.common.vo.invalidVO.OralTrailVO;
 import cn.cslg.pas.domain.business.AdminProceed;
 import cn.cslg.pas.domain.business.AssoReportAffairFile;
@@ -34,6 +37,11 @@ public class AdminProceedService extends ServiceImpl<AdminProceedMapper, AdminPr
     @Autowired
     private AssoReportAffairFileService assoReportAffairFileService;
 
+    /**
+     * 上传行政诉讼判决书
+     * @param addDto
+     * @return
+     */
     public Integer add(AddAdminProceedDTO addDto){
         if (addDto == null) {
             throw new XiaoShiException("入参为空");
@@ -76,6 +84,11 @@ public class AdminProceedService extends ServiceImpl<AdminProceedMapper, AdminPr
         return reportAffairId;
     }
 
+    /**
+     * 查询
+     * @param reportAffairId
+     * @return
+     */
     public AdminProceedVO getAdminProceed(Integer reportAffairId) {
         LambdaQueryWrapper<AdminProceed> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(AdminProceed::getReportAffairId, reportAffairId);
@@ -91,7 +104,7 @@ public class AdminProceedService extends ServiceImpl<AdminProceedMapper, AdminPr
     }
 
     /**
-     * 更新行政记录
+     * 更新行政诉讼书
      * @param updateDTO
      * @return
      */
@@ -125,11 +138,40 @@ public class AdminProceedService extends ServiceImpl<AdminProceedMapper, AdminPr
         reportAffair.updateById();
         //3. 更新报告事务与文件关联
         List<String> fileGuids = updateDTO.getFileGuids();
-        if (fileGuids != null && !fileGuids.isEmpty()) {
-            LambdaQueryWrapper<AssoReportAffairFile> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(AssoReportAffairFile::getReportAffairId, reportAffairId);
-            assoReportAffairFileService.remove(queryWrapper);
+        assoReportAffairFileService.updateAffairFile(reportAffairId, fileGuids);
+        return reportAffairId;
+    }
 
+    /**
+     * 上传行政诉讼判决书
+     * @param addJudgmentDTO
+     * @return
+     */
+    public Integer addJudgment(AddJudgmentDTO addJudgmentDTO){
+        if (addJudgmentDTO == null) {
+            throw new XiaoShiException("入参为空");
+        }
+        Integer projectId = addJudgmentDTO.getProjectId();
+        if (projectId == null) {
+            throw new XiaoShiException("报告id为空");
+        }
+        //1. 首先上传报告事务,拿到报告事务id
+        ReportAffairDTO reportAffairDTO = new ReportAffairDTO();
+        reportAffairDTO.setProjectId(projectId);
+        //行政诉讼判决书 5
+        reportAffairDTO.setAffairType(5);
+        //发生时间是口审时间
+        reportAffairDTO.setOccurredTime(addJudgmentDTO.getJudgmentTime());
+        //备注
+        reportAffairDTO.setDescription(addJudgmentDTO.getDescription());
+        Integer reportAffairId = reportAffairService.addReportAffair(reportAffairDTO);
+
+        if (reportAffairId == null) {
+            throw new XiaoShiException("上传报告事务失败");
+        }
+        //3. 添加报告事务与文件关联
+        List<String> fileGuids = addJudgmentDTO.getFileGuids();
+        if (fileGuids != null && !fileGuids.isEmpty()) {
             List<AssoReportAffairFile> assoReportAffairFiles = new ArrayList<>();
             fileGuids.forEach(item -> {
                 AssoReportAffairFile assoReportAffairFile = new AssoReportAffairFile();
@@ -142,4 +184,51 @@ public class AdminProceedService extends ServiceImpl<AdminProceedMapper, AdminPr
         return reportAffairId;
     }
 
+    /**
+     * 更新行政诉讼判决书
+     * @param updateJudgmentDTO
+     * @return
+     */
+    public Integer updateJudgment(UpdateJudgmentDTO updateJudgmentDTO){
+        if (updateJudgmentDTO == null) {
+            throw new XiaoShiException("入参为空");
+        }
+        Integer projectId = updateJudgmentDTO.getProjectId();
+        Integer reportAffairId = updateJudgmentDTO.getJudgmentId();
+        if (reportAffairId == null) {
+            throw new XiaoShiException("id为空");
+        }
+        if (projectId == null) {
+            throw new XiaoShiException("报告id为空");
+        }
+        //2. 拿到报告事务id,获取报告事务
+        ReportAffair reportAffair = reportAffairService.getById(reportAffairId);
+        reportAffair.setProjectId(projectId);
+        //发生时间是无效请求日
+        reportAffair.setOccurredTime(updateJudgmentDTO.getJudgmentTime());
+        //备注
+        reportAffair.setDescription(updateJudgmentDTO.getDescription());
+        reportAffair.updateById();
+        //3. 更新报告事务与文件关联
+        List<String> fileGuids = updateJudgmentDTO.getFileGuids();
+        assoReportAffairFileService.updateAffairFile(reportAffairId, fileGuids);
+        return reportAffairId;
+    }
+
+    /**
+     * 查询行政诉讼判决书
+     * @param reportAffairId
+     * @return
+     */
+    public JudgementVO getJudgment(Integer reportAffairId) {
+        ReportAffair reportAffair = reportAffairService.getById(reportAffairId);
+        JudgementVO judgementVO = new JudgementVO();
+        if (reportAffair != null) {
+            BeanUtils.copyProperties(reportAffair, judgementVO);
+            judgementVO.setJudgmentId(reportAffair.getId());
+            judgementVO.setJudgmentTime(reportAffair.getOccurredTime());
+        }
+        return judgementVO;
+    }
+
 }

+ 20 - 0
src/main/java/cn/cslg/pas/service/business/AssoReportAffairFileService.java

@@ -2,10 +2,14 @@ package cn.cslg.pas.service.business;
 
 import cn.cslg.pas.domain.business.AssoReportAffairFile;
 import cn.cslg.pas.mapper.AssoReportAffairFileMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @Author xiexiang
  * @Date 2023/12/23
@@ -13,4 +17,20 @@ import org.springframework.stereotype.Service;
 @Service
 @Slf4j
 public class AssoReportAffairFileService extends ServiceImpl<AssoReportAffairFileMapper, AssoReportAffairFile> {
+
+    public void updateAffairFile(Integer reportAffairId, List<String> fileGuids){
+        LambdaQueryWrapper<AssoReportAffairFile> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AssoReportAffairFile::getReportAffairId, reportAffairId);
+        this.remove(queryWrapper);
+        if (fileGuids != null && !fileGuids.isEmpty()) {
+            List<AssoReportAffairFile> assoReportAffairFiles = new ArrayList<>();
+            fileGuids.forEach(item -> {
+                AssoReportAffairFile assoReportAffairFile = new AssoReportAffairFile();
+                assoReportAffairFile.setReportAffairId(reportAffairId);
+                assoReportAffairFile.setFileGuid(item);
+                assoReportAffairFiles.add(assoReportAffairFile);
+            });
+            this.saveBatch(assoReportAffairFiles);
+        }
+    }
 }

+ 8 - 4
src/main/java/cn/cslg/pas/service/business/InvalidDecisionFileService.java

@@ -79,6 +79,11 @@ public class InvalidDecisionFileService extends ServiceImpl<InvalidDecisionFileM
         return reportAffairId;
     }
 
+    /**
+     * 修改无效决定书
+     * @param updateInvalidDecisionFileDTO
+     * @return
+     */
     public Integer update(UpdateInvalidDecisionFileDTO updateInvalidDecisionFileDTO){
         if (updateInvalidDecisionFileDTO == null) {
             throw new XiaoShiException("入参为空");
@@ -108,12 +113,11 @@ public class InvalidDecisionFileService extends ServiceImpl<InvalidDecisionFileM
         reportAffair.setDescription(updateInvalidDecisionFileDTO.getDescription());
         reportAffair.updateById();
         //3. 更新报告事务与文件关联
+        LambdaQueryWrapper<AssoReportAffairFile> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AssoReportAffairFile::getReportAffairId, reportAffairId);
+        assoReportAffairFileService.remove(queryWrapper);
         List<String> fileGuids = updateInvalidDecisionFileDTO.getFileGuids();
         if (fileGuids != null && !fileGuids.isEmpty()) {
-            LambdaQueryWrapper<AssoReportAffairFile> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(AssoReportAffairFile::getReportAffairId, reportAffairId);
-            assoReportAffairFileService.remove(queryWrapper);
-
             List<AssoReportAffairFile> assoReportAffairFiles = new ArrayList<>();
             fileGuids.forEach(item -> {
                 AssoReportAffairFile assoReportAffairFile = new AssoReportAffairFile();

+ 1 - 14
src/main/java/cn/cslg/pas/service/business/InvalidRequestFileService.java

@@ -129,20 +129,7 @@ public class InvalidRequestFileService extends ServiceImpl<InvalidRequestFileMap
         reportAffair.updateById();
         //3. 更新报告事务与文件关联
         List<String> fileGuids = updateInvalidRequestFileDTO.getFileGuids();
-        if (fileGuids != null && !fileGuids.isEmpty()) {
-            LambdaQueryWrapper<AssoReportAffairFile> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(AssoReportAffairFile::getReportAffairId, reportAffairId);
-            assoReportAffairFileService.remove(queryWrapper);
-
-            List<AssoReportAffairFile> assoReportAffairFiles = new ArrayList<>();
-            fileGuids.forEach(item -> {
-                AssoReportAffairFile assoReportAffairFile = new AssoReportAffairFile();
-                assoReportAffairFile.setReportAffairId(reportAffairId);
-                assoReportAffairFile.setFileGuid(item);
-                assoReportAffairFiles.add(assoReportAffairFile);
-            });
-            assoReportAffairFileService.saveBatch(assoReportAffairFiles);
-        }
+        assoReportAffairFileService.updateAffairFile(reportAffairId, fileGuids);
         return reportAffairId;
     }
 }

+ 5 - 17
src/main/java/cn/cslg/pas/service/business/OralTrailService.java

@@ -53,7 +53,7 @@ public class OralTrailService extends ServiceImpl<OralTrailMapper, OralTrail> {
         //发生时间是口审时间
         reportAffairDTO.setOccurredTime(addOralTrailDTO.getOralTrailTime());
         //备注
-        reportAffairDTO.setDescription(addOralTrailDTO.getRemark());
+        reportAffairDTO.setDescription(addOralTrailDTO.getDescription());
         Integer reportAffairId = reportAffairService.addReportAffair(reportAffairDTO);
 
         if (reportAffairId == null) {
@@ -63,7 +63,7 @@ public class OralTrailService extends ServiceImpl<OralTrailMapper, OralTrail> {
         OralTrail oralTrail = new OralTrail();
         oralTrail.setParticipator(addOralTrailDTO.getParticipator());
         oralTrail.setPosition(addOralTrailDTO.getPosition());
-        oralTrail.setDescription(addOralTrailDTO.getDescription());
+        oralTrail.setDescription(addOralTrailDTO.getRecordDescription());
         oralTrail.setReportAffairId(reportAffairId);
         oralTrail.insert();
         //3. 添加报告事务与文件关联
@@ -118,6 +118,7 @@ public class OralTrailService extends ServiceImpl<OralTrailMapper, OralTrail> {
             throw new XiaoShiException("oralTrail查询错误");
         }
         BeanUtils.copyProperties(updateOralTrailDTO, oralTrail);
+        oralTrail.setDescription(updateOralTrailDTO.getRecordDescription());
         oralTrail.updateById();
         Integer reportAffairId = oralTrail.getReportAffairId();
         //2. 拿到报告事务id,获取报告事务
@@ -126,24 +127,11 @@ public class OralTrailService extends ServiceImpl<OralTrailMapper, OralTrail> {
         //发生时间是无效请求日
         reportAffair.setOccurredTime(updateOralTrailDTO.getOralTrailTime());
         //备注
-        reportAffair.setDescription(updateOralTrailDTO.getRemark());
+        reportAffair.setDescription(updateOralTrailDTO.getDescription());
         reportAffair.updateById();
         //3. 更新报告事务与文件关联
         List<String> fileGuids = updateOralTrailDTO.getFileGuids();
-        if (fileGuids != null && !fileGuids.isEmpty()) {
-            LambdaQueryWrapper<AssoReportAffairFile> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(AssoReportAffairFile::getReportAffairId, reportAffairId);
-            assoReportAffairFileService.remove(queryWrapper);
-
-            List<AssoReportAffairFile> assoReportAffairFiles = new ArrayList<>();
-            fileGuids.forEach(item -> {
-                AssoReportAffairFile assoReportAffairFile = new AssoReportAffairFile();
-                assoReportAffairFile.setReportAffairId(reportAffairId);
-                assoReportAffairFile.setFileGuid(item);
-                assoReportAffairFiles.add(assoReportAffairFile);
-            });
-            assoReportAffairFileService.saveBatch(assoReportAffairFiles);
-        }
+        assoReportAffairFileService.updateAffairFile(reportAffairId, fileGuids);
         return reportAffairId;
     }
 }

+ 30 - 18
src/main/java/cn/cslg/pas/service/business/ReportAffairService.java

@@ -11,9 +11,7 @@ import cn.cslg.pas.common.model.cronModel.SystemFile;
 import cn.cslg.pas.common.utils.CacheUtils;
 import cn.cslg.pas.common.utils.LoginUtils;
 import cn.cslg.pas.common.vo.invalidVO.*;
-import cn.cslg.pas.domain.business.AssoReportAffairFile;
-import cn.cslg.pas.domain.business.InvalidRequestFile;
-import cn.cslg.pas.domain.business.ReportAffair;
+import cn.cslg.pas.domain.business.*;
 import cn.cslg.pas.exception.XiaoShiException;
 import cn.cslg.pas.mapper.ReportAffairMapper;
 import cn.cslg.pas.service.common.FileManagerService;
@@ -83,19 +81,33 @@ public class ReportAffairService extends ServiceImpl<ReportAffairMapper, ReportA
         }
     }
 
+    /**
+     * 删除报告事务
+     * @param ids
+     */
     public void delete(List<Integer> ids) {
         for (Integer id : ids) {
             LambdaQueryWrapper<ReportAffair> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(ReportAffair::getId, id);
             ReportAffair reportAffair = this.getOne(queryWrapper, false);
             if (reportAffair != null) {
+                //删除事务关联的文件
                 LambdaQueryWrapper<AssoReportAffairFile> queryWrapper2 = new LambdaQueryWrapper<>();
                 queryWrapper2.eq(AssoReportAffairFile::getReportAffairId, id);
                 assoReportAffairFileService.remove(queryWrapper2);
-                if (reportAffair.getAffairType() == 1) {
+                // 根据类型删除对应信息
+                if (reportAffair.getAffairType() == 1) { //无效请求书
                     LambdaQueryWrapper<InvalidRequestFile> queryWrapper1 = new LambdaQueryWrapper<>();
                     queryWrapper1.eq(InvalidRequestFile::getReportAffairId, id);
                     invalidRequestFileService.remove(queryWrapper1);
+                } else if (reportAffair.getAffairType() == 0) {//口审查记录
+                    LambdaQueryWrapper<OralTrail> queryWrapper1 = new LambdaQueryWrapper<>();
+                    queryWrapper1.eq(OralTrail::getReportAffairId, id);
+                    oralTrailService.remove(queryWrapper1);
+                } else if (reportAffair.getAffairType() == 3) {//无效决定书
+                    LambdaQueryWrapper<InvalidDecisionFile> queryWrapper1 = new LambdaQueryWrapper<>();
+                    queryWrapper1.eq(InvalidDecisionFile::getReportAffairId, id);
+                    invalidDecisionFileService.remove(queryWrapper1);
                 }
                 this.removeById(id);
             }
@@ -143,6 +155,8 @@ public class ReportAffairService extends ServiceImpl<ReportAffairMapper, ReportA
                 this.loadInvalidDecisionFile(reportAffairVO);
             } else if (type == 4) {//4 行政诉讼书
                 this.loadAdminProceed(reportAffairVO);
+            } else if (type == 5) {//5 行政诉讼判决书
+                this.loadJudgment(reportAffairVO);
             }
             reportAffairVOS.add(reportAffairVO);
         });
@@ -327,20 +341,7 @@ public class ReportAffairService extends ServiceImpl<ReportAffairMapper, ReportA
         reportAffair.updateById();
         //3. 更新报告事务与文件关联
         List<String> fileGuids = updateStateOpinionDTO.getFileGuids();
-        if (fileGuids != null && !fileGuids.isEmpty()) {
-            LambdaQueryWrapper<AssoReportAffairFile> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(AssoReportAffairFile::getReportAffairId, reportAffairId);
-            assoReportAffairFileService.remove(queryWrapper);
-
-            List<AssoReportAffairFile> assoReportAffairFiles = new ArrayList<>();
-            fileGuids.forEach(item -> {
-                AssoReportAffairFile assoReportAffairFile = new AssoReportAffairFile();
-                assoReportAffairFile.setReportAffairId(reportAffairId);
-                assoReportAffairFile.setFileGuid(item);
-                assoReportAffairFiles.add(assoReportAffairFile);
-            });
-            assoReportAffairFileService.saveBatch(assoReportAffairFiles);
-        }
+        assoReportAffairFileService.updateAffairFile(reportAffairId, fileGuids);
         return reportAffairId;
     }
 
@@ -359,4 +360,15 @@ public class ReportAffairService extends ServiceImpl<ReportAffairMapper, ReportA
         stateOpinionVO.setProjectId(reportAffair.getProjectId());
         reportAffairVO.setStateOpinionVO(stateOpinionVO);
     }
+
+    /**
+     * 装载行政诉讼判决书
+     *
+     * @param reportAffairVO
+     */
+    public void loadJudgment(ReportAffairVO reportAffairVO) {
+        Integer reportAffairId = reportAffairVO.getId();
+        JudgementVO judgementVO = adminProceedService.getJudgment(reportAffairId);
+        reportAffairVO.setJudgementVO(judgementVO);
+    }
 }