添加证据组合字段

src/main/java/cn/cslg/pas/common/dto/ImportTaskDTO.java

@@ -1,6 +1,7 @@
 package cn.cslg.pas.common.dto;
 
 import cn.cslg.pas.common.dto.business.AssoImportTaskFieldVO;
+import cn.cslg.pas.common.dto.es.EsCustomFieldDTO;
 import cn.cslg.pas.domain.business.AssoImportTaskField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -82,6 +83,6 @@ public class ImportTaskDTO {
     private String orderBy;
     private String orderByType;
 
-    private List<AssoImportTaskFieldVO> assoImportTaskFieldVOS;
+    private List<EsCustomFieldDTO> fieldDTOS;
 
 }

src/main/java/cn/cslg/pas/common/dto/es/EsCustomFieldDTO.java

@@ -43,4 +43,5 @@ public class EsCustomFieldDTO {
     Integer optionType;
 
     String patentNo;
+    private String patentId;
 }

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

@@ -89,4 +89,28 @@ public class ProofGroupVO {
     private String rbDecisionKey;
 
 
+    private String prosecutorOpinions1;
+
+
+    private String respondentOpinions1;
+
+
+    private String thirdOpinions1;
+
+
+    private String courtOpinions1;
+
+
+    private String prosecutorOpinions2;
+
+
+    private String respondentOpinions2;
+
+
+    private String thirdOpinions2;
+
+
+    private String courtOpinions2;
+
+
 }

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

@@ -1,5 +1,6 @@
 package cn.cslg.pas.common.vo.invalidVO;
 
+import cn.cslg.pas.domain.business.AssoGroupFeature;
 import cn.cslg.pas.domain.business.CompareLiterature;
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
@@ -18,68 +19,160 @@ public class QueryEvidenceReasonVO {
     private Integer evidenceReasonId;
 
     private List<CompareLiterature> literatures;
-    private List<GroupFeatureHistoryVO> featureHistories;
+    private List<AssoGroupFeature> featureHistories;
     /**
      * 无效理由详情1
      */
-    private String fInvalidReasonDetail1;
+    private String feInvalidReasonDetail1;
 
     /**
      * 无效理由详情2
      */
-    private String fInvalidReasonDetail2;
+    private String feInvalidReasonDetail2;
 
     /**
      * 陈述意见
      */
-    private String fPresentOpinions1;
+    private String fePresentOpinions1;
 
 
     /**
      * 第二次陈述意见
      */
-    private String fPresentOpinions2;
+    private String fePresentOpinions2;
     /**
      * 是否有第一次陈述意见
      */
-    private Boolean fIfPresentOpinions1;
+    private Boolean feIfPresentOpinions1;
     /**
      * 是否有第二次陈述意见
      */
-    private Boolean fIfPresentOpinions2;
+    private Boolean feIfPresentOpinions2;
     /**
      * 复审委意见
      */
-    private String fRbOpinions;
+    private String feRbOpinions;
+    private String feRbSummary;
 
     /**
      * 复审委意见要点提炼
      */
-    private String fRbDecisionKey;
+    private String feRbDecisionKey;
     //特征修改说明
-    private String fCommon;
+    private String feCommon;
 
     /**
      * 陈述意见
      */
-    private String rPresentOpinions1;
+    private String erPresentOpinions1;
 
 
     /**
      * 是否有陈述意见
      */
-    private Boolean rIfPresentOpinions1;
+    private Boolean erIfPresentOpinions1;
 
 
     /**
      * 复审委意见
      */
-    private String rRbOpinions;
+    private String erRbOpinions;
 
     /**
      * 复审委意见要点提炼
      */
-    private String rRbDecisionKey;
+    private String erRbDecisionKey;
+    private String erRbSummary;
 
+    /**
+     * 一审起诉人意见
+     */
+    private String feProsecutorOpinions1;
+
+    /**
+     * 一审被诉人意见
+     */
+    private String feRespondentOpinions1;
+
+    /**
+     * 一审第三方意见
+     */
+    private String feThirdOpinions1;
+
+    /**
+     * 一审法院意见
+     */
+    private String feCourtOpinions1;
+
+    /**
+     * 二审起诉人意见
+     */
+    private String feProsecutorOpinions2;
+
+    /**
+     * 二审被诉人意见
+     */
+    private String feRespondentOpinions2;
+
+    /**
+     * 二审第三方意见
+     */
+    private String feThirdOpinions2;
+
+    /**
+     * 二审法院意见
+     */
+    private String feCourtOpinions2;
+
+
+
+
+    /**
+     * 一审起诉人意见
+     */
+    @TableField(value = "prosecutor_opinions1")
+    private String erProsecutorOpinions1;
+
+    /**
+     * 一审被诉人意见
+     */
+    @TableField(value = "respondent_opinions1")
+    private String erRespondentOpinions1;
+
+    /**
+     * 一审第三方意见
+     */
+    @TableField(value = "third_opinions1")
+    private String erThirdOpinions1;
+
+    /**
+     * 一审法院意见
+     */
+    @TableField(value = "court_opinions1")
+    private String erCourtOpinions1;
+
+    /**
+     * 二审起诉人意见
+     */
+    @TableField(value = "prosecutor_opinions2")
+    private String erProsecutorOpinions2;
+
+    /**
+     * 二审被诉人意见
+     */
+    @TableField(value = "respondent_opinions2")
+    private String erRespondentOpinions2;
+
+    /**
+     * 二审第三方意见
+     */
+    @TableField(value = "third_opinions2")
+    private String erThirdOpinions2;
+
+    /**
+     * 二审法院意见
+     */
+    @TableField(value = "court_opinions2")
+    private String erCourtOpinions2;
 
 }

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

@@ -3,6 +3,7 @@ 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.dto.invalidDTO.UpdateMessageDTO;
 import cn.cslg.pas.common.model.cronModel.Records;
 import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.common.vo.invalidVO.InvalidStatutesVO;
@@ -48,4 +49,16 @@ public class InvalidStatutesController {
         return Response.success(records);
     }
 
+
+    @Operation(summary = "更新信息")
+    @PostMapping("/updateMessage")
+    public Response updateMessage(@RequestBody UpdateMessageDTO updateMessageDTO) {
+        try {
+            invalidStatutesService.updateMessage(updateMessageDTO);
+        }
+        catch (Exception e){
+            return  Response.error(e.getMessage());
+        }
+        return Response.success("更新成功");
+    }
 }

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

@@ -73,6 +73,58 @@ public class AssoGroupFeature  extends BaseEntity<AssoGroupFeature> {
     //特征修改说明
     @TableField(value = "common")
     private String common;
+    /**
+     *复审委概括
+     */
+    @TableField(value = "rb_summary")
+    private String rbSummary;
 
 
+    /**
+     * 一审起诉人意见
+     */
+    @TableField(value = "prosecutor_opinions1")
+    private String prosecutorOpinions1;
+
+    /**
+     * 一审被诉人意见
+     */
+    @TableField(value = "respondent_opinions1")
+    private String respondentOpinions1;
+
+    /**
+     * 一审第三方意见
+     */
+    @TableField(value = "third_opinions1")
+    private String thirdOpinions1;
+
+    /**
+     * 一审法院意见
+     */
+    @TableField(value = "court_opinions1")
+    private String courtOpinions1;
+
+    /**
+     * 二审起诉人意见
+     */
+    @TableField(value = "prosecutor_opinions2")
+    private String prosecutorOpinions2;
+
+    /**
+     * 二审被诉人意见
+     */
+    @TableField(value = "respondent_opinions2")
+    private String respondentOpinions2;
+
+    /**
+     * 二审第三方意见
+     */
+    @TableField(value = "third_opinions2")
+    private String thirdOpinions2;
+
+    /**
+     * 二审法院意见
+     */
+    @TableField(value = "court_opinions2")
+    private String courtOpinions2;
 }

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

@@ -53,4 +53,57 @@ public class EvidenceReason extends BaseEntity<EvidenceReason> {
     @TableField(value = "rb_decision_key")
     private String rbDecisionKey;
 
+    /**
+     *复审委概括
+     */
+    @TableField(value = "rb_summary")
+    private String rbSummary;
+
+    /**
+     * 一审起诉人意见
+     */
+    @TableField(value = "prosecutor_opinions1")
+    private String prosecutorOpinions1;
+
+    /**
+     * 一审被诉人意见
+     */
+    @TableField(value = "respondent_opinions1")
+    private String respondentOpinions1;
+
+    /**
+     * 一审第三方意见
+     */
+    @TableField(value = "third_opinions1")
+    private String thirdOpinions1;
+
+    /**
+     * 一审法院意见
+     */
+    @TableField(value = "court_opinions1")
+    private String courtOpinions1;
+
+    /**
+     * 二审起诉人意见
+     */
+    @TableField(value = "prosecutor_opinions2")
+    private String prosecutorOpinions2;
+
+    /**
+     * 二审被诉人意见
+     */
+    @TableField(value = "respondent_opinions2")
+    private String respondentOpinions2;
+
+    /**
+     * 二审第三方意见
+     */
+    @TableField(value = "third_opinions2")
+    private String thirdOpinions2;
+
+    /**
+     * 二审法院意见
+     */
+    @TableField(value = "court_opinions2")
+    private String courtOpinions2;
 }

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

@@ -99,6 +99,8 @@ public class ImportTaskCondition extends BaseEntity<ImportTaskCondition> {
      */
     @TableField(value = "create_time")
     private Date createTime;
+    @TableField(value = "custom_fields")
+    private String customFields;
 
 
 }

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

@@ -82,4 +82,52 @@ public class ProofGroup extends BaseEntity<ProofGroup> {
     private String rbDecisionKey;
 
 
+    /**
+     * 一审起诉人意见
+     */
+    @TableField(value = "prosecutor_opinions1")
+    private String prosecutorOpinions1;
+
+    /**
+     * 一审被诉人意见
+     */
+    @TableField(value = "respondent_opinions1")
+    private String respondentOpinions1;
+
+    /**
+     * 一审第三方意见
+     */
+    @TableField(value = "third_opinions1")
+    private String thirdOpinions1;
+
+    /**
+     * 一审法院意见
+     */
+    @TableField(value = "court_opinions1")
+    private String courtOpinions1;
+
+    /**
+     * 二审起诉人意见
+     */
+    @TableField(value = "prosecutor_opinions2")
+    private String prosecutorOpinions2;
+
+    /**
+     * 二审被诉人意见
+     */
+    @TableField(value = "respondent_opinions2")
+    private String respondentOpinions2;
+
+    /**
+     * 二审第三方意见
+     */
+    @TableField(value = "third_opinions2")
+    private String thirdOpinions2;
+
+    /**
+     * 二审法院意见
+     */
+    @TableField(value = "court_opinions2")
+    private String courtOpinions2;
+
 }

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

@@ -130,9 +130,11 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
         } catch (Exception e) {
             throw new UnLoginException("未登录");
         }
+
         if(importTaskDTO.getType()==null){
             importTaskDTO.setType(4);
         }
+
         ImportTaskCondition importTaskCondition = new ImportTaskCondition();
         if (importTaskDTO.getImportToType().equals(0)) {
             importTaskCondition.setProjectType(0);
@@ -157,6 +159,9 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
         importTaskCondition.setOrderBy(importTaskDTO.getOrderBy());
         importTaskCondition.setOrderByType(importTaskDTO.getOrderByType());
         importTaskCondition.setCreateId(personnelVO.getId());
+
+       String fieldJson= JsonUtils.objectToJson(importTaskCondition);
+        importTaskCondition.setCustomFields(fieldJson);
         importTaskCondition.insert();
 
         //装载任务

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

@@ -1,7 +1,11 @@
 package cn.cslg.pas.service.business;
 
+import cn.cslg.pas.common.dto.DomainFieldDTO;
 import cn.cslg.pas.common.dto.business.InvalidStatutesDTO;
+import cn.cslg.pas.common.dto.invalidDTO.UpdateMessageDTO;
+import cn.cslg.pas.common.utils.GenerateObjectUtil;
 import cn.cslg.pas.common.vo.invalidVO.InvalidStatutesVO;
+import cn.cslg.pas.domain.business.AssoGroupFeature;
 import cn.cslg.pas.domain.business.InvalidStatutes;
 import cn.cslg.pas.domain.business.PatentClaim;
 import cn.cslg.pas.domain.business.SystemDict;
@@ -14,6 +18,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 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;
@@ -164,4 +169,38 @@ public class InvalidStatutesService extends ServiceImpl<InvalidStatutesMapper, I
             return;
         }
     }
+
+
+
+    /**
+     * 更新信息
+     *
+     * @param updateMessageDTO
+     * @return
+     */
+    public Boolean updateMessage(@RequestBody UpdateMessageDTO updateMessageDTO) {
+        List<Integer> ids = updateMessageDTO.getIds();
+        List<DomainFieldDTO> domainFieldDTOS = updateMessageDTO.getFieldList();
+        for (Integer id : ids) {
+            InvalidStatutes invalidStatutes = this.getById(id);
+            if (invalidStatutes == null) {
+                throw new XiaoShiException("法条不存在");
+
+            }
+            if (domainFieldDTOS == null || domainFieldDTOS.size() == 0) {
+                throw new XiaoShiException("请输入值");
+            }
+            domainFieldDTOS.forEach(item -> {
+                try {
+                    if (item.getValue() != null) {
+                        GenerateObjectUtil.setObjectProperty(invalidStatutes, item.getField(), item.getValue());
+                    }
+                } catch (Exception e) {
+                    throw new XiaoShiException("装载失败");
+                }
+            });
+            invalidStatutes.updateById();
+        }
+        return true;
+    }
 }

src/main/java/cn/cslg/pas/service/business/es/EsCustomFieldService.java

@@ -52,6 +52,7 @@ public class EsCustomFieldService {
         Integer optionType = esCustomFieldDTO.getOptionType();
         String patentNo = esCustomFieldDTO.getPatentNo();
         String fieldId = esCustomFieldDTO.getFieldId();
+        String patentId = esCustomFieldDTO.getPatentId();
         List<String> addValues = esCustomFieldDTO.getFieldValue();
         Integer projectId = esCustomFieldDTO.getProjectId();
         Date createDate = new Date();
@@ -134,8 +135,7 @@ public class EsCustomFieldService {
                         esCustomField.setFieldValue(new ArrayList<>());
                         esCustomField.setStatsValue(new ArrayList<>());
                     }
-                }
-                else if(optionType.equals(0)){
+                } else if (optionType.equals(0)) {
                     List<String> orgValue = esCustomField.getFieldValue();
 
                     if (orgValue == null) {
@@ -248,7 +248,7 @@ public class EsCustomFieldService {
             esCustomFieldHistory.setCustomFieldId(id);
             this.addCustomFieldHistory(esCustomFieldHistory);
         } else {
-          this.addEsCustomFieldToEs(esCustomField,patentNo);
+            this.addEsCustomFieldToEs(esCustomField, patentNo, patentId);
         }
         return id;
     }
@@ -298,8 +298,7 @@ public class EsCustomFieldService {
         if (taskId == null) {
             Query q5 = QueryBuilders.exists((t -> t.field("custom_field.task_id")));
             bool = QueryBuilders.bool(i -> i.must(q1, q2, q3, q4).mustNot(q5));
-        }
-        else {
+        } else {
             Query q5 = QueryBuilders.term((t -> t.field("custom_field.task_id").value(taskId)));
             bool = QueryBuilders.bool(i -> i.must(q1, q2, q3, q4, q5));
         }
@@ -320,10 +319,12 @@ public class EsCustomFieldService {
     }
 
     //将自定义字段添加到专利
-    public String addEsCustomFieldToEs(ESCustomField esCustomField, String patentNo) throws Exception {
+    public String addEsCustomFieldToEs(ESCustomField esCustomField, String patentNo, String patentId) throws Exception {
         //根据专利号查询专利
-        PatentWithIdVO patentWithIdVO = esService.getIdByPatentNo(patentNo);
-        String patentId = patentWithIdVO.getId();
+        if (patentId == null) {
+            PatentWithIdVO patentWithIdVO = esService.getIdByPatentNo(patentNo);
+            patentId = patentWithIdVO.getId();
+        }
         Patent patentChild = new Patent();
         PatentJoin patentJoin = new PatentJoin();
         patentJoin.setParent(patentId);

src/main/java/cn/cslg/pas/service/business/invalidReport/AssoGroupFeatureService.java

@@ -179,7 +179,7 @@ public class AssoGroupFeatureService extends ServiceImpl<AssoGroupFeatureMapper,
         return true;
     }
 
-    public List<GroupFeatureHistoryVO> queryFeatureHistory(QueryFeatureHistoryDTO queryFeatureHistoryDTO) {
+    public List<AssoGroupFeature> getHistory(QueryFeatureHistoryDTO queryFeatureHistoryDTO) {
         List<AssoGroupFeature> assoGroupFeatures = new ArrayList<>();
         Integer featureGroupId = queryFeatureHistoryDTO.getFeatureGroupId();
         //根据特征id查询证据组合和特征关联
@@ -211,6 +211,12 @@ public class AssoGroupFeatureService extends ServiceImpl<AssoGroupFeatureMapper,
         if (assoGroupFeature2 != null) {
             assoGroupFeatures.add(assoGroupFeature2);
         }
+        return assoGroupFeatures;
+
+    }
+
+    public List<GroupFeatureHistoryVO> queryFeatureHistory(QueryFeatureHistoryDTO queryFeatureHistoryDTO) {
+        List<AssoGroupFeature> assoGroupFeatures = this.getHistory(queryFeatureHistoryDTO);
         //装载历史
         List<GroupFeatureHistoryVO> groupFeatureHistoryVOS = this.loadFeatureHistory(assoGroupFeatures);
         return groupFeatureHistoryVOS;
@@ -368,4 +374,27 @@ public class AssoGroupFeatureService extends ServiceImpl<AssoGroupFeatureMapper,
         }
         return true;
     }
+
+
+    public Boolean removeAssoWithHistory(List<Integer> assoIds) {
+        List<Integer> ids = new ArrayList<>();
+        //查询
+        if (assoIds == null || assoIds.size() == 0) {
+            return false;
+        }
+        assoIds.forEach(item -> {
+            QueryFeatureHistoryDTO queryFeatureHistoryDTO = new QueryFeatureHistoryDTO();
+            queryFeatureHistoryDTO.setFeatureGroupId(item);
+            List<AssoGroupFeature> assoGroupFeatures = this.getHistory(queryFeatureHistoryDTO);
+            if (assoGroupFeatures.size() > 0) {
+                List<Integer> temIds = assoGroupFeatures.stream().map(AssoGroupFeature::getId).collect(Collectors.toList());
+                ids.addAll(temIds);
+            }
+        });
+        if(ids.size()>0){
+            this.removeByIds(ids);
+        }
+        return true;
+
+    }
 }

src/main/java/cn/cslg/pas/service/business/invalidReport/EvidenceReasonService.java

@@ -55,8 +55,8 @@ public class EvidenceReasonService extends ServiceImpl<EvidenceReasonMapper, Evi
     @Transactional(rollbackFor = Exception.class)
     public Boolean addEvidenceReason(AddEvidenceReasonDTO addEvidenceReasonDTO) {
 
-        PersonnelVO personnelVO = new PersonnelVO();
-        personnelVO.setId("1");
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+
         Integer groupId = addEvidenceReasonDTO.getGroupId();
         Integer gen = addEvidenceReasonDTO.getGen();
         List<AddEvidenceReasonsDTO> addEvidenceReasonsDTOs = addEvidenceReasonDTO.getEvidenceReasonList();
@@ -85,11 +85,11 @@ public class EvidenceReasonService extends ServiceImpl<EvidenceReasonMapper, Evi
 
         }
 
-
         List<Integer> assoIds = new ArrayList<>();
         if (gen.equals(0)) {
             LambdaQueryWrapper<AssoGroupFeature> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(AssoGroupFeature::getGroupId, groupId);
+            queryWrapper.eq(AssoGroupFeature::getGroupId, groupId)
+                    .eq(AssoGroupFeature::getGroupId, gen);
             List<AssoGroupFeature> assoGroupFeatures = assoGroupFeatureService.list(queryWrapper);
             assoIds = assoGroupFeatures.stream().map(AssoGroupFeature::getId).collect(Collectors.toList());
         }
@@ -118,12 +118,14 @@ public class EvidenceReasonService extends ServiceImpl<EvidenceReasonMapper, Evi
                     assoGroupFeature.insert();
                     featureGroupId = assoGroupFeature.getId();
                 } else {
-                    assoIds.remove(featureId);
+                    assoIds.remove(featureGroupId);
+                }
+                if (assoIds.size() != 0) {
+                    //删除关联以及历史
+                    assoGroupFeatureService.removeAssoWithHistory(assoIds);
                 }
             }
-            if (assoIds.size() != 0) {
-                assoGroupFeatureService.removeByIds(assoIds);
-            }
+
             //添加无效理由
             Integer reasonId = this.addEvidenceReason(addEvidenceReasonsDTO, personnelVO.getId());
             //根据特征证据组合关联id 删除和无效理由关联
@@ -205,11 +207,11 @@ public class EvidenceReasonService extends ServiceImpl<EvidenceReasonMapper, Evi
                 //查询特征历史
                 QueryFeatureHistoryDTO queryFeatureHistoryDTO = new QueryFeatureHistoryDTO();
                 queryFeatureHistoryDTO.setFeatureGroupId(featureGroupId);
-                List<GroupFeatureHistoryVO> queryFeatureHistories = assoGroupFeatureService.queryFeatureHistory(queryFeatureHistoryDTO);
+                List<AssoGroupFeature> queryFeatureHistories = assoGroupFeatureService.getHistory(queryFeatureHistoryDTO);
 
                 Integer n = gen >= queryFeatureHistories.size() - 1 ? queryFeatureHistories.size() - 1 : gen;
-                GroupFeatureHistoryVO item = queryFeatureHistories.get(n);
-                Integer newFeatureGroupId = item.getFeatureGroupId();
+                AssoGroupFeature item = queryFeatureHistories.get(n);
+                Integer newFeatureGroupId = item.getId();
 
                 //根据特征id 查询无效理由
                 LambdaQueryWrapper<AssoFeatureReason> queryWrapper1 = new LambdaQueryWrapper<>();
@@ -227,26 +229,44 @@ public class EvidenceReasonService extends ServiceImpl<EvidenceReasonMapper, Evi
                         queryEvidenceReasonVO.setGroupId(groupId);
                         queryEvidenceReasonVO.setFeatureGroupId(featureGroupId);
                         queryEvidenceReasonVO.setFeatureHistories(queryFeatureHistories);
-                        //装载特征陈述信息
-                        queryEvidenceReasonVO.setFCommon(item.getCommon());
-                        queryEvidenceReasonVO.setFIfPresentOpinions1(item.getIfPresentOpinions1());
-                        queryEvidenceReasonVO.setFIfPresentOpinions2(item.getIfPresentOpinions2());
-                        queryEvidenceReasonVO.setFPresentOpinions1(item.getPresentOpinions1());
-                        queryEvidenceReasonVO.setFIfPresentOpinions2(item.getIfPresentOpinions2());
-                        queryEvidenceReasonVO.setFInvalidReasonDetail1(item.getInvalidReasonDetail1());
-                        queryEvidenceReasonVO.setFInvalidReasonDetail2(item.getInvalidReasonDetail2());
-                        queryEvidenceReasonVO.setFRbDecisionKey(item.getRbDecisionKey());
-                        queryEvidenceReasonVO.setFRbOpinions(item.getRbOpinions());
 
+                        //装载特征陈述信息
+                        queryEvidenceReasonVO.setFeCommon(item.getCommon());
+                        queryEvidenceReasonVO.setFeIfPresentOpinions1(item.getIfPresentOpinions1());
+                        queryEvidenceReasonVO.setFeIfPresentOpinions2(item.getIfPresentOpinions2());
+                        queryEvidenceReasonVO.setFePresentOpinions1(item.getPresentOpinions1());
+                        queryEvidenceReasonVO.setFeIfPresentOpinions2(item.getIfPresentOpinions2());
+                        queryEvidenceReasonVO.setFeInvalidReasonDetail1(item.getInvalidReasonDetail1());
+                        queryEvidenceReasonVO.setFeInvalidReasonDetail2(item.getInvalidReasonDetail2());
+                        queryEvidenceReasonVO.setFeRbDecisionKey(item.getRbDecisionKey());
+                        queryEvidenceReasonVO.setFeRbOpinions(item.getRbOpinions());
+
+                        queryEvidenceReasonVO.setFeCourtOpinions1(item.getCourtOpinions1());
+                        queryEvidenceReasonVO.setFeCourtOpinions2(item.getCourtOpinions2());
+                        queryEvidenceReasonVO.setFeProsecutorOpinions1(item.getProsecutorOpinions1());
+                        queryEvidenceReasonVO.setFeProsecutorOpinions2(item.getProsecutorOpinions2());
+                        queryEvidenceReasonVO.setFeThirdOpinions1((item.getThirdOpinions1()));
+                        queryEvidenceReasonVO.setFeThirdOpinions2(item.getThirdOpinions2());
+                        queryEvidenceReasonVO.setFeRespondentOpinions1(item.getRespondentOpinions1());
+                        queryEvidenceReasonVO.setFeRespondentOpinions2(item.getRespondentOpinions2());
                         //根据无效理由id 查询无效理由
                         EvidenceReason evidenceReason = this.getById(assoFeatureReason.getReasonId());
                         if (evidenceReason != null) {
                             queryEvidenceReasonVO.setEvidenceText(evidenceReason.getEvidenceText());
                             queryEvidenceReasonVO.setEvidenceDescription(evidenceReason.getDescription());
-                            queryEvidenceReasonVO.setRPresentOpinions1(evidenceReason.getPresentOpinions1());
-                            queryEvidenceReasonVO.setRRbDecisionKey(evidenceReason.getRbDecisionKey());
-                            queryEvidenceReasonVO.setRIfPresentOpinions1(evidenceReason.getIfPresentOpinions1());
-                            queryEvidenceReasonVO.setRRbOpinions(evidenceReason.getRbOpinions());
+                            queryEvidenceReasonVO.setErPresentOpinions1(evidenceReason.getPresentOpinions1());
+                            queryEvidenceReasonVO.setErRbDecisionKey(evidenceReason.getRbDecisionKey());
+                            queryEvidenceReasonVO.setErIfPresentOpinions1(evidenceReason.getIfPresentOpinions1());
+                            queryEvidenceReasonVO.setErRbOpinions(evidenceReason.getRbOpinions());
+
+                            queryEvidenceReasonVO.setErCourtOpinions1(evidenceReason.getCourtOpinions1());
+                            queryEvidenceReasonVO.setErCourtOpinions2(evidenceReason.getCourtOpinions2());
+                            queryEvidenceReasonVO.setErProsecutorOpinions1(evidenceReason.getProsecutorOpinions1());
+                            queryEvidenceReasonVO.setErProsecutorOpinions2(evidenceReason.getProsecutorOpinions2());
+                            queryEvidenceReasonVO.setErThirdOpinions1((evidenceReason.getThirdOpinions1()));
+                            queryEvidenceReasonVO.setErThirdOpinions2(evidenceReason.getThirdOpinions2());
+                            queryEvidenceReasonVO.setErRespondentOpinions1(evidenceReason.getRespondentOpinions1());
+                            queryEvidenceReasonVO.setErRespondentOpinions2(evidenceReason.getRespondentOpinions2());
                             queryEvidenceReasonVO.setEvidenceReasonId(evidenceReason.getId());
                         }
                         //根据无效理由id查询对比文献
@@ -374,4 +394,5 @@ public class EvidenceReasonService extends ServiceImpl<EvidenceReasonMapper, Evi
         return true;
 
     }
+
 }

src/main/java/cn/cslg/pas/service/query/FormatQueryService.java

@@ -244,12 +244,11 @@ public class FormatQueryService {
                 condition = queryRequest.getGroupField() + "=" + queryRequest.getGroupFieldValue();
             }
         }
-        if(queryRequest.getProjectId()!=null){
+        if (queryRequest.getProjectId() != null) {
             if (condition != null && condition != "") {
-                condition += " AND " + "project_id"+ "=" +queryRequest.getProjectId();
-            }
-            else {
-                condition = "project_id"+ "=" +queryRequest.getProjectId();
+                condition += " AND " + "project_id" + "=" + queryRequest.getProjectId();
+            } else {
+                condition = "project_id" + "=" + queryRequest.getProjectId();
             }
         }
 
@@ -447,7 +446,7 @@ public class FormatQueryService {
                     Query q2 = this.HandleValueNode(field, operate, (treeNode) valeNode.getRight(), configName);
                     switch (operate1.getShowName()) {
                         case "AND":
-                            return  QueryBuilders.bool(i -> i.must(q1, q2));
+                            return QueryBuilders.bool(i -> i.must(q1, q2));
                         case "OR":
                             return QueryBuilders.bool(i -> i.should(q1, q2));
                         case "NOT":

src/main/resources/mapper/ReportProjectMapper.xml

@@ -8,7 +8,7 @@
         createId,p.create_time as createTime, rp.report_type as reportType ,p.head_id as headId,p.department_id as
         departmentId,
         p.entrust_type as entrustType,p.entrust_id as entrustId,rp.product_or_tech as productOrTech,rp.cron_description
-        as cronDescription ,rp.status as status from report as rp left join project as p
+        as cronDescription ,rp.status as status,rp.if_second_invalid as ifSecondInvalid from report as rp left join project as p
         on rp.project_id =p.id left join asso_report_cron arc on p.id =arc.project_id
         left join asso_project_event as aspe on p.id =aspe.project_id
         <if test="sql1!=''">

src/test/java/cn/cslg/pas/service/AvoidDesignServiceTests.java

@@ -58,8 +58,6 @@ public class AvoidDesignServiceTests {
         Integer size = 1;
         Integer a = gen >= size ? size : gen;
         System.out.println(a);
-//        Integer projectId = 49;
-//        Response response = avoidDesignController.getAvoidDesign(projectId);
-//        System.out.println("-----" + response.getData());
+
     }
 }

src/test/java/cn/cslg/pas/service/EsCustomFiedTests.java

@@ -44,7 +44,7 @@ String patentNo="CN200920148721.1";
         esCustomField.setStatsValue(Arrays.asList("高相关"));
         esCustomField.setFieldValue(Arrays.asList("高相关"));
         esCustomField.setFieldType(1);
-String a =esCustomFieldService.addEsCustomFieldToEs(esCustomField,patentNo);
+String a =esCustomFieldService.addEsCustomFieldToEs(esCustomField,patentNo,"");
 System.out.println(a);
     }
 

src/test/java/cn/cslg/pas/service/PatentClaimServiceTest.java

@@ -1,8 +1,10 @@
 package cn.cslg.pas.service;
 
 
+import cn.cslg.pas.common.dto.DomainFieldDTO;
 import cn.cslg.pas.common.dto.invalidDTO.QueryClaimDTO;
 import cn.cslg.pas.common.dto.invalidDTO.SplitClaimDTO;
+import cn.cslg.pas.common.dto.invalidDTO.UpdateClaimMessageDTO;
 import cn.cslg.pas.common.vo.invalidReport.PatentClaimVO;
 import cn.cslg.pas.service.business.invalidReport.PatentClaimService;
 import org.junit.Test;
@@ -11,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @SpringBootTest
@@ -36,5 +39,18 @@ public class PatentClaimServiceTest {
         System.out.println(patentClaimVOS);
     }
 
-
+    @Test
+    public void updateClaimMessage() {
+        List<UpdateClaimMessageDTO> updateClaimMessageDTOs =new ArrayList<>();
+        UpdateClaimMessageDTO updateClaimMessageDTO =new UpdateClaimMessageDTO();
+        updateClaimMessageDTO.setClaimId(56);
+        List<DomainFieldDTO> dtos =new ArrayList<>();
+        DomainFieldDTO dto =new DomainFieldDTO();
+        dto.setField("rbDecision");
+        dto.setValue("复审委决定通过");
+        dtos.add(dto);
+        updateClaimMessageDTO.setDomainFieldDTOs(dtos);
+        updateClaimMessageDTOs.add(updateClaimMessageDTO);
+        patentClaimService.updateClaimMessage(updateClaimMessageDTOs);
+    }
 }