推

RMS/src/main/java/cn/cslg/report/controller/CompareController.java

@@ -44,8 +44,8 @@ public class CompareController {
 
     @RequestMapping(value = "/addSingle", method = RequestMethod.GET)
     @Operation(summary = "添加单个对比文件")
-    public Integer addSingle(Integer reportId, String PatentNo) throws IOException {
-        Integer res = compareFilesService.addSingle(reportId,PatentNo);
+    public Integer addSingle(Integer reportId, String patentNo) throws IOException {
+        Integer res = compareFilesService.addSingle(reportId, patentNo);
         return res;
     }
 

RMS/src/main/java/cn/cslg/report/controller/InvalidReReport/ProofController.java

@@ -55,15 +55,15 @@ public class ProofController {
     }
 
 
-//    @Operation(summary = "上传专利文献证据（专利号）")
+    //    @Operation(summary = "上传专利文献证据（专利号）")
 //    @PostMapping("/addPatentFile")
 //    public String addPatentFile(@RequestBody ShareReportDTO shareReportDTO) throws IOException {
 //        return Response.success(assoReportPersonService.showShare(shareReportDTO));
 //    }
-  @Operation(summary = "查询专利文献列表")
-  @PostMapping("/queryProof")
-public String queryProof(@RequestBody ProofQueryDTO proofAddNewDTO) {
-    return proofService.queryProof(proofAddNewDTO);
-}
+    @Operation(summary = "查询专利文献列表")
+    @PostMapping("/queryProof")
+    public String queryProof(@RequestBody ProofQueryDTO proofAddNewDTO) {
+        return proofService.queryProof(proofAddNewDTO);
+    }
 
 }

RMS/src/main/java/cn/cslg/report/entity/CompareFiles.java

@@ -45,7 +45,7 @@ public class CompareFiles extends BaseEntity<CompareFiles> {
     private Integer fileId;
 
     @TableField(value = "FILE_NAME")
-    private String fileName ;
+    private String fileName;
     @TableField(value = "FILE_TYPE")
-    private Integer fileType ;
+    private Integer fileType;
 }

RMS/src/main/java/cn/cslg/report/service/business/CompareFilesService.java

@@ -57,6 +57,7 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
     private final AssoTaskPersonelService assoTaskPersonelService;
     private final CompareRecordsService compareRecordsService;
     private final ReportFileService reportFileService;
+
     /**
      * @param compareFilesVO
      * @return 是否添加成功
@@ -622,16 +623,16 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
                 }
 
             }
-            compareFiles.setSysOrder(biggestSort);
+            compareFiles.setSysOrder(++biggestSort);
             compareFiles.setFileType(1);
             compareFiles.setReportId(reportId);
             compareFiles.insert();
-        }
-        catch (Exception e){
+        } catch (Exception e) {
             return -1;
         }
         return compareFiles.getId();
     }
+
     //上传非专利文献证据
     public void addProofByFile(ProofAddNewDTO proofAddNewDTO, List<MultipartFile> files) {
         log.info("开始处理【上传非专利文献证据】的业务，参数为：{}, {}", proofAddNewDTO, files);
@@ -660,12 +661,12 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
 
         }
 
-            CompareFiles proof = new CompareFiles();
-            BeanUtils.copyProperties(proofAddNewDTO, proof);  //DTO赋值给实体类（装载报告id、证据名称、备注）
-            proof.setFileType(2);  //装载证据类型
-            proof.setFileId(fileIds.get(0));  //装载文件id
-            proof.setFileType(++biggestSort);
-            proof.insert();
+        CompareFiles proof = new CompareFiles();
+        BeanUtils.copyProperties(proofAddNewDTO, proof);  //DTO赋值给实体类（装载报告id、证据名称、备注）
+        proof.setFileType(2);  //装载证据类型
+        proof.setFileId(fileIds.get(0));  //装载文件id
+        proof.setFileType(++biggestSort);
+        proof.insert();
 
         log.info("上传非专利文献证据完成");
 

RMS/src/main/java/cn/cslg/report/service/business/InvalidReReport/ProofService.java

@@ -1,20 +1,18 @@
 package cn.cslg.report.service.business.InvalidReReport;
 
 import cn.cslg.report.common.model.dto.ProofAddNewDTO;
-import cn.cslg.report.common.model.dto.UploadFileDTO;
 import cn.cslg.report.common.model.dto.invalidReReport.ProofQueryDTO;
 import cn.cslg.report.common.model.vo.PersonnelVO;
 import cn.cslg.report.common.model.vo.invalidReReport.ProofVO;
-import cn.cslg.report.common.utils.*;
+import cn.cslg.report.common.utils.CacheUtils;
+import cn.cslg.report.common.utils.DataUtils;
+import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.common.utils.SecurityUtils.LoginUtils;
-import cn.cslg.report.entity.Template;
+import cn.cslg.report.common.utils.ThrowException;
 import cn.cslg.report.entity.invalidReReport.Proof;
 import cn.cslg.report.mapper.InvalidReReport.ProofMapper;
-import cn.cslg.report.mapper.TemplateMapper;
 import cn.cslg.report.service.business.ReportFileService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.Query;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
@@ -24,7 +22,6 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.mail.Multipart;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -85,44 +82,43 @@ public class ProofService extends ServiceImpl<ProofMapper, Proof> {
 
     /**
      * 分页查询证据
+     *
      * @param proofAddNewDTO
      * @return
      */
-    public String queryProof(ProofQueryDTO proofAddNewDTO){
-        Integer reportId =proofAddNewDTO.getReportId();
-        Integer current =proofAddNewDTO.getCurrent();
-        Integer size =proofAddNewDTO.getSize();
-        String orderType =proofAddNewDTO.getOrderType();
-        if(reportId==null||current==null||size==null){
-            return "" ;
+    public String queryProof(ProofQueryDTO proofAddNewDTO) {
+        Integer reportId = proofAddNewDTO.getReportId();
+        Integer current = proofAddNewDTO.getCurrent();
+        Integer size = proofAddNewDTO.getSize();
+        String orderType = proofAddNewDTO.getOrderType();
+        if (reportId == null || current == null || size == null) {
+            return "";
         }
-        LambdaQueryWrapper<Proof> wrapper =new LambdaQueryWrapper<>();
-        wrapper.eq(Proof::getReportId,reportId);
-        if("desc".equals(orderType)){
+        LambdaQueryWrapper<Proof> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Proof::getReportId, reportId);
+        if ("desc".equals(orderType)) {
             wrapper.orderByDesc(Proof::getSort);
-        }
-        else {
+        } else {
             wrapper.orderByAsc(Proof::getSort);
         }
-        List<Proof> proofs =this.page(new Page<>(current,size),wrapper).getRecords();
-        List<ProofVO> proofVOS =this.loadProof(proofs);
+        List<Proof> proofs = this.page(new Page<>(current, size), wrapper).getRecords();
+        List<ProofVO> proofVOS = this.loadProof(proofs);
         long count = this.count(wrapper);
         return Response.success(proofVOS, DataUtils.setPageColumn(size, current, Math.toIntExact(count)));
     }
 
-    private List<ProofVO> loadProof(List<Proof> proofs){
-       List<ProofVO> proofVOS =new ArrayList<>();
-        proofs.forEach(item->{
-            ProofVO proofVO =new ProofVO();
-            if(item.getProofType().equals(1)) {
+    private List<ProofVO> loadProof(List<Proof> proofs) {
+        List<ProofVO> proofVOS = new ArrayList<>();
+        proofs.forEach(item -> {
+            ProofVO proofVO = new ProofVO();
+            if (item.getProofType().equals(1)) {
                 proofVO.setProofType("专利文献");
                 proofVO.setProofName(item.getPatentNo());
-            }
-            else if(item.getProofType().equals(2)){
+            } else if (item.getProofType().equals(2)) {
                 proofVO.setProofType("非专利文献");
                 proofVO.setProofName(item.getProofName());
             }
-            proofVO.setSortStr("D"+item.getSort());
+            proofVO.setSortStr("D" + item.getSort());
             proofVOS.add(proofVO);
         });
         return proofVOS;