Merge remote-tracking branch 'origin/master'

src/main/java/cn/cslg/pas/common/config/WebSocketConfig.java

@@ -6,8 +6,8 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
 @Configuration
 public class WebSocketConfig {
-//    @Bean
-//    public ServerEndpointExporter serverEndpointExporter() {
-//        return new ServerEndpointExporter();
-//    }
+    @Bean
+    public ServerEndpointExporter serverEndpointExporter() {
+        return new ServerEndpointExporter();
+    }
 }

src/main/java/cn/cslg/pas/common/core/base/RedisConf.java

@@ -25,4 +25,5 @@ public class RedisConf {
     public final static String FIELD_COUNT = "field_count";
     public final static String PROJECT = "project";
     public final static String PRODUCT = "product";
+    public final static String EVIDENCE_REASON = "evidence_reason";
 }

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

@@ -9,6 +9,7 @@ import java.util.List;
 
 /**
  * 证据组合
+ *
  * @Author xiexiang
  * @Date 2023/12/25
  */
@@ -34,9 +35,12 @@ public class AddProofGroupDTO {
      */
     private Integer claimId;
 
-    /**
-     * 证据组合说明
-     */
-    private List<String> descriptions;
+    private List<Descriptions> descriptions;
+
+    @Data
+    public static class Descriptions {
+        private String description1;
+        private String description2;
 
+    }
 }

src/main/java/cn/cslg/pas/common/vo/PersonSelfFieldVO.java

@@ -19,6 +19,7 @@ public class PersonSelfFieldVO {
      * 返回值名
      */
     private String value;
+    private String field;
     /**
      * 排序
      */

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

@@ -112,5 +112,5 @@ public class ProofGroupVO {
 
     private String courtOpinions2;
 
-
+    private String description2;
 }

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

@@ -236,14 +236,24 @@ public class PatentController {
     @Operation(summary = "发明人/权利人/申请人合并后的名称移除")
     @PostMapping("/delMergedName")
     public Response delMergedName(@RequestBody MergedNameVO vo) throws Exception {
-        Integer id = mergePersonService.delMergedName(vo);
+        Integer id = null;
+        try {
+            id = mergePersonService.delMergedName(vo);
+        } catch (Exception e) {
+            return Response.success(e.getMessage());
+        }
         return Response.success(id);
     }
 
     @Operation(summary = "发明人/权利人/申请人合并记录删除")
     @PostMapping("/delMergePerson")
     public Response delMergePerson(@RequestBody MergePersonIdVO vo) throws Exception {
-        Integer id = mergePersonService.delMergePerson(vo);
+        Integer id = null;
+        try {
+            id = mergePersonService.delMergePerson(vo);
+        } catch (Exception e) {
+            return Response.success(e.getMessage());
+        }
         return Response.success(id);
     }
 

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

@@ -98,4 +98,28 @@ public class PersonFieldController {
         records.setData(getAllPatentCountVOS);
         return Response.success(records);
     }
+
+    @Operation(summary = "获得无效理由和证据表格显示栏位")
+    @PostMapping("/getEvidenceReasonTableColumns")
+    public Response getEvidenceReasonTableColumns(@RequestBody GetTabelColumDTO getTabelColumDTO) throws Exception {
+        Records records = new Records();
+        try {
+            List<PersonSelfFieldVO> personSelfFieldVOS = personFieldService.getEvidenceReasonTableColumns(getTabelColumDTO);
+
+            records.setData(personSelfFieldVOS);
+        }
+      catch (Exception e){
+            return Response.error(e.getMessage());
+      }
+        return Response.success(records);
+    }
+
+    @Operation(summary = "设置无效理由和证据表格显示栏位")
+    @PostMapping("/setEvidenceReasonTableColumns")
+    public Response setEvidenceReasonTableColumns(@RequestBody AddSelfFieldDTO addSelfFieldDTO) throws Exception {
+        List<PersonSelfFieldVO> personSelfFieldVOS = personFieldService.setEvidenceReasonTableColumns(addSelfFieldDTO);
+        Records records = new Records();
+        records.setData(personSelfFieldVOS);
+        return Response.success(records);
+    }
 }

src/main/java/cn/cslg/pas/factorys/reGroupFactory/GetEventScenarioGroup.java

@@ -0,0 +1,56 @@
+package cn.cslg.pas.factorys.reGroupFactory;
+
+import cn.cslg.pas.common.model.cronModel.ReGroupDataVO;
+import cn.cslg.pas.common.vo.GroupReVO;
+import cn.cslg.pas.domain.business.SystemDict;
+import cn.cslg.pas.mapper.EventMapper;
+import cn.cslg.pas.service.business.SystemDictService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+
+
+@Slf4j
+@Component
+public class GetEventScenarioGroup implements QueryGroupImp {
+    @Autowired
+    private EventMapper eventMapper;
+    @Autowired
+    private SystemDictService systemDictService;
+
+    @Override
+    public ReGroupDataVO getGroup(List<String> sqls, String tableName, String groupField) {
+        ReGroupDataVO reGroupDataVO = new ReGroupDataVO();
+        List<Map<String, Object>> maps = new ArrayList<>();
+        String selectField = groupField;
+        List<SystemDict> systemDictList = systemDictService.getSystemDictListByType(Arrays.asList("ENTERPRISE_APPLICATION_SCENARIO"));
+        //分组查询应用场景
+        List<GroupReVO> scenarioIds = eventMapper.getGroups(sqls, tableName, groupField, selectField);
+        Long total = eventMapper.getGroupsCount(sqls, tableName, groupField, selectField);
+        //装载应用场景名称
+        scenarioIds.forEach(item -> {
+            if (item.getValue() .equals("0")) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("name", "未知");
+                map.put("value", "未知");
+                map.put("count", item.getNum());
+                maps.add(map);
+            } else {
+                SystemDict systemDict = systemDictList.stream().filter(tem -> tem.getValue().equals(item.getValue())).findFirst().orElse(null);
+                if (systemDict != null) {
+                    Map<String, Object> map = new HashMap<>();
+                    map.put("name", systemDict.getLabel());
+                    map.put("value", systemDict.getValue());
+                    map.put("count", item.getNum());
+                    maps.add(map);
+                }
+            }
+        });
+        reGroupDataVO.setValues(maps);
+        reGroupDataVO.setTotal(total);
+        return reGroupDataVO;
+    }
+
+}

src/main/java/cn/cslg/pas/service/ReportExportService.java

@@ -142,7 +142,9 @@ public class ReportExportService {
 
     private XWPFTemplate Torttemplate(Integer reportId, String filePath) throws IOException {
         //根据报告Id查询标的专利号
-        ReportProject report = reportProjectService.getById(reportId);
+        LambdaQueryWrapper<ReportProject> projectLambdaQueryWrapper =new LambdaQueryWrapper<>();
+        projectLambdaQueryWrapper.eq(ReportProject::getProjectId,reportId);
+        ReportProject report = reportProjectService.getOne(projectLambdaQueryWrapper,false);
         String patentNo = report.getSignPatentNo();
 //        PatentVO patentVO = new PatentVO();
 //        patentVO.setPatentNos(Arrays.asList(patentNo));

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

@@ -76,10 +76,10 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
     @Transactional(rollbackFor = Exception.class)
     public Object queryMessage(QueryRequest queryRequest) throws Exception {
 
-       List<String> sqls = formatQueryService.reSqls(queryRequest,"event");
-        sqls=this.loadSearchSql(sqls);
-       //根据sql查询事件信息
-        List<EventVO> eventVOS = eventMapper.getEvent(sqls.get(0),sqls.get(1),sqls.get(2));
+        List<String> sqls = formatQueryService.reSqls(queryRequest, "event");
+        sqls = this.loadSearchSql(sqls);
+        //根据sql查询事件信息
+        List<EventVO> eventVOS = eventMapper.getEvent(sqls.get(0), sqls.get(1), sqls.get(2));
 
         //查询总数
         Long total = eventMapper.getEventCount(sqls.get(0));
@@ -177,7 +177,7 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object updateMessage(Object object, List<MultipartFile> files) {
-        PersonnelVO personnelVO =cacheUtils.getLoginUser(loginUtils.getId());
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
         UpdateEventDTO updateEventDTO = (UpdateEventDTO) object;
         //检查事件格式
         if (updateEventDTO == null || updateEventDTO.getId() == null) {
@@ -191,7 +191,7 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
         LambdaQueryWrapper<Event> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(Event::getName, name);
         List<Event> events = this.list(queryWrapper);
-        if (!updateEventDTO.getName().equals(event.getName())  && events.size() != 0) {
+        if (!updateEventDTO.getName().equals(event.getName()) && events.size() != 0) {
             throw new XiaoShiException("名称重复");
         }
         BeanUtils.copyProperties(updateEventDTO, event);
@@ -253,15 +253,15 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
      * @throws Exception
      */
     @Transactional(rollbackFor = Exception.class)
-    public Object getGroup(GroupRequest groupRequest,String tableName) throws Exception {
-        StringRequest stringRequest =new StringRequest();
-        BeanUtils.copyProperties(groupRequest,stringRequest);
-        List<String> sqls = formatQueryService.reSqls(stringRequest,tableName);
-        sqls =this.loadSearchSql(sqls);
+    public Object getGroup(GroupRequest groupRequest, String tableName) throws Exception {
+        StringRequest stringRequest = new StringRequest();
+        BeanUtils.copyProperties(groupRequest, stringRequest);
+        List<String> sqls = formatQueryService.reSqls(stringRequest, tableName);
+        sqls = this.loadSearchSql(sqls);
         //格式化 分组
-        GroupConfig groupConfig=null;
+        GroupConfig groupConfig = null;
         if (groupRequest.getGroupBy() != null) {
-            String json = CommonService.readJsonFile(tableName+".json");
+            String json = CommonService.readJsonFile(tableName + ".json");
             List<GroupConfig> groupConfigs = JSON.parseArray(json, GroupConfig.class);
             groupConfig = groupConfigs.stream().filter(item -> groupRequest.getGroupBy().equals(item.getField())).findFirst().orElse(null);
             if (groupConfig == null) {
@@ -271,7 +271,7 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
 
         //返回分组数据
         QueryGroupImp queryGroupImp = queryGroupFactory.getClass(groupConfig.getGroupClass());
-        ReGroupDataVO  reGroupDataVO = queryGroupImp.getGroup(sqls, tableName, groupConfig.getSqlField());
+        ReGroupDataVO reGroupDataVO = queryGroupImp.getGroup(sqls, tableName, groupConfig.getSqlField());
 
         //装载数据
         GroupVO groupVO = new GroupVO();
@@ -355,9 +355,9 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
         //查询文件
         if (guids.size() != 0) {
             String res = fileManagerService.getSystemFileFromFMS(guids);
-if(res!=null&&!res.trim().equals("")) {
-    systemFiles = JSONObject.parseArray(res, SystemFile.class);
-}
+            if (res != null && !res.trim().equals("")) {
+                systemFiles = JSONObject.parseArray(res, SystemFile.class);
+            }
         }
 
         //查询关联报告或专题库
@@ -434,33 +434,35 @@ if(res!=null&&!res.trim().equals("")) {
 
     }
 
-public List<Integer> getEventIdByName(String value,Boolean ifEqual){
-    LambdaQueryWrapper<Event> queryWrapper = new LambdaQueryWrapper<>();
-    queryWrapper.select(Event::getId);
-    if (ifEqual != null && ifEqual.equals(true)) {
-        queryWrapper.like(Event::getName, value);
-    } else {
-        queryWrapper.eq(Event::getName, value);
-    }
-    java.util.function.Function<Object, Integer> f = (o -> Integer.parseInt(o.toString()));
-    List<Integer> ids = this.listObjs(queryWrapper, f);
-    return ids;
+    public List<Integer> getEventIdByName(String value, Boolean ifEqual) {
+        LambdaQueryWrapper<Event> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.select(Event::getId);
+        if (ifEqual != null && ifEqual.equals(true)) {
+            queryWrapper.like(Event::getName, value);
+        } else {
+            queryWrapper.eq(Event::getName, value);
+        }
+        java.util.function.Function<Object, Integer> f = (o -> Integer.parseInt(o.toString()));
+        List<Integer> ids = this.listObjs(queryWrapper, f);
+        return ids;
 
-}
+    }
 
 
     //装载查询语句
-    private List<String> loadSearchSql(List<String> sqls){
-        PersonnelVO personnelVO =cacheUtils.getLoginUser(loginUtils.getId());
-        Integer tenant_id =personnelVO.getTenantId();
-        String rootSql ="(tenant_id ="+tenant_id+")";
-        if(sqls.get(0)!=null&&!sqls.get(0).equals(""))
-        {
-            sqls.set(0,rootSql+" and"+"("+sqls.get(0)+")");
-
+    private List<String> loadSearchSql(List<String> sqls) {
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        Integer tenant_id = personnelVO.getTenantId();
+        Integer roleType = personnelVO.getRoleType();
+        String rootSql = "";
+        if (roleType == null || roleType.equals(2) || roleType.equals(0)) {
+            rootSql = "(tenant_id =" + tenant_id + ")";
         }
-        else {
-            sqls.set(0,rootSql);
+
+        if (sqls.get(0) != null && !sqls.get(0).equals("")&&!rootSql.equals("")) {
+            sqls.set(0, rootSql + " and" + "(" + sqls.get(0) + ")");
+        } else if((sqls.get(0) == null ||sqls.get(0).equals(""))&&!rootSql.equals("")){
+            sqls.set(0, rootSql);
         }
 
         return sqls;

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

@@ -177,7 +177,10 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
                                 for (String mergedName : mergedNames) {
                                     this.delSingleMerge(appId, type, mergedName);
                                 }
-                                this.add(appId, type, mergePersonList);
+                                Integer num = this.add(appId, type, mergePersonList);
+                                if (num < 0) {
+                                    throw new XiaoShiException("合并失败");
+                                }
                             }
                         }
                     }
@@ -191,7 +194,10 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
                                 for (String mergedName : mergedNames) {
                                     this.delSingleMerge(rightId, type, mergedName);
                                 }
-                                this.add(rightId, type, mergePersonList);
+                                Integer num = this.add(rightId, type, mergePersonList);
+                                if (num < 0) {
+                                    throw new XiaoShiException("合并失败");
+                                }
                             }
                         }
                     }
@@ -205,12 +211,17 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
                                 for (String mergedName : mergedNames) {
                                     this.delSingleMerge(inventorId, type, mergedName);
                                 }
-                                this.add(inventorId, type, mergePersonList);
+                                Integer add = this.add(inventorId, type, mergePersonList);
+                                if (add < 0) {
+                                    throw new XiaoShiException("合并失败");
+                                }
                             }
                         }
                     }
                 }
             }
+        } else {
+            throw new XiaoShiException("合并失败");
         }
         return person.getId();
     }
@@ -250,31 +261,6 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
         return map;
     }
 
-    public List<EsMergePersonDTO> getChildMergePersonDTO(String id, Integer projectId, String mergeType) throws IOException {
-        List<EsMergePersonDTO> list = new ArrayList<>();
-        String path = mergeType + "." + "project_id";
-        SearchRequest.Builder builder = new SearchRequest.Builder();
-        //设置查询索引
-        builder.index("patent");
-        Query idQ = QueryBuilders.term(i -> i.field(path).value(projectId));
-        Query query = QueryBuilders.nested(i -> i.path(mergeType).query(idQ));
-        IdsQuery idsQuery = IdsQuery.of(n -> n.values(Arrays.asList(id)));
-        Query q = QueryBuilders.hasParent(i -> i.parentType("patent").query(j -> j.ids(idsQuery)));
-        Query bool = QueryBuilders.bool(i -> i.must(q, query));
-        builder.query(bool);
-        SearchResponse<PatentMergePerson> response = client.search(builder.build(), PatentMergePerson.class);
-        List<Hit<PatentMergePerson>> hits = response.hits().hits();
-        for (Hit<PatentMergePerson> hit : hits) {
-            PatentMergePerson person = hit.source();
-            EsMergePersonDTO dto = new EsMergePersonDTO();
-            dto.setId(hit.id());
-            dto.setRouting(hit.routing());
-            BeanUtils.copyProperties(person, dto);
-            list.add(dto);
-        }
-        return list;
-    }
-
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
     public Integer mergePersonAgain(MergePersonAgainVO vo) throws Exception {
         List<String> mergedNames = vo.getNeedMergedName();
@@ -368,7 +354,6 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
                     Query q = QueryBuilders.term(i -> i.field("merge_inventor.name.raw").value(name));
                     Query bool = QueryBuilders.bool(i -> i.must(idQ, q));
                     Query query = QueryBuilders.nested(i -> i.path("merge_inventor").query(bool));
-//                    Query bool = QueryBuilders.bool(i -> i.must(idQ, q));
                     Query childQ = QueryBuilders.hasChild(i -> i.type("merge_inventor").query(query));
                     queries.add(childQ);
                 }
@@ -409,6 +394,8 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
                             }
                         }
                     }
+                } else {
+                    throw new XiaoShiException("编辑失败");
                 }
             }
         } else {
@@ -550,36 +537,18 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
             if (type == 0) {
                 Query q1 = QueryBuilders.term(i -> i.field("merge_applicant.project_id").value(projectId));
                 Query query1 = QueryBuilders.nested(i -> i.path("merge_applicant").query(q1));
-                if (StringUtils.isNotEmpty(name)) {
-                    Query q3 = QueryBuilders.match(i -> i.field("merge_applicant.name").query(name));
-                    Query query3 = QueryBuilders.nested(i -> i.path("merge_applicant").query(q3));
-                    Query bool = QueryBuilders.bool(i -> i.must(query1).should(query3));
-                    queries.add(bool);
-                } else {
-                    queries.add(query1);
-                }
+                Query childQ1 = QueryBuilders.hasChild(i -> i.type("merge_applicat").query(query1));
+                queries.add(childQ1);
 
                 Query q2 = QueryBuilders.term(i -> i.field("merge_right_holder.project_id").value(projectId));
                 Query query2 = QueryBuilders.nested(i -> i.path("merge_right_holder").query(q2));
-                if (StringUtils.isNotEmpty(name)) {
-                    Query q4 = QueryBuilders.match(i -> i.field("merge_right_holder.name").query(name));
-                    Query query4 = QueryBuilders.nested(i -> i.path("merge_applicant").query(q4));
-                    Query bool1 = QueryBuilders.bool(i -> i.must(query2).should(query4));
-                    queries.add(bool1);
-                } else {
-                    queries.add(query2);
-                }
+                Query childQ2 = QueryBuilders.hasChild(i -> i.type("merge_right_holder").query(query2));
+                queries.add(childQ2);
             } else {
                 Query q = QueryBuilders.term(i -> i.field("merge_inventor.project_id").value(projectId));
                 Query query = QueryBuilders.nested(i -> i.path("merge_inventor").query(q));
-                if (StringUtils.isNotEmpty(name)) {
-                    Query q5 = QueryBuilders.match(i -> i.field("merge_inventor.name").query(name));
-                    Query query5 = QueryBuilders.nested(i -> i.path("merge_inventor").query(q5));
-                    Query bool1 = QueryBuilders.bool(i -> i.must(query).should(query5));
-                    queries.add(bool1);
-                } else {
-                    queries.add(query);
-                }
+                Query childQ = QueryBuilders.hasChild(i -> i.type("merge_inventor").query(query));
+                queries.add(childQ);
             }
             Query bool = QueryBuilders.bool(i -> i.should(queries));
             builder.query(bool);
@@ -591,26 +560,53 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
             SearchResponse<Patent> response = client.search(builder.build(), Patent.class);
             List<Hit<Patent>> hits = response.hits().hits();
 
+            Map<String, Patent> map = new HashMap<>();
             for (Hit<Patent> hit : hits) {
-                Patent esMess = hit.source();
-                GetEsAllPersonDTO personDTO = new GetEsAllPersonDTO();
-                if (!CollectionUtils.isEmpty(esMess.getMergeInventor())) {
-                    personDTO.setMergeApplicant(esPatentService.loadMergeName(esMess.getMergeApplicant()));
-                }
-                if (!CollectionUtils.isEmpty(esMess.getMergeRightHolder())) {
-                    personDTO.setMergeRightHolder(esPatentService.loadMergeName(esMess.getMergeRightHolder()));
-                }
-                if (!CollectionUtils.isEmpty(esMess.getMergeInventor())) {
-                    personDTO.setMergeInventor(esPatentService.loadMergeName(esMess.getMergeInventor()));
+                String id = hit.id();
+                map.put(id, hit.source());
+            }
+
+            if (!CollectionUtils.isEmpty(map)) {
+                for (String id : map.keySet()) {
+                    GetEsAllPersonDTO personDTO = new GetEsAllPersonDTO();
+                    if (type == 0) {
+                        //申请人
+                        Map<String, List<PatentMergePerson>> appMap = this.getChildMergePerson(id, projectId, "merge_applicant");
+                        if (!CollectionUtils.isEmpty(appMap)) {
+                            for (String appId : appMap.keySet()) {
+                                List<PatentMergePerson> appList = appMap.get(appId);
+                                List<String> collect = appList.stream().map(PatentMergePerson::getName).collect(Collectors.toList());
+                                personDTO.setMergeApplicant(collect);
+                            }
+                        }
+                        //权利人
+                        Map<String, List<PatentMergePerson>> rightMap = this.getChildMergePerson(id, projectId, "merge_right_holder");
+                        if (!CollectionUtils.isEmpty(rightMap)) {
+                            for (String rightId : rightMap.keySet()) {
+                                List<PatentMergePerson> rightList = rightMap.get(rightId);
+                                List<String> collect = rightList.stream().map(PatentMergePerson::getName).collect(Collectors.toList());
+                                personDTO.setMergeRightHolder(collect);
+                            }
+                        }
+                    } else {
+                        //发明人
+                        Map<String, List<PatentMergePerson>> inventorMap = this.getChildMergePerson(id, projectId, "merge_inventor");
+                        if (!CollectionUtils.isEmpty(inventorMap)) {
+                            for (String inventorId : inventorMap.keySet()) {
+                                List<PatentMergePerson> inventorList = inventorMap.get(inventorId);
+                                List<String> collect = inventorList.stream().map(PatentMergePerson::getName).collect(Collectors.toList());
+                                personDTO.setMergeInventor(collect);
+                            }
+                        }
+                    }
+                    personDTOS.add(personDTO);
                 }
-                personDTOS.add(personDTO);
             }
         }
 
 
 
         //es申请人/权利人
-        List<GetAllPersonDTO> personDTOList = new ArrayList<>();
         List<String> mergeList = new ArrayList<>();
         if (!CollectionUtils.isEmpty(personDTOS)) {
             if (type == 0) {
@@ -625,8 +621,6 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
                         rightList = personDTO.getMergeRightHolder();
                         mergeList.addAll(rightList);
                     }
-
-
                 }
             } else {
                 for (GetEsAllPersonDTO personDTO : personDTOS) {
@@ -640,26 +634,44 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
             }
         }
 
+        List<GetAllPersonDTO> personDTOList = new ArrayList<>();
+        List<GetAllPersonDTO> mergePersonList = new ArrayList<>();
+        List<GetAllPersonDTO> personList = new ArrayList<>();
+
         List<String> nameList = mergeList.stream().distinct().collect(Collectors.toList());
         for (String key : nameList) {
-            GetAllPersonDTO dto = new GetAllPersonDTO();
-            dto.setName(key);
             MergePerson person = mergePersonMapper.selectOne(new LambdaQueryWrapper<MergePerson>()
-                    .eq(MergePerson::getName, key));
+                    .eq(MergePerson::getName, key)
+                    .eq(MergePerson::getProjectId, projectId));
             if (ObjectUtils.isNotEmpty(person)) {
+                GetAllPersonDTO dto = new GetAllPersonDTO();
+                dto.setName(person.getName());
                 dto.setMergeId(person.getId());
                 dto.setType(person.getType());
                 dto.setRemark(person.getRemark());
                 dto.setAbbreviation(person.getAbbreviation());
                 dto.setCountry(person.getCountry());
                 dto.setProvince(person.getProvince());
+                dto.setAddress(person.getAddress());
+                mergePersonList.add(dto);
+            } else {
+                GetAllPersonDTO dto = new GetAllPersonDTO();
+                dto.setName(key);
+                personList.add(dto);
             }
-            personDTOList.add(dto);
         }
 
+        if (!CollectionUtils.isEmpty(mergePersonList)) {
+            List<GetAllPersonDTO> collect = mergePersonList.stream().sorted(Comparator.comparing(GetAllPersonDTO::getName)).collect(Collectors.toList());
+            personDTOList.addAll(collect);
+        }
+
+        if (!CollectionUtils.isEmpty(personList)) {
+            List<GetAllPersonDTO> collect = personList.stream().sorted(Comparator.comparing(GetAllPersonDTO::getName)).collect(Collectors.toList());
+            personDTOList.addAll(collect);
+        }
 
-        List<GetAllPersonDTO> collect = personDTOList.stream().skip((pageNum - 1) * pageSize).limit(pageSize)
-                .sorted(Comparator.comparing(GetAllPersonDTO::getName).reversed()).collect(Collectors.toList());
+        List<GetAllPersonDTO> collect = personDTOList.stream().skip((pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
 
         Records records = new Records();
         records.setCurrent(pageNum);
@@ -804,6 +816,8 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
                     }
 
                 }
+            } else {
+                throw new XiaoShiException("移除失败");
             }
         }
         return mergePerson.getId();
@@ -932,8 +946,9 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
                             }
                         }
                     }
+                } else {
+                    throw new XiaoShiException("删除失败");
                 }
-
             }
         }
         return vo.getId();
@@ -1054,24 +1069,33 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
 
 
     public Integer add(String id,Integer type,List<PatentMergePerson> mergePersonList) {
-        String source = "";
-        if (type == 0) {
-            source = "if (ctx._source.merge_applicant != null) {ctx._source.merge_applicant.add(params.data)} else { List list = new ArrayList();list.add(params.data);ctx._source.merge_applicant = list;}" +
-                    "if (ctx._source.merge_right_holder  != null) { ctx._source.merge_right_holder.add(params.data)} else { List list = new ArrayList();list.add(params.data);ctx._source.merge_right_holder = list;}";
-        } else {
-            source = "if (ctx._source.merge_inventor != null) {ctx._source.merge_inventor.add(params.data)} else { List list = new ArrayList();list.add(params.data);ctx._source.merge_inventor = list;}";
-        }
-        String finalSource = source;
-        InlineScript inlineScript = InlineScript.of(i -> i.lang("painless").params("data", JsonData.of(mergePersonList)).source(finalSource));
-        Script script = Script.of(i -> i.inline(inlineScript));
-        Query query = QueryBuilders.term(i -> i.field("_id").value(id));
-        UpdateByQueryRequest request = UpdateByQueryRequest.of(i -> i.index("patent").script(script).query(query));
-        try {
-            client.updateByQuery(request);
-            return 1;
-        } catch (IOException e) {
-            return -1;
+        Integer flag = null;
+        for (PatentMergePerson mergePerson : mergePersonList) {
+            Map<String, JsonData> map = new HashMap<>();
+            map.put("name", JsonData.of(mergePerson.getName()));
+            map.put("project_id", JsonData.of(mergePerson.getProjectId()));
+            map.put("type", JsonData.of(mergePerson.getType()));
+            map.put("order", JsonData.of(mergePerson.getOrder()));
+            String source = "";
+            if (type == 0) {
+                source = "if (ctx._source.merge_applicant != null) {ctx._source.merge_applicant.add(params.data)} else { List list = new ArrayList();list.add(params.data);ctx._source.merge_applicant = list;}" +
+                        "if (ctx._source.merge_right_holder  != null) { ctx._source.merge_right_holder.add(params.data)} else { List list = new ArrayList();list.add(params.data);ctx._source.merge_right_holder = list;}";
+            } else {
+                source = "if (ctx._source.merge_inventor != null) {ctx._source.merge_inventor.add(params.data)} else { List list = new ArrayList();list.add(params.data);ctx._source.merge_inventor = list;}";
+            }
+            String finalSource = source;
+            InlineScript inlineScript = InlineScript.of(i -> i.lang("painless").params("data", JsonData.of(map)).source(finalSource));
+            Script script = Script.of(i -> i.inline(inlineScript));
+            Query query = QueryBuilders.term(i -> i.field("_id").value(id));
+            UpdateByQueryRequest request = UpdateByQueryRequest.of(i -> i.index("patent").script(script).query(query));
+            try {
+                client.updateByQuery(request);
+                flag += 1;
+            } catch (IOException e) {
+                flag += -1;
+            }
         }
+        return flag;
     }
 
     public Integer edit(String id,Integer type,String oldName, String newName) {

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

@@ -761,14 +761,21 @@ public class PatentDigProjectService extends ServiceImpl<PatentDigProjectMapper,
     private List<String> loadSearchSql(List<String> sqls){
         PersonnelVO personnelVO =cacheUtils.getLoginUser(loginUtils.getId());
         String id =personnelVO.getId();
-        String rootSql ="(p.create_id ="+id+" or p.head_id="+id+" or p.id in (select project_id from asso_project_person where person_id ="+id+"))";
-        if(sqls.get(0)!=null&&!sqls.get(0).equals(""))
-        {
-            sqls.set(0,rootSql+" and"+"("+sqls.get(0)+")");
+        Integer tenantId= personnelVO.getTenantId();
+        Integer roleType = personnelVO.getRoleType();
+        String rootSql = "";
+        if (roleType == null || roleType.equals(0)) {
+            rootSql ="(p.create_id ="+id+" or p.head_id="+id+" or p.id in (select project_id from asso_project_person where person_id ="+id+"))";
 
         }
-        else {
-            sqls.set(0,rootSql);
+        else if(roleType.equals(2))
+        {
+            rootSql="p.tenantId="+tenantId;
+        }
+        if (sqls.get(0) != null && !sqls.get(0).equals("") && !rootSql.equals("")) {
+            sqls.set(0, rootSql + " and" + "(" + sqls.get(0) + ")");
+        } else if ((sqls.get(0) == null || sqls.get(0).equals("")) && !rootSql.equals("")) {
+            sqls.set(0, rootSql);
         }
 
         return sqls;

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

@@ -881,14 +881,22 @@ public class PatentProjectService extends ServiceImpl<PatentProjectMapper, Paten
     private List<String> loadSearchSql(List<String> sqls){
         PersonnelVO personnelVO =cacheUtils.getLoginUser(loginUtils.getId());
         String id =personnelVO.getId();
-        String rootSql ="(p.create_id ="+id+" or p.head_id="+id+" or p.id in (select project_id from asso_project_person where person_id ="+id+"))";
-        if(sqls.get(0)!=null&&!sqls.get(0).equals(""))
-        {
-            sqls.set(0,"("+rootSql+") and"+"("+sqls.get(0)+")");
+        Integer tenantId= personnelVO.getTenantId();
+        Integer roleType = personnelVO.getRoleType();
+        String rootSql = "";
+        if (roleType == null || roleType.equals(0)) {
+           rootSql ="(p.create_id ="+id+" or p.head_id="+id+" or p.id in (select project_id from asso_project_person where person_id ="+id+"))";
 
         }
-        else {
-            sqls.set(0,rootSql);
+        else if(roleType.equals(2))
+        {
+            rootSql="p.tenantId="+tenantId;
+        }
+
+        if (sqls.get(0) != null && !sqls.get(0).equals("") && !rootSql.equals("")) {
+            sqls.set(0, rootSql + " and" + "(" + sqls.get(0) + ")");
+        } else if ((sqls.get(0) == null || sqls.get(0).equals("")) && !rootSql.equals("")) {
+            sqls.set(0, rootSql);
         }
 
         return sqls;

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

@@ -508,20 +508,28 @@ public class ProductCategoryService extends ServiceImpl<ProductCategoryMapper, P
     private List<String> loadSearchSql(List<String> sqls){
         PersonnelVO personnelVO =cacheUtils.getLoginUser(loginUtils.getId());
         String id =personnelVO.getId();
-        Integer tenantId =personnelVO.getTenantId();
-        String rootSql ="category.create_id="+id+" or(category.show_type =0 and category.tenant ="+tenantId+") or ( category.id in (select product_category_id from asso_product_category_person where" +
-                " person_id="+id+" and role=0)) or (category.show_type=2 and  category.id in (select product_category_id from asso_product_category_person where" +
-                " person_id="+id+" and role=1)) or(category.show_type =3 and category.id not in(select product_category_id from asso_product_category_person where" +
-                " person_id="+id+" and role=2))";
-        if(sqls.get(0)!=null&&!sqls.get(0).equals(""))
-        {
-            sqls.set(0,"("+rootSql+") and"+"("+sqls.get(0)+")");
+        Integer tenantId= personnelVO.getTenantId();
+        Integer roleType = personnelVO.getRoleType();
+        String rootSql = "";
+        if (roleType == null || roleType.equals(0)) {
+            rootSql ="category.create_id="+id+" or(category.show_type =0 and category.tenant ="+tenantId+") or ( category.id in (select product_category_id from asso_product_category_person where" +
+                    " person_id="+id+" and role=0)) or (category.show_type=2 and  category.id in (select product_category_id from asso_product_category_person where" +
+                    " person_id="+id+" and role=1)) or(category.show_type =3 and category.id not in(select product_category_id from asso_product_category_person where" +
+                    " person_id="+id+" and role=2))";
 
         }
-        else {
-            sqls.set(0,rootSql);
+        else if(roleType.equals(2))
+        {
+            rootSql="category.tenant="+tenantId;
         }
 
+        if (sqls.get(0) != null && !sqls.get(0).equals("") && !rootSql.equals("")) {
+            sqls.set(0, rootSql + " and" + "(" + sqls.get(0) + ")");
+        } else if ((sqls.get(0) == null || sqls.get(0).equals("")) && !rootSql.equals("")) {
+            sqls.set(0, rootSql);
+        }
+
+
         return sqls;
 
     }

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

@@ -543,16 +543,25 @@ public class ProductService extends ServiceImpl<ProductMapper, Product> implemen
     //装载查询语句
     private List<String> loadSearchSql(List<String> sqls) {
         PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        String id = personnelVO.getId();
-        Integer tenantId = personnelVO.getTenantId();
-        String rootSql = "product.create_id=" + id + " or(product.show_type =0 and product.tenant_id =" + tenantId + ") or ( product.id in (select product_id from asso_product_person where" +
-                " person_id=" + id + " and role=0)) or (product.show_type=2 and  product.id in (select product_id from asso_product_person where" +
-                " person_id=" + id + " and role=1)) or(product.show_type =3 and product.id not in(select product_id from asso_product_person where" +
-                " person_id=" + id + " and role=2))";
-        if (sqls.get(0) != null && !sqls.get(0).equals("")) {
-            sqls.set(0, "(" + rootSql + ")" + " and " + "(" + sqls.get(0) + ")");
+        String id =personnelVO.getId();
+        Integer tenantId= personnelVO.getTenantId();
+        Integer roleType = personnelVO.getRoleType();
+        String rootSql = "";
+        if (roleType == null || roleType.equals(0)) {
+            rootSql = "product.create_id=" + id + " or(product.show_type =0 and product.tenant_id =" + tenantId + ") or ( product.id in (select product_id from asso_product_person where" +
+                    " person_id=" + id + " and role=0)) or (product.show_type=2 and  product.id in (select product_id from asso_product_person where" +
+                    " person_id=" + id + " and role=1)) or(product.show_type =3 and product.id not in(select product_id from asso_product_person where" +
+                    " person_id=" + id + " and role=2))";
 
-        } else {
+        }
+        else if(roleType.equals(2))
+        {
+            rootSql="product.tenant_id="+tenantId;
+        }
+
+        if (sqls.get(0) != null && !sqls.get(0).equals("") && !rootSql.equals("")) {
+            sqls.set(0, rootSql + " and" + "(" + sqls.get(0) + ")");
+        } else if ((sqls.get(0) == null || sqls.get(0).equals("")) && !rootSql.equals("")) {
             sqls.set(0, rootSql);
         }
 

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

@@ -59,7 +59,7 @@ public class ProofGroupService extends ServiceImpl<ProofGroupMapper, ProofGroup>
         List<Integer> proofGroupIds = new ArrayList<>();
         if (addProofGroupDTO != null) {
             Integer id = addProofGroupDTO.getId();
-            List<String> descriptions = addProofGroupDTO.getDescriptions();
+            List<AddProofGroupDTO.Descriptions> descriptions = addProofGroupDTO.getDescriptions();
             Integer projectId = addProofGroupDTO.getProjectId();
             Integer claimId = addProofGroupDTO.getClaimId();
             Integer statutesId = addProofGroupDTO.getStatutesId();
@@ -85,9 +85,11 @@ public class ProofGroupService extends ServiceImpl<ProofGroupMapper, ProofGroup>
                 ProofGroup proofGroup = this.getById(id);
                 proofGroup.setInvalidStatutesId(invalidStatutesId);
                 if (!descriptions.isEmpty() && descriptions.size() == 1) {
-                    proofGroup.setDescription(descriptions.get(0));
+                    proofGroup.setDescription(descriptions.get(0).getDescription1());
+                    proofGroup.setDescription2(descriptions.get(0).getDescription2());
                 } else {
                     proofGroup.setDescription(null);
+                    proofGroup.setDescription2(null);
                 }
                 proofGroup.updateById();
                 proofGroupIds.add(proofGroup.getId());
@@ -100,7 +102,8 @@ public class ProofGroupService extends ServiceImpl<ProofGroupMapper, ProofGroup>
                     descriptions.forEach(item -> {
                         ProofGroup proofGroup = new ProofGroup();
                         proofGroup.setInvalidStatutesId(invalidStatutesId);
-                        proofGroup.setDescription(item);
+                        proofGroup.setDescription(item.getDescription1());
+                        proofGroup.setDescription2(item.getDescription2());
                         proofGroups.add(proofGroup);
                     });
                 } else {
@@ -145,6 +148,7 @@ public class ProofGroupService extends ServiceImpl<ProofGroupMapper, ProofGroup>
                 proofGroupVO.setClaimId(invalidStatutes.getClaimId());
                 proofGroupVO.setProjectId(invalidStatutes.getProjectId());
                 proofGroupVO.setDescription(item.getDescription());
+                proofGroupVO.setDescription2(item.getDescription2());
                 proofGroupVOS.add(proofGroupVO);
             });
         }

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

@@ -366,16 +366,42 @@ public class ReportProjectService extends ServiceImpl<ReportProjectMapper, Repor
         if (events != null && events.size() != 0) {
             //遍历传入的事件集合
             for (ProjectEventDTO projectEventDTO : events) {
-                AssoProjectEvent assoProjectEvent = new AssoProjectEvent();
-                //事件id和处理事项id
-                BeanUtils.copyProperties(projectEventDTO, assoProjectEvent);
-                //项目id
-                assoProjectEvent.setProjectId(project.getId());
-                //创建人
-                assoProjectEvent.setCreateId(personnelVO.getId());
-                //类型为报告
-                assoProjectEvent.setProjectType(1);
-                assoProjectEvents.add(assoProjectEvent);
+                if (projectEventDTO.getEventId() != null) {
+                    AssoProjectEvent assoProjectEvent = new AssoProjectEvent();
+                    //事件id和处理事项id
+                    assoProjectEvent.setEventId(projectEventDTO.getEventId());
+                    //项目id
+                    assoProjectEvent.setProjectId(project.getId());
+                    //创建人
+                    assoProjectEvent.setCreateId(personnelVO.getId());
+                    //类型为报告
+                    assoProjectEvent.setProjectType(1);
+                    assoProjectEvents.add(assoProjectEvent);
+                }
+                if (projectEventDTO.getMatterId() != null) {
+                    AssoProjectEvent assoProjectEvent = new AssoProjectEvent();
+                    //事件id和处理事项id
+                    assoProjectEvent.setMatterId(projectEventDTO.getMatterId());
+                    //项目id
+                    assoProjectEvent.setProjectId(project.getId());
+                    //创建人
+                    assoProjectEvent.setCreateId(personnelVO.getId());
+                    //类型为报告
+                    assoProjectEvent.setProjectType(1);
+                    assoProjectEvents.add(assoProjectEvent);
+                }
+                if (projectEventDTO.getScenarioId() != null) {
+                    AssoProjectEvent assoProjectEvent = new AssoProjectEvent();
+                    //事件id和处理事项id
+                    assoProjectEvent.setScenarioId(projectEventDTO.getScenarioId());
+                    //项目id
+                    assoProjectEvent.setProjectId(project.getId());
+                    //创建人
+                    assoProjectEvent.setCreateId(personnelVO.getId());
+                    //类型为报告
+                    assoProjectEvent.setProjectType(1);
+                    assoProjectEvents.add(assoProjectEvent);
+                }
             }
             if (assoProjectEvents != null && assoProjectEvents.size() != 0) {
                 assoProjectEventService.saveBatch(assoProjectEvents);
@@ -903,11 +929,20 @@ public class ReportProjectService extends ServiceImpl<ReportProjectMapper, Repor
     private List<String> loadSearchSql(List<String> sqls) {
         PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
         String id = personnelVO.getId();
-        String rootSql = "(p.create_id =" + id + " or p.head_id=" + id + " or p.id in (select project_id from asso_project_person where person_id =" + id + "))";
-        if (sqls.get(0) != null && !sqls.get(0).equals("")) {
-            sqls.set(0, rootSql + " and" + "(" + sqls.get(0) + ")");
+        Integer tenantId= personnelVO.getTenantId();
+        Integer roleType = personnelVO.getRoleType();
+        String rootSql = "";
+        if (roleType == null || roleType.equals(0)) {
+            rootSql = "(p.create_id =" + id + " or p.head_id=" + id + " or p.id in (select project_id from asso_project_person where person_id =" + id + "))";
 
-        } else {
+        }
+        else if(roleType.equals(2))
+        {
+            rootSql="p.tenantId="+tenantId;
+        }
+        if (sqls.get(0) != null && !sqls.get(0).equals("") && !rootSql.equals("")) {
+            sqls.set(0, rootSql + " and" + "(" + sqls.get(0) + ")");
+        } else if ((sqls.get(0) == null || sqls.get(0).equals("")) && !rootSql.equals("")) {
             sqls.set(0, rootSql);
         }
 

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

@@ -212,19 +212,21 @@ public class EsPatentService {
         } catch (Exception e) {
 
         }
-         SystemFile systemFile1 =  systemFiles.stream().filter(item->item.getGuid().equals(pdfFormat1)).findFirst().orElse(null);
-        SystemFile systemFile2 =  systemFiles.stream().filter(item->item.getGuid().equals(pdfFormat2)).findFirst().orElse(null);
-       if(systemFile1!=null) {
-           InnerPatentPdfDTO dto = new InnerPatentPdfDTO();
-           dto.setPdfGuid(pdfFormat1);
-           dto.setType(0);
-           list.add(dto);
-       }
-        if(systemFile2!=null) {
-            InnerPatentPdfDTO dto = new InnerPatentPdfDTO();
-            dto.setPdfGuid(pdfFormat2);
-            dto.setType(1);
-            list.add(dto);
+        if (!CollectionUtils.isEmpty(systemFiles)) {
+            SystemFile systemFile1 = systemFiles.stream().filter(item -> item.getGuid().equals(pdfFormat1)).findFirst().orElse(null);
+            SystemFile systemFile2 =  systemFiles.stream().filter(item->item.getGuid().equals(pdfFormat2)).findFirst().orElse(null);
+            if(systemFile1!=null) {
+                InnerPatentPdfDTO dto = new InnerPatentPdfDTO();
+                dto.setPdfGuid(pdfFormat1);
+                dto.setType(0);
+                list.add(dto);
+            }
+            if(systemFile2!=null) {
+                InnerPatentPdfDTO dto = new InnerPatentPdfDTO();
+                dto.setPdfGuid(pdfFormat2);
+                dto.setType(1);
+                list.add(dto);
+            }
         }
         return list;
     }

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

@@ -217,6 +217,20 @@ public class EvidenceReasonService extends ServiceImpl<EvidenceReasonMapper, Evi
                 queryFeatureHistoryDTO.setFeatureGroupId(featureGroupId);
                 List<AssoGroupFeature> queryFeatureHistories = assoGroupFeatureService.getHistory(queryFeatureHistoryDTO);
 
+                //装载特征历史特征
+                List<Integer> featureIds =queryFeatureHistories.stream().map(AssoGroupFeature::getFeatureId).collect(Collectors.toList());
+                LambdaQueryWrapper<Feature> queryWrapper =new LambdaQueryWrapper<>();
+                queryWrapper.in(Feature::getId,featureIds);
+                List<Feature> features =featureService.list(queryWrapper);
+                queryFeatureHistories.forEach(item->{
+                    Feature feature1=   features.stream().filter(i->i.getId().equals(item.getFeatureId())).findFirst().orElse(null);
+                    if(feature1!=null){
+                        item.setFeatureText(feature1.getContent());
+                    }
+
+                });
+
+
                 Integer n = gen >= queryFeatureHistories.size() - 1 ? queryFeatureHistories.size() - 1 : gen;
                 AssoGroupFeature item = queryFeatureHistories.get(n);
                 Integer newFeatureGroupId = item.getId();

src/main/java/cn/cslg/pas/service/common/PersonFieldService.java

@@ -15,12 +15,15 @@ import cn.cslg.pas.common.vo.QueryFieldsVO;
 import cn.cslg.pas.common.vo.PersonSelfFieldVO;
 import cn.cslg.pas.common.vo.business.AllCustomFieldVO;
 import cn.cslg.pas.common.vo.patentCount.GetAllPatentCountVO;
+import cn.cslg.pas.domain.business.ReportProject;
 import cn.cslg.pas.exception.UnLoginException;
 import cn.cslg.pas.exception.XiaoShiException;
 import cn.cslg.pas.service.business.CommonService;
 import cn.cslg.pas.service.business.CustomFieldService;
+import cn.cslg.pas.service.business.ReportProjectService;
 import cn.hutool.crypto.SecureUtil;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -43,6 +46,8 @@ public class PersonFieldService {
     @Autowired
     private CustomFieldService customFieldService;
 
+    @Autowired
+    private ReportProjectService reportProjectService;
 
     public List<PersonSelfFieldVO> getCustomField(String tableName, Integer projectId) {
 
@@ -178,7 +183,7 @@ public class PersonFieldService {
                     });
                 }
                 //当是专利的配置时
-                if (item.getTableName().trim().equals(PatentDictionary.NAME)&&item.getProjectId()!=null) {
+                if (item.getTableName().trim().equals(PatentDictionary.NAME) && item.getProjectId() != null) {
                     //根据专题库id 查询所有自定义字段
                     List<AllCustomFieldVO> allCustomFieldVOS = customFieldService.getAllProjectCustomField(item.getProjectId());
                     //遍历装载
@@ -280,9 +285,9 @@ public class PersonFieldService {
 
         String fieldJson = "";
         //如果查到
-        List<PersonSelfFieldVO> reFieldVos =new ArrayList<>();
+        List<PersonSelfFieldVO> reFieldVos = new ArrayList<>();
         if (StringUtils.isNotEmpty(json)) {
-            reFieldVos =JsonUtils.jsonToList(json, PersonSelfFieldVO.class);
+            reFieldVos = JsonUtils.jsonToList(json, PersonSelfFieldVO.class);
         }
         try {
             fieldJson = CommonService.readJsonFile(tableName + ".json");
@@ -300,9 +305,8 @@ public class PersonFieldService {
         }
 
 
-
         //当tableName是patent时
-        if (PatentDictionary.NAME.equals(tableName)&&projectId!=null&&projectId!=0) {
+        if (PatentDictionary.NAME.equals(tableName) && projectId != null && projectId != 0) {
             //获得所有自定义字段
             List<AllCustomFieldVO> allCustomFieldVOS = customFieldService.getAllProjectCustomField(projectId);
             AllCustomFieldVO allCustomFieldVO = new AllCustomFieldVO();
@@ -326,14 +330,12 @@ public class PersonFieldService {
         }
         //装载顺序
         for (PersonSelfFieldVO item : fieldVOS) {
-            PersonSelfFieldVO personSelfFieldVO =reFieldVos.stream().filter(t->t.getValue().equals(item.getValue())&&t.getType().equals(item.getType())).findFirst().orElse(null);
+            PersonSelfFieldVO personSelfFieldVO = reFieldVos.stream().filter(t -> t.getValue().equals(item.getValue()) && t.getType().equals(item.getType())).findFirst().orElse(null);
 
-            if(personSelfFieldVO==null) {
-                if(StringUtils.isNotEmpty(json))
-                {
+            if (personSelfFieldVO == null) {
+                if (StringUtils.isNotEmpty(json)) {
                     item.setIfHidden(true);
-                }
-                else {
+                } else {
                     if (item.getDefaultHidden() != null && item.getDefaultHidden().equals(true)) {
                         item.setIfHidden(true);
                     } else {
@@ -356,9 +358,9 @@ public class PersonFieldService {
         String userId = personnelVO.getId();
         String tableName = addSelfFieldDTO.getTableName();
         Integer projectId = addSelfFieldDTO.getProjectId();
-        Integer productId =addSelfFieldDTO.getProductId();
-        List<PersonSelfFieldVO> personSelfFieldVOS =addSelfFieldDTO.getValue();
-        personSelfFieldVOS= personSelfFieldVOS.stream().filter(item->item.getIfHidden()!=null&&item.getIfHidden().equals(false)).collect(Collectors.toList());
+        Integer productId = addSelfFieldDTO.getProductId();
+        List<PersonSelfFieldVO> personSelfFieldVOS = addSelfFieldDTO.getValue();
+        personSelfFieldVOS = personSelfFieldVOS.stream().filter(item -> item.getIfHidden() != null && item.getIfHidden().equals(false)).collect(Collectors.toList());
         String key = "";
         if (projectId == null) {
             if (productId != null) {
@@ -525,4 +527,112 @@ public class PersonFieldService {
         return fieldVOS;
     }
 
+
+    /**
+     * 查询证据组合表头
+     *
+     * @param getTabelColumDTO
+     * @return
+     */
+    public List<PersonSelfFieldVO> getEvidenceReasonTableColumns(GetTabelColumDTO getTabelColumDTO) {
+        Integer projectId = getTabelColumDTO.getProjectId();
+
+        String tableName = getTabelColumDTO.getTableName();
+        if (tableName == null||tableName.equals("")) {
+            tableName = "evidenceReason";
+        }
+        //根据登录人id和type查询
+        PersonnelVO personnelVO = new PersonnelVO();
+        try {
+            personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        } catch (Exception e) {
+            throw new UnLoginException("未登录");
+        }
+        String userId = personnelVO.getId();
+        String key = "";
+
+
+        key = SecureUtil.md5(tableName + RedisConf.SYMBOL_COLON + userId + RedisConf.SYMBOL_COLON + RedisConf.EVIDENCE_REASON + RedisConf.SYMBOL_COLON + projectId);
+
+        String redisKey = RedisConf.USER_FIELD + RedisConf.SYMBOL_COLON + key;
+        String json = redisUtil.get(redisKey);
+
+        String fieldJson = "";
+        //如果查到
+        List<PersonSelfFieldVO> reFieldVos = new ArrayList<>();
+        if (StringUtils.isNotEmpty(json)) {
+            reFieldVos = JsonUtils.jsonToList(json, PersonSelfFieldVO.class);
+        }
+        try {
+            fieldJson = CommonService.readJsonFile(tableName + ".json");
+        } catch (Exception e) {
+            throw new XiaoShiException("不存在此表");
+        }
+        List<PersonSelfFieldVO> fieldVOS = JSON.parseArray(fieldJson, PersonSelfFieldVO.class);
+        if (fieldVOS == null) {
+            throw new XiaoShiException("不存在此表");
+        }
+        Boolean flag = true;
+        LambdaQueryWrapper<ReportProject> queryWrapper =new LambdaQueryWrapper<>();
+        queryWrapper.eq(ReportProject::getProjectId,projectId);
+        ReportProject reportProject =reportProjectService.getOne(queryWrapper,false);
+        if(reportProject.getIfSecondInvalid()!=null&&reportProject.getIfSecondInvalid())
+        {
+            fieldVOS = fieldVOS.stream().filter(item -> flag.equals(item.getIfShow()) || item.getType().equals("second")).collect(Collectors.toList());
+        }
+     else {
+            fieldVOS = fieldVOS.stream().filter(item -> flag.equals(item.getIfShow())).collect(Collectors.toList());
+        }
+        if (fieldVOS == null || fieldVOS.size() == 0) {
+            throw new XiaoShiException("表中无字段");
+        }
+
+
+        //装载顺序
+        for (PersonSelfFieldVO item : fieldVOS) {
+            if (StringUtils.isNotEmpty(json)) {
+                PersonSelfFieldVO personSelfFieldVO = reFieldVos.stream().filter(t -> t.getValue().equals(item.getValue()) && t.getName().equals(item.getName())).findFirst().orElse(null);
+                if (personSelfFieldVO == null) {
+                    item.setIfHidden(true);
+                    reFieldVos.add(item);
+                }
+
+            } else {
+                if (item.getDefaultHidden() != null && item.getDefaultHidden().equals(true)) {
+                    item.setIfHidden(true);
+                } else {
+                    item.setIfHidden(false);
+                }
+                reFieldVos.add(item);
+            }
+
+
+
+        }
+        return reFieldVos;
+    }
+
+    public List<PersonSelfFieldVO> setEvidenceReasonTableColumns(AddSelfFieldDTO addSelfFieldDTO) {
+        PersonnelVO personnelVO = new PersonnelVO();
+        try {
+            personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        } catch (Exception e) {
+            throw new UnLoginException("未登录");
+        }
+        String userId = personnelVO.getId();
+        String tableName = addSelfFieldDTO.getTableName();
+        if (tableName == null||tableName.equals("")) {
+            tableName = "evidenceReason";
+        }
+        Integer projectId = addSelfFieldDTO.getProjectId();
+        List<PersonSelfFieldVO> personSelfFieldVOS = addSelfFieldDTO.getValue();
+        personSelfFieldVOS = personSelfFieldVOS.stream().filter(item -> item.getIfHidden() != null && item.getIfHidden().equals(false)).collect(Collectors.toList());
+        String key = "";
+        key = SecureUtil.md5(tableName + RedisConf.SYMBOL_COLON + userId + RedisConf.SYMBOL_COLON + RedisConf.EVIDENCE_REASON + RedisConf.SYMBOL_COLON + projectId);
+
+        String redisKey = RedisConf.USER_FIELD + RedisConf.SYMBOL_COLON + key;
+        redisUtil.set(redisKey, JsonUtils.objectToJson(personSelfFieldVOS));
+        return personSelfFieldVOS;
+    }
+
 }

src/main/resources/jsons/event.json

@@ -84,7 +84,7 @@
     "sqlField": "scenario_id",
     "sqlClass": "getComSql",
     "orderClass": "getScenarioNameOrder",
-    "groupClass": "getScenarioGroup",
+    "groupClass": "getEventScenarioGroup",
     "ifSearch": "true",
     "ifGroup": "true",
     "ifShow": "true",
@@ -124,7 +124,7 @@
     "value": "description",
     "field": "description",
     "sqlField": "description",
-    "sqlClass": "getComSql",
+    "sqlClass": "getLikeSql",
     "orderClass": "getComOrder",
     "ifSearch": "true",
     "ifGroup": "false",

src/main/resources/jsons/evidenceReason.json

@@ -0,0 +1,102 @@
+[
+  {
+    "name": "权要/说明书/附图",
+    "type": "String",
+    "value": "claimSort",
+    "field": "claimSort",
+    "ifShow": "true"
+  },
+  {
+    "name": "无效法条",
+    "type": "String",
+    "value": "statutesId",
+    "field": "statutesId",
+    "ifShow": "true"
+  },
+  {
+    "name": "证据组合",
+    "type": "String",
+    "value": "proofGroup",
+    "field": "proofGroupDescription",
+    "defaultHidden": "true",
+    "ifShow": "true"
+  },
+  {
+    "name": "原权要特征内容",
+    "type": "String",
+    "value": "feature",
+    "field": "featureOrder",
+    "ifShow": "true"
+  },
+  {
+    "name": "第一次无效及补充证据",
+    "type": "String",
+    "value": "evidenceText",
+    "field": "evidenceText",
+    "ifShow": "true"
+  },
+  {
+    "name": "修改后权要特征",
+    "type": "String",
+    "value": "feature1",
+    "field": "featureOrder",
+    "defaultHidden": "true",
+    "ifShow": "true"
+  },
+  {
+    "name": "第一次答辩意见",
+    "type": "String",
+    "value": "erIfPresentOpinions1",
+    "field": "erIfPresentOpinions1",
+    "ifShow": "true"
+  },
+  {
+    "name": "第二次无效证据",
+    "type": "second",
+    "value": "secondEvidence",
+    "field": "secondEvidence"
+  },
+  {
+    "name": "第二次修改后权要特征",
+    "type": "second",
+    "value": "feature2",
+    "field": "featureOrder",
+    "defaultHidden": "true"
+  },
+  {
+    "name": "第二次答辩意见",
+    "type": "second",
+    "value": "secondErIfPresentOpinions1",
+    "field": "secondErIfPresentOpinions1"
+  },
+  {
+    "name": "复审委意见",
+    "type": "String",
+    "value": "erRbSummary",
+    "field": "erRbSummary",
+    "ifShow": "true"
+  },
+  {
+    "name": "复审委决定",
+    "type": "String",
+    "value": "rbDecision",
+    "field": "claimSort",
+    "ifShow": "true"
+  },
+  {
+    "name": "一审法院决定",
+    "type": "String",
+    "value": "courtDecision1",
+    "field": "claimSort",
+    "ifShow": "true",
+    "defaultHidden": "true"
+  },
+  {
+    "name": "二审法院决定",
+    "type": "String",
+    "value": "courtDecision2",
+    "field": "claimSort",
+    "ifShow": "true",
+    "defaultHidden": "true"
+  }
+]