Merge remote-tracking branch 'origin/master'

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

@@ -21,13 +21,13 @@ public class InvalidRecordController {
     public final InvalidRecordService invalidRecordService;
     @RequestMapping(value = "/addInvalidRecord", method = RequestMethod.POST)
     @Operation(summary = "增加无效记录")
-    public  String addInvalidRecord(InvalidRecord invalidRecord) throws IOException{
+    public  String addInvalidRecord(@RequestBody InvalidRecord invalidRecord) throws IOException{
         return invalidRecordService.addInvalidRecord(invalidRecord);
     }
     @RequestMapping(value = "/updateInvalidRecord", method = RequestMethod.POST)
     @Operation(summary = "修改无效记录")
     @Transactional(rollbackFor = Exception.class)
-    public String updateInvalidRecord(InvalidRecord invalidRecord)throws IOException{
+    public String updateInvalidRecord(@RequestBody InvalidRecord invalidRecord)throws IOException{
         return invalidRecordService.updateInvalidRecord(invalidRecord);
 
     }

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

@@ -0,0 +1,48 @@
+package cn.cslg.report.controller;
+
+import cn.cslg.report.common.core.base.Constants;
+import cn.cslg.report.entity.InvalidRecord;
+import cn.cslg.report.entity.References;
+import cn.cslg.report.service.ReferencesService;
+import cn.cslg.report.service.business.InvalidRecordService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+
+@Tag(name = "其他参考资料")
+@RestController
+@RequestMapping(Constants.REPORT_API + "/References")
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
+public class ReferencesController {
+    public final ReferencesService referencesService;
+    @RequestMapping(value = "/addReferences", method = RequestMethod.POST)
+    @Operation(summary = "增加参考资料")
+    public  String addReferences(@RequestBody References references) throws IOException{
+        return referencesService.addReferences(references);
+    }
+    @RequestMapping(value = "/updateReferences", method = RequestMethod.POST)
+    @Operation(summary = "修改参考资料")
+    @Transactional(rollbackFor = Exception.class)
+    public String updateReferences( @RequestBody References references)throws IOException{
+        return referencesService.updateReferences(references);
+
+    }
+    @GetMapping(value = "/deleReferences")
+    @Operation(summary = "删除参考资料")
+    public String deleReferences(int id)throws IOException{
+        return referencesService.deleteReferences(id);
+    }
+    @PostMapping(value = "/queryReferences")
+    @Operation(summary = "查询参考资料")
+    @Transactional(rollbackFor = Exception.class)
+    public String queryReferences(@RequestBody References references)throws IOException{
+        return referencesService.queryReferences(references);
+    }
+
+
+}

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

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
 
-@Tag(name = "无效记录")
+@Tag(name = "审查历史")
 @RestController
 @RequestMapping(Constants.REPORT_API + "/reviewHistory")
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})

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

@@ -45,7 +45,7 @@ public class InvalidRecord extends BaseEntity<InvalidRecord> {
      */
     @Schema(description = "无效时间")
     @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
-    @TableField(value = "无效时间")
+    @TableField(value = "INVALID_TIME")
     private String invalidTime;
 
     /**
@@ -61,7 +61,7 @@ public class InvalidRecord extends BaseEntity<InvalidRecord> {
      */
     @Schema(description = "结果")
     @TableField(value = "RESULT")
-    private String resultS;
+    private String result;
 
     /**
      * 文件ID

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

@@ -9,6 +9,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * 无效记录表
  */
@@ -26,54 +28,35 @@ public class References extends BaseEntity<References> {
 
 
 
-    /**
-     * 无效申请人
-     */
-    @Schema(description = "无效申请人")
+
+    @Schema(description = "参考资料名")
     @TableField(value = "REFERENCES_NAME")
     private String referencesName;
 
     /**
      * 无效申请人ID
      */
-    @Schema(description = "无效申请人ID")
-    @TableField(value = "PERSON_ID")
-    private String personId;
+    @Schema(description = "文件路径")
+    @TableField(value = "FILE_URL")
+    private String fileUrl;
 
-    /**
-     * 无效时间
-     */
-    @Schema(description = "无效时间")
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
-    @TableField(value = "无效时间")
-    private String invalidTime;
 
-    /**
-     * 判决时间
-     */
-    @Schema(description = "判决时间")
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
-    @TableField(value = "JUDGMENT_TIME")
-    private String judgmentTime;
 
-    /**
-     * 结果
-     */
-    @Schema(description = "结果")
-    @TableField(value = "RESULT")
-    private String resultS;
+    @Schema(description = "创建时间")
+    @TableField(value = "CREATE_TIME")
+    private Date createTime;
 
-    /**
-     * 文件ID
-     */
-    @Schema(description = "文件ID")
-    @TableField(value = "FILE_ID")
-    private String fileId;
+
+    @Schema(description = "解释说明")
+    @TableField(value = "REFERENCES_EXPLAIN")
+    private String referencesExplain;
 
     /**
-     * 所属报告ID
+     * 文件名
      */
-    @Schema(description = "所属报告ID")
-    @TableField(value = "REPORT_ID")
-    private String reportId;
+    @Schema(description = "文件名")
+    @TableField(value = "FILE_NAME")
+    private String fileName;
+
+
 }

RMS/src/main/java/cn/cslg/report/mapper/ReferencesMapper.java

@@ -0,0 +1,14 @@
+package cn.cslg.report.mapper;
+
+import cn.cslg.report.entity.InvalidRecord;
+import cn.cslg.report.entity.References;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface ReferencesMapper extends BaseMapper<References> {
+
+}

RMS/src/main/java/cn/cslg/report/service/ReferencesService.java

@@ -0,0 +1,45 @@
+package cn.cslg.report.service;
+
+import cn.cslg.report.common.utils.Response;
+import cn.cslg.report.entity.InvalidRecord;
+import cn.cslg.report.entity.References;
+import cn.cslg.report.mapper.InvalidRecordMapper;
+import cn.cslg.report.mapper.ReferencesMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+
+@Service
+@Slf4j
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
+public class ReferencesService extends ServiceImpl<ReferencesMapper, References> {
+    public final InvalidRecordMapper invalidRecordMapper;
+
+    public String deleteReferences(int id) throws IOException {
+        this.removeById(id);
+        return Response.success();
+    }
+
+    public String updateReferences(References references) throws IOException {
+        references.updateById();
+        return Response.success();
+    }
+
+    public String addReferences(References references) throws IOException {
+        references.insert();
+        return Response.success();
+    }
+
+    public String queryReferences(References references){
+        LambdaQueryWrapper<References> wrapper =new LambdaQueryWrapper<>();
+        wrapper.eq(References::getPatentNo,references.getPatentNo());
+       return Response.success(this.list(wrapper));
+    }
+
+
+}

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

@@ -5,6 +5,7 @@ import cn.cslg.report.common.model.vo.PatentVO;
 
 import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.entity.CompareFiles;
+import cn.cslg.report.entity.Report;
 import cn.cslg.report.mapper.CompareFilesMapper;
 import cn.cslg.report.service.OutInterfaceService;
 import com.alibaba.fastjson.JSONArray;
@@ -31,18 +32,8 @@ import java.util.stream.Collectors;
 public class CompareFilesService extends ServiceImpl<CompareFilesMapper, CompareFiles> {
     private final CompareFilesMapper compareFilesMapper;
     private final OutInterfaceService outInterfaceService;
+    private final ReportService reportService;
 
-    //    public String addCompareFile(CompareFilesVO compareFilesVO){
-//     List<CompareFiles> compareFiles =new ArrayList<>();
-//     compareFilesVO.getPatentNos().forEach(item->{
-//         CompareFiles compareFiles1 =new CompareFiles();
-//         compareFiles1.setPatentNo(item);
-//         compareFiles1.setReportId(compareFilesVO.getReportId());
-//         compareFiles.add(compareFiles1);
-//     });
-//      this.saveBatch(compareFiles);
-//        return  Response.success();
-//    }
     @Transactional(rollbackFor = Exception.class)
     public String addCompareFile(CompareFilesVO compareFilesVO) throws IOException {
         LambdaQueryWrapper<CompareFiles> queryWrapper = new LambdaQueryWrapper<>();
@@ -83,6 +74,11 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
             res = outInterfaceService.getPatentFromPAS(patentVO, 1);
 
         } else {
+            LambdaQueryWrapper<Report> wrapper1 =new LambdaQueryWrapper<>();
+            wrapper1.select(Report::getSignPatentNo);
+            wrapper1.eq(Report::getId,patentVO.getReportId());
+            String signPatentNO = reportService.list(wrapper1).get(0).getSignPatentNo();
+             patentNos.add(signPatentNO);
             patentVO.setNotInPatentNos(patentNos);
             res = outInterfaceService.getPatentFromPAS(patentVO, 0);