添加无效理由和证据不需要填写相关证据

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

@@ -137,40 +137,6 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
         return Response.success();
     }
 
-    /**
-     * @param compareFilesVO
-     * @return
-     * @throws IOException
-     * @Autor lrj
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public String addFTOCompareFile(CompareFilesVO compareFilesVO) throws IOException {
-
-        List<CompareFiles> compareFiles = new ArrayList<>();
-        PatentVO patentVO = new PatentVO();
-        patentVO.setStartNumber(compareFilesVO.getStartNumber() - 1);
-        patentVO.setEndNumber(compareFilesVO.getEndNumber());
-        patentVO.setReportId(compareFilesVO.getReportId());
-
-        // 见outInterfaceService getComPatentNos接口
-        String res = outInterfaceService.getComPatentNos(patentVO);
-        JSONObject jsonObject = JSONObject.parseObject(res);
-        List<String> patentNos = JSONArray.parseArray(jsonObject.get("data").toString(), String.class);
-        //删除原有的
-        patentNos.removeAll(compareFilesVO.getIsDelete());
-        //添加新的
-        patentNos.addAll(compareFilesVO.getIsAdd());
-        for (int i = 0; i < patentNos.size(); i++) {
-            CompareFiles compareFiles1 = new CompareFiles();
-            //根据专利号和报告id造对象
-            compareFiles1.setPatentNo(patentNos.get(i));
-            compareFiles1.setReportId(compareFilesVO.getReportId());
-            compareFiles.add(compareFiles1);
-        }
-        // 批量添加
-        this.saveBatch(compareFiles);
-        return Response.success();
-    }
 
     @Transactional(rollbackFor = Exception.class)
     public String addFTOFile(PatentVO patentVO) throws IOException {

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

@@ -137,7 +137,6 @@ public class InvalidReasonService extends ServiceImpl<InvalidReasonMapper, Inval
             //说明书公开不充分入表
             invalidReason.insert();
         } else if (invalidName.equals(0)) {//若类型为0，则为“权利要求不清楚”，需要选择涉及内容（content）并输入相关证据（proofStr）
-            if (invalidReasonDTO.getProofStr() != null && invalidReasonDTO.getProofStr() != "") {
                 if (invalidReasonDTO.getInvalidName() == 1) {
                     invalidReasonDTO.setContent(-1);
                 }
@@ -199,9 +198,6 @@ public class InvalidReasonService extends ServiceImpl<InvalidReasonMapper, Inval
                         assoPositionFeatures.insert();
                     }
                 }
-            } else {
-                return Response.error("相关证据不能为空");
-            }
         } else if (invalidName.equals(2) || invalidName.equals(3)||invalidName.equals(4)) {//若类型为2,3则proofGroups不能为空
             if (invalidReasonDTO.getProofGroups() != null) {
                 //复制DTO类字段到InvalidReason实体类并保存入库

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

@@ -465,55 +465,6 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         return Response.success();
     }
 
-    //返回任务专利清单
-    @Transactional(rollbackFor = Exception.class)
-    public String reTaskPatents(PatentVO patentVO) throws ParseException, IOException {
-        List<String> taskPatentNos = new ArrayList<>();
-        //根据报告Id和类型获得任务的清单
-        LambdaQueryWrapper<AssoTaskPersonel> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(AssoTaskPersonel::getReportId, patentVO.getReportId());
-        //当taskID存在时
-        if (patentVO.getTaskId() != null) {
-            queryWrapper.eq(AssoTaskPersonel::getTaskId, patentVO.getTaskId());
-            if (patentVO.getTaskStatus() != 3) {
-                queryWrapper.eq(AssoTaskPersonel::getState, patentVO.getTaskStatus());
-            }
-            List<AssoTaskPersonel> assoTaskPersonels = assoTaskPersonelService.list(queryWrapper);
-            if (patentVO.getTaskStatus() != 3) {
-                taskPatentNos = assoTaskPersonels.stream().filter(item -> item.getState() == patentVO.getTaskStatus()).map(AssoTaskPersonel::getPatentNo).collect(Collectors.toList());
-            } else {
-                taskPatentNos = assoTaskPersonels.stream().map(AssoTaskPersonel::getPatentNo).collect(Collectors.toList());
-            }
-        }
-        //当taskId不存在时
-        else {
-            List<AssoTaskPersonel> assoTaskPersonels = assoTaskPersonelService.list(queryWrapper);
-            taskPatentNos = assoTaskPersonels.stream().map(AssoTaskPersonel::getPatentNo).collect(Collectors.toList());
-        }
-        //无查询条件
-        if (patentVO.getFiledOptions().size() == 0 || patentVO.getFiledOptions() == null) {
-            patentVO.setPatentNos(taskPatentNos);
-        }
-        //有查询条件时，自定义字段的专利号和任务的专利号取交集
-        else {
-            List<String> patentNos = reportFieldService.getPatentNo(patentVO.getFiledOptions(), taskPatentNos);
-            List<String> jiaoList = new ArrayList<>(taskPatentNos);
-            jiaoList.retainAll(patentNos);
-            patentVO.setPatentNos(jiaoList);
-        }
-        String res = outInterfaceService.getPatentFromPAS(patentVO, 1);
-        JSONObject jsonObject = JSONObject.parseObject(res);
-        JSONObject jsonObject1 = JSONObject.parseObject(jsonObject.get("data").toString());
-        List<JSONObject> jsonObjects = JSONArray.parseArray(jsonObject1.get("records").toString(), JSONObject.class);
-        for (int i = 0; i < jsonObjects.size(); i++) {
-            jsonObjects.get(i).put("field", reportFieldService.getPatentFieldByPatentIdAndProjectId(patentVO.getReportId(), jsonObjects.get(i).getString("patentNo")));
-        }
-        jsonObject1.put("records", jsonObjects);
-        jsonObject.put("data", jsonObject1);
-
-
-        return jsonObject.toString();
-    }
 
     //返回任务专利清单
     @Transactional(rollbackFor = Exception.class)