11/1

src/main/java/cn/cslg/pas/common/dto/invalidDTO/AddProofGroupDTO.java

@@ -0,0 +1,42 @@
+package cn.cslg.pas.common.dto.invalidDTO;
+
+import cn.cslg.pas.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 证据组合
+ * @Author xiexiang
+ * @Date 2023/12/25
+ */
+@Data
+public class AddProofGroupDTO {
+    /**
+     * id
+     */
+    private Integer id;
+
+    /**
+     * 报告id
+     */
+    private Integer projectId;
+
+    /**
+     * 法条id
+     */
+    private Integer statutesId;
+
+    /**
+     * 权利要求id
+     */
+    private Integer claimId;
+
+    /**
+     * 证据组合说明
+     */
+    private List<String> descriptions;
+
+}

src/main/java/cn/cslg/pas/common/dto/invalidDTO/GetInvalidStatutesDTO.java

@@ -0,0 +1,12 @@
+package cn.cslg.pas.common.dto.invalidDTO;
+
+import lombok.Data;
+
+/**
+ * @Author xiexiang
+ * @Date 2023/12/25
+ */
+@Data
+public class GetInvalidStatutesDTO {
+    private Integer projectId;
+}

src/main/java/cn/cslg/pas/common/dto/invalidDTO/GetProofGroupDTO.java

@@ -0,0 +1,12 @@
+package cn.cslg.pas.common.dto.invalidDTO;
+
+import lombok.Data;
+
+/**
+ * @Author xiexiang
+ * @Date 2023/12/25
+ */
+@Data
+public class GetProofGroupDTO {
+    private Integer invalidStatutesId;
+}

src/main/java/cn/cslg/pas/common/dto/invalidDTO/UpdateInvalidRequestFileDTO.java

@@ -13,6 +13,8 @@ import java.util.List;
  */
 @Data
 public class UpdateInvalidRequestFileDTO {
+    private Integer id;
+
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private Date invalidRequestDate;

src/main/java/cn/cslg/pas/common/vo/invalidVO/InvalidStatutesVO.java

@@ -0,0 +1,45 @@
+package cn.cslg.pas.common.vo.invalidVO;
+
+import cn.cslg.pas.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 无效法条
+ * @Author xiexiang
+ * @Date 2023/12/22
+ */
+@Data
+public class InvalidStatutesVO {
+    private Integer id;
+    /**
+     * 法条id
+     */
+    private Integer statutesId;
+
+    /**
+     * 报告id
+     */
+    private Integer projectId;
+
+    /**
+     * 法条
+     */
+    private String statutes;
+
+    /**
+     * 涉及内容 0 说明书 1 权利要求
+     */
+    private Integer relatedContent;
+
+    /**
+     * 权利要求id
+     */
+    private Integer claimId;
+
+    private Integer claimSort;
+
+    private String claimText;
+
+}

src/main/java/cn/cslg/pas/common/vo/invalidVO/ProofGroupVO.java

@@ -0,0 +1,43 @@
+package cn.cslg.pas.common.vo.invalidVO;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 证据组合
+ * @Author xiexiang
+ * @Date 2023/12/25
+ */
+@Data
+public class ProofGroupVO {
+    /**
+     * id
+     */
+    private Integer id;
+
+    /**
+     * 报告id
+     */
+    private Integer projectId;
+
+    /**
+     * 无效法条id
+     */
+    private Integer invalidStatutesId;
+
+    /**
+     * 法条id
+     */
+    private Integer statutesId;
+
+    /**
+     * 权利要求id
+     */
+    private Integer claimId;
+
+    /**
+     * 证据组合说明
+     */
+    private String description;
+}

src/main/java/cn/cslg/pas/controller/InvalidStatutesController.java

@@ -2,8 +2,10 @@ package cn.cslg.pas.controller;
 
 import cn.cslg.pas.common.core.base.Constants;
 import cn.cslg.pas.common.dto.business.InvalidStatutesDTO;
+import cn.cslg.pas.common.dto.invalidDTO.GetInvalidStatutesDTO;
 import cn.cslg.pas.common.model.cronModel.Records;
 import cn.cslg.pas.common.utils.Response;
+import cn.cslg.pas.common.vo.invalidVO.InvalidStatutesVO;
 import cn.cslg.pas.service.business.InvalidStatutesService;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.extern.slf4j.Slf4j;
@@ -35,4 +37,15 @@ public class InvalidStatutesController {
         records.setData(ids);
         return Response.success(records);
     }
+
+    @Operation(summary = "查询无效法条")
+    @PostMapping("/queryInvalidStatutes")
+    public Response queryInvalidStatutes(@RequestBody GetInvalidStatutesDTO getInvalidStatutesDTO){
+        Integer projectId = getInvalidStatutesDTO.getProjectId();
+        List<InvalidStatutesVO> ids = invalidStatutesService.queryInvalidStatutes(projectId);
+        Records records = new Records();
+        records.setData(ids);
+        return Response.success(records);
+    }
+
 }

src/main/java/cn/cslg/pas/controller/ProofGroupController.java

@@ -0,0 +1,54 @@
+package cn.cslg.pas.controller;
+
+import cn.cslg.pas.common.core.base.Constants;
+import cn.cslg.pas.common.dto.business.InvalidStatutesDTO;
+import cn.cslg.pas.common.dto.invalidDTO.AddProofGroupDTO;
+import cn.cslg.pas.common.dto.invalidDTO.GetProofGroupDTO;
+import cn.cslg.pas.common.model.cronModel.Records;
+import cn.cslg.pas.common.utils.Response;
+import cn.cslg.pas.common.vo.invalidVO.InvalidStatutesVO;
+import cn.cslg.pas.common.vo.invalidVO.ProofGroupVO;
+import cn.cslg.pas.service.business.InvalidStatutesService;
+import cn.cslg.pas.service.business.ProofGroupService;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 证据组合的Controller层
+ * @Author xiexiang
+ * @Date 2023/12/22
+ */
+@Slf4j
+@RequestMapping(Constants.API_XiaoSHI + "/proofGroup")
+@RestController
+public class ProofGroupController {
+    @Autowired
+    private ProofGroupService proofGroupService;
+
+    @Operation(summary = "添加证据组合")
+    @PostMapping("/addProofGroup")
+    public Response addProofGroup(@RequestBody AddProofGroupDTO addProofGroupDTO){
+        List<Integer> ids = proofGroupService.addProofGroup(addProofGroupDTO);
+        Records records = new Records();
+        records.setData(ids);
+        return Response.success(records);
+    }
+
+    @Operation(summary = "查询证据组合")
+    @PostMapping("/queryProofGroup")
+    public Response queryProofGroup(@RequestBody GetProofGroupDTO getProofGroupDTO){
+        Integer invalidStatutesId = getProofGroupDTO.getInvalidStatutesId();
+        List<ProofGroupVO> proofGroupVOS = proofGroupService.queryProofGroup(invalidStatutesId);
+        Records records = new Records();
+        records.setData(proofGroupVOS);
+        return Response.success(records);
+    }
+
+}

src/main/java/cn/cslg/pas/domain/business/ProofGroup.java

@@ -0,0 +1,65 @@
+package cn.cslg.pas.domain.business;
+
+import cn.cslg.pas.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 证据组合
+ * @Author xiexiang
+ * @Date 2023/12/25
+ */
+@Data
+@TableName("proof_group")
+public class ProofGroup extends BaseEntity<ProofGroup> {
+    /**
+     * 无效法条id
+     */
+    @TableField(value = "invalid_statutes_id")
+    private Integer invalidStatutesId;
+
+    /**
+     * 证据组合说明
+     */
+    @TableField(value = "description")
+    private String description;
+
+    /**
+     * 无效理由详情
+     */
+    @TableField(value = "invalid_reason_detail")
+    private String invalidReasonDetail;
+
+    /**
+     * 无效理由概述
+     */
+    @TableField(value = "common")
+    private String common;
+
+    /**
+     * 陈述意见
+     */
+    @TableField(value = "present_opinions1")
+    private String presentOpinions1;
+
+    /**
+     * 第二次陈述意见
+     */
+    @TableField(value = "present_opinions2")
+    private String presentOpinions2;
+
+    /**
+     * 复审委决定
+     */
+    @TableField(value = "rb_decision")
+    private String rbDecision;
+
+    /**
+     * 复审委意见要点提炼
+     */
+    @TableField(value = "rb_decision_key")
+    private String rbDecisionKey;
+
+
+}

src/main/java/cn/cslg/pas/mapper/ProofGroupMapper.java

@@ -0,0 +1,14 @@
+package cn.cslg.pas.mapper;
+
+import cn.cslg.pas.domain.business.ProofGroup;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 无效证据Mapper层
+ * @Author xiexiang
+ * @Date 2023/12/25
+ */
+@Repository
+public interface ProofGroupMapper extends BaseMapper<ProofGroup> {
+}

src/main/java/cn/cslg/pas/service/business/InvalidRequestFileService.java

@@ -6,6 +6,7 @@ import cn.cslg.pas.common.dto.invalidDTO.UpdateInvalidRequestFileDTO;
 import cn.cslg.pas.common.vo.invalidVO.InvalidRequestFileVO;
 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.exception.XiaoShiException;
 import cn.cslg.pas.mapper.InvalidRequestFileMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -18,6 +19,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 无效请求书的Service层
@@ -91,7 +93,55 @@ public class InvalidRequestFileService extends ServiceImpl<InvalidRequestFileMap
         return invalidRequestFileVO;
     }
 
+    /**
+     * 更新无效请求书
+     * @param updateInvalidRequestFileDTO
+     * @return
+     */
     public Integer update(UpdateInvalidRequestFileDTO updateInvalidRequestFileDTO){
-        return null;
+        if (updateInvalidRequestFileDTO == null) {
+            throw new XiaoShiException("入参为空");
+        }
+        Integer projectId = updateInvalidRequestFileDTO.getProjectId();
+        Integer id = updateInvalidRequestFileDTO.getId();
+        if (id == null) {
+            throw new XiaoShiException("id为空");
+        }
+        if (projectId == null) {
+            throw new XiaoShiException("报告id为空");
+        }
+        //1. 根据id查出无效请求书
+        InvalidRequestFile invalidRequestFile = this.getById(id);
+        if (invalidRequestFile == null) {
+            throw new XiaoShiException("invalidRequestFile查询错误");
+        }
+        BeanUtils.copyProperties(updateInvalidRequestFileDTO, invalidRequestFile);
+        invalidRequestFile.updateById();
+        Integer reportAffairId = invalidRequestFile.getReportAffairId();
+        //2. 拿到报告事务id，获取报告事务
+        ReportAffair reportAffair = reportAffairService.getById(reportAffairId);
+        reportAffair.setProjectId(projectId);
+        //发生时间是无效请求日
+        reportAffair.setOccurredTime(updateInvalidRequestFileDTO.getInvalidRequestDate());
+        //备注
+        reportAffair.setDescription(updateInvalidRequestFileDTO.getDescription());
+        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);
+        }
+        return reportAffairId;
     }
 }

src/main/java/cn/cslg/pas/service/business/InvalidStatutesService.java

@@ -1,12 +1,18 @@
 package cn.cslg.pas.service.business;
 
 import cn.cslg.pas.common.dto.business.InvalidStatutesDTO;
+import cn.cslg.pas.common.vo.invalidVO.InvalidStatutesVO;
 import cn.cslg.pas.domain.business.InvalidStatutes;
+import cn.cslg.pas.domain.business.PatentClaim;
+import cn.cslg.pas.domain.business.SystemDict;
 import cn.cslg.pas.exception.XiaoShiException;
 import cn.cslg.pas.mapper.InvalidStatutesMapper;
+import cn.cslg.pas.service.business.invalidReport.PatentClaimService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -22,6 +28,11 @@ import java.util.stream.Collectors;
 @Service
 public class InvalidStatutesService extends ServiceImpl<InvalidStatutesMapper, InvalidStatutes> {
 
+    @Autowired
+    private SystemDictService systemDictService;
+
+    @Autowired
+    private PatentClaimService patentClaimService;
 
     /**
      * 添加无效法条
@@ -63,4 +74,94 @@ public class InvalidStatutesService extends ServiceImpl<InvalidStatutesMapper, I
         }
         return ids;
     }
+
+    /**
+     * 查询无效法条
+     * @param projectId
+     * @return
+     */
+    public List<InvalidStatutesVO> queryInvalidStatutes(Integer projectId){
+        List<InvalidStatutesVO> invalidStatutesVOS = new ArrayList<>();
+        if (projectId != null) {
+            //根据报告id查询所有无效法条
+            LambdaQueryWrapper<InvalidStatutes> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(InvalidStatutes::getProjectId, projectId);
+            List<InvalidStatutes> invalidStatutes = this.list(queryWrapper);
+            if (!invalidStatutes.isEmpty()) {
+                invalidStatutes.forEach(item -> {
+                    InvalidStatutesVO invalidStatutesVO = new InvalidStatutesVO();
+                    BeanUtils.copyProperties(item, invalidStatutesVO);
+                    invalidStatutesVOS.add(invalidStatutesVO);
+                });
+                if (!invalidStatutesVOS.isEmpty()) {
+                    //装载法条内容和权要排序
+                    this.loadStatutes(invalidStatutesVOS);
+                    this.loadClaims(projectId, invalidStatutesVOS);
+                }
+            }
+        }
+        return invalidStatutesVOS;
+    }
+
+    /**
+     * 装载法条
+     * @param invalidStatutesVOS
+     */
+    public void loadStatutes(List<InvalidStatutesVO> invalidStatutesVOS){
+        List<Integer> invalidStatutesIds = invalidStatutesVOS.stream().map(InvalidStatutesVO::getStatutesId).collect(Collectors.toList());
+        if (!invalidStatutesIds.isEmpty()) {
+            LambdaQueryWrapper<SystemDict> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.in(SystemDict::getValue, invalidStatutesIds)
+                    .eq(SystemDict::getType, "STATUTE");
+            List<SystemDict> systemDicts = systemDictService.list(queryWrapper);
+            if (!systemDicts.isEmpty()) {
+                for (InvalidStatutesVO invalidStatutesVO : invalidStatutesVOS) {
+                    SystemDict systemDict = systemDicts
+                            .stream()
+                            .filter(item -> item.getValue().equals(invalidStatutesVO.getStatutesId()))
+                            .findFirst()
+                            .orElse(null);
+                    if (systemDict != null) {
+                        invalidStatutesVO.setStatutes(systemDict.getLabel());
+                    }
+                }
+            } else {
+                throw new XiaoShiException("法条查询错误");
+            }
+        } else {
+            return;
+        }
+    }
+
+
+    /**
+     * 装载权要
+     * @param invalidStatutesVOS
+     */
+    public void loadClaims(Integer projectId, List<InvalidStatutesVO> invalidStatutesVOS){
+        List<Integer> claimIds = invalidStatutesVOS.stream().map(InvalidStatutesVO::getClaimId).collect(Collectors.toList());
+        if (!claimIds.isEmpty()) {
+            LambdaQueryWrapper<PatentClaim> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.in(PatentClaim::getId, claimIds)
+                    .eq(PatentClaim::getProjectId, projectId);
+            List<PatentClaim> patentClaims = patentClaimService.list(queryWrapper);
+            if (!patentClaims.isEmpty()) {
+                for (InvalidStatutesVO invalidStatutesVO : invalidStatutesVOS) {
+                    PatentClaim patentClaim = patentClaims
+                            .stream()
+                            .filter(item -> item.getId().equals(invalidStatutesVO.getClaimId()))
+                            .findFirst()
+                            .orElse(null);
+                    if (patentClaim != null) {
+                        invalidStatutesVO.setClaimSort(patentClaim.getSysOrder());
+                        invalidStatutesVO.setClaimText(patentClaim.getContent());
+                    }
+                }
+            } else {
+                throw new XiaoShiException("法条查询错误");
+            }
+        } else {
+            return;
+        }
+    }
 }

src/main/java/cn/cslg/pas/service/business/ProofGroupService.java

@@ -0,0 +1,131 @@
+package cn.cslg.pas.service.business;
+
+import cn.cslg.pas.common.dto.invalidDTO.AddProofGroupDTO;
+import cn.cslg.pas.common.vo.invalidVO.ProofGroupVO;
+import cn.cslg.pas.domain.business.InvalidStatutes;
+import cn.cslg.pas.domain.business.ProofGroup;
+import cn.cslg.pas.exception.XiaoShiException;
+import cn.cslg.pas.mapper.ProofGroupMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 无效证据Service
+ * @Author xiexiang
+ * @Date 2023/12/25
+ */
+@Service
+@Slf4j
+public class ProofGroupService extends ServiceImpl<ProofGroupMapper, ProofGroup> {
+    @Autowired
+    private InvalidStatutesService invalidStatutesService;
+
+    /**
+     * 添加or修改证据组合
+     * @param addProofGroupDTO
+     * @return
+     */
+    public List<Integer> addProofGroup(AddProofGroupDTO addProofGroupDTO){
+        List<Integer> proofGroupIds = new ArrayList<>();
+        if (addProofGroupDTO != null) {
+            Integer id = addProofGroupDTO.getId();
+            List<String> descriptions = addProofGroupDTO.getDescriptions();
+            Integer projectId = addProofGroupDTO.getProjectId();
+            Integer claimId = addProofGroupDTO.getClaimId();
+            Integer statutesId = addProofGroupDTO.getStatutesId();
+            if (projectId == null) {
+                throw new XiaoShiException("projectId不能为空");
+            }
+            if (claimId == null) {
+                throw new XiaoShiException("claimId不能为空");
+            }
+            if (statutesId == null) {
+                throw new XiaoShiException("invalidStatutesId不能为空");
+            }
+            LambdaQueryWrapper<InvalidStatutes> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(InvalidStatutes::getStatutesId, statutesId)
+                    .eq(InvalidStatutes::getClaimId, claimId)
+                    .eq(InvalidStatutes::getProjectId, projectId);
+            InvalidStatutes invalidStatutes = invalidStatutesService.getOne(queryWrapper, false);
+            if (invalidStatutes == null) {
+                throw new XiaoShiException("查询无效法条错误");
+            }
+            Integer invalidStatutesId = invalidStatutes.getId();
+            List<ProofGroup> proofGroups = new ArrayList<>();
+
+            if (id != null) {
+                //单个更新
+                ProofGroup proofGroup = this.getById(id);
+                proofGroup.setInvalidStatutesId(invalidStatutesId);
+                if (!descriptions.isEmpty() && descriptions.size() == 1) {
+                    proofGroup.setDescription(descriptions.get(0));
+                } else {
+                    proofGroup.setDescription(null);
+                }
+                proofGroup.updateById();
+                proofGroupIds.add(proofGroup.getId());
+            } else {
+                //批量新增
+
+                //如果证据组合说明不为空
+                if (!descriptions.isEmpty()) {
+                    descriptions.forEach(item -> {
+                        ProofGroup proofGroup = new ProofGroup();
+                        proofGroup.setInvalidStatutesId(invalidStatutesId);
+                        proofGroup.setDescription(item);
+                        proofGroups.add(proofGroup);
+                    });
+                } else {
+                    ProofGroup proofGroup = new ProofGroup();
+                    proofGroup.setInvalidStatutesId(invalidStatutesId);
+                    proofGroups.add(proofGroup);
+                }
+                this.saveBatch(proofGroups);
+            }
+            proofGroupIds = proofGroups.stream().map(ProofGroup::getId).collect(Collectors.toList());
+        } else {
+            throw new XiaoShiException("参数不能为空");
+        }
+        return proofGroupIds;
+    }
+
+    /**
+     * 查询证据组合
+     * @param invalidStatutesId
+     * @return
+     */
+    public List<ProofGroupVO> queryProofGroup(Integer invalidStatutesId){
+        List<ProofGroupVO> proofGroupVOS = new ArrayList<>();
+        if (invalidStatutesId == null) {
+            throw new XiaoShiException("invalidStatutesId不能为空");
+        }
+        InvalidStatutes invalidStatutes = invalidStatutesService.getById(invalidStatutesId);
+        if (invalidStatutes == null) {
+            throw new XiaoShiException("查询invalidStatutes错误");
+        }
+        LambdaQueryWrapper<ProofGroup> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ProofGroup::getInvalidStatutesId, invalidStatutesId);
+        List<ProofGroup> proofGroups = this.list(queryWrapper);
+        if (!proofGroups.isEmpty()) {
+            proofGroups.forEach(item -> {
+                ProofGroupVO proofGroupVO = new ProofGroupVO();
+                proofGroupVO.setId(item.getId());
+                proofGroupVO.setInvalidStatutesId(invalidStatutesId);
+                proofGroupVO.setStatutesId(invalidStatutes.getStatutesId());
+                proofGroupVO.setClaimId(invalidStatutes.getClaimId());
+                proofGroupVO.setProjectId(invalidStatutes.getProjectId());
+                proofGroupVO.setDescription(item.getDescription());
+                proofGroupVOS.add(proofGroupVO);
+            });
+        }
+        return proofGroupVOS;
+    }
+}

src/main/java/cn/cslg/pas/service/business/ReportAffairService.java

@@ -57,11 +57,11 @@ public class ReportAffairService extends ServiceImpl<ReportAffairMapper, ReportA
      * @param reportAffairDTO
      */
     public Integer addReportAffair(ReportAffairDTO reportAffairDTO) {
-//        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
         if (reportAffairDTO != null) {
             ReportAffair reportAffair = new ReportAffair();
             BeanUtils.copyProperties(reportAffairDTO, reportAffair);
-            reportAffair.setCreateId("328");
+            reportAffair.setCreateId(personnelVO.getId());
             reportAffair.insert();
             return reportAffair.getId();
         } else {
@@ -91,7 +91,7 @@ public class ReportAffairService extends ServiceImpl<ReportAffairMapper, ReportA
     /**
      * 查询报告事务
      *
-     * @param QueryReportAffairDTO
+     * @param queryReportAffairDTO
      */
     public List<ReportAffairVO> queryReportAffair(QueryReportAffairDTO queryReportAffairDTO) {
         Integer projectId = queryReportAffairDTO.getProjectId();