修复分组查询/稳定性分析

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

@@ -0,0 +1,16 @@
+package cn.cslg.pas.common.dto;
+
+import lombok.Data;
+
+@Data
+public class FeatureDTO {
+    /**
+     * 对应特征
+     */
+    private Integer id;
+    private String content;
+    private String explainText;
+    private Integer rightSort;
+    private Integer rightType;
+    private Boolean ifChange;
+}

src/main/java/cn/cslg/pas/common/dto/business/SaveFeatureBatchDTO.java

@@ -0,0 +1,11 @@
+package cn.cslg.pas.common.dto.business;
+
+import cn.cslg.pas.common.dto.FeatureDTO;
+
+import java.util.List;
+
+public class SaveFeatureBatchDTO {
+    private Integer projectId;
+    private String patentNo;
+    private List<FeatureDTO> featureDTOList;
+}

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

@@ -332,7 +332,6 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
             assoEventFiles = assoEventFileService.list(queryWrapper);
             guids = assoEventFiles.stream().map(AssoEventFile::getFileGuid).collect(Collectors.toList());
 
-
             //根据事件id分组查询事件关联专题库或报告数量
             eventCountVOS = assoProjectEventMapper.getEventProjectCount(ids);
         }

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

@@ -737,7 +737,7 @@ public class PatentProjectService extends ServiceImpl<PatentProjectMapper, Paten
             if (patentProjectVO.getHeadId() != null) {
                 Personnel headPersonnel = personnels.stream().filter(item -> item.getId().equals(patentProjectVO.getHeadId())).findFirst().orElse(null);
                 if (headPersonnel != null) {
-                    patentProjectVO.setHeadName(personnel.getPersonnelName());
+                    patentProjectVO.setHeadName(headPersonnel.getPersonnelName());
                 }
             }
 

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

@@ -725,7 +725,7 @@ public class ReportProjectService extends ServiceImpl<ReportProjectMapper, Repor
             if (reportProjectVO.getHeadId() != null) {
                 Personnel headPersonnel = personnels.stream().filter(item -> item.getId().equals(reportProjectVO.getHeadId())).findFirst().orElse(null);
                 if (headPersonnel != null) {
-                    reportProjectVO.setHeadName(personnel.getPersonnelName());
+                    reportProjectVO.setHeadName(headPersonnel.getPersonnelName());
                 }
             }
 

src/main/java/cn/cslg/pas/service/permissions/PermissionService.java

@@ -105,7 +105,7 @@ public class PermissionService {
     public String getClientIdByNamePCS(String clientName,Boolean ifEqual) throws IOException {
         OkHttpClient okHttpClient = new OkHttpClient();
         Request request = new Request.Builder()
-                .url(PCSUrl + "/permission/api/system/getClientIdByNam?clientName=" + clientName+"&ifEqual="+ifEqual)
+                .url(PCSUrl + "/permission/api/system/getClientIdByName?clientName=" + clientName+"&ifEqual="+ifEqual)
                 .get()
                 .build();
         return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();

src/main/resources/jsons/event.json

@@ -55,6 +55,7 @@
     "value": "clientName",
     "field": "clientName",
     "sqlField": "client_id",
+    "sqlClass": "getClientNameSql",
     "orderClass": "getClientNameOrder",
     "ifSearch": "true",
     "ifGroup": "false",

src/main/resources/jsons/patentProject.json

@@ -52,8 +52,7 @@
     "groupClass": "getScenarioGroup",
     "ifSearch": "false",
     "ifGroup": "false",
-    "ifShow": "true",
-    "ifAsCondition": "true"
+    "ifShow": "true"
   },
   {
     "name": "相关事件",

src/main/resources/jsons/reportProject.json

@@ -35,7 +35,9 @@
   "ifSearch":"true",
   "ifGroup": "false",
     "ifShow":"true",
-    "defaultHidden": "false"
+    "defaultHidden": "false",
+    "ifAsCondition": "true"
+
 },
   {"name":"创建人",
     "type":"String",
@@ -48,7 +50,8 @@
     "ifSearch":"true",
     "ifGroup": "false",
     "ifShow":"true",
-    "defaultHidden": "true"
+    "defaultHidden": "true",
+    "ifAsCondition": "true"
   },
   {"name":"负责人名称",
     "type":"String",
@@ -61,7 +64,8 @@
     "ifSearch":"true",
     "ifGroup": "false",
     "ifShow":"true",
-    "defaultHidden": "true"
+    "defaultHidden": "true",
+    "ifAsCondition": "true"
   },
   {"name":"负责部门",
     "type":"String",
@@ -74,7 +78,8 @@
     "ifSearch":"true",
     "ifGroup": "false",
     "ifShow":"true",
-    "defaultHidden": "true"
+    "defaultHidden": "true",
+    "ifAsCondition": "true"
   },
   {"name":"委托方",
     "type":"String",
@@ -87,7 +92,8 @@
     "ifSearch":"true",
     "ifGroup": "false",
     "ifShow":"true",
-    "defaultHidden": "true"
+    "defaultHidden": "true",
+    "ifAsCondition": "true"
   },
 
   {"name":"委托方",
@@ -113,7 +119,8 @@
     "groupClass":"getTimeGroup",
     "ifSearch":"true",
     "ifGroup": "false",
-    "ifShow":"true"
+    "ifShow":"true",
+    "ifAsCondition": "true"
   },
   {"name":"标的专利或产品",
     "type":"String",
@@ -124,7 +131,8 @@
     "orderClass": "getComOrder",
     "ifSearch":"true",
     "ifGroup": "false",
-    "ifShow":"true"
+    "ifShow":"true",
+    "ifAsCondition": "true"
   },
   {"name":"报告类型",
     "type":"String",
@@ -146,7 +154,8 @@
     "sqlClass": "getComSql",
     "ifSearch":"true",
     "ifGroup": "false",
-    "ifShow":"false"
+    "ifShow":"false",
+    "ifAsCondition": "true"
   },
   {"name":"报告状态",
     "type":"String",
@@ -168,7 +177,8 @@
     "orderClass": "getComOrder",
     "ifSearch":"true",
     "ifGroup": "false",
-    "ifShow":"false"
+    "ifShow":"false",
+    "ifAsCondition": "true"
   },
   {
     "name": "结论论述",
@@ -254,7 +264,8 @@
     "ifSearch":"true",
     "ifGroup": "false",
     "ifShow":"true",
-    "defaultHidden": "true"
+    "defaultHidden": "true",
+    "ifAsCondition": "true"
   },
   {"name":"调查类型",
     "type":"Array",
@@ -266,7 +277,7 @@
     "groupClass":"getMatterGroup",
     "ifSearch":"true",
     "ifGroup": "true",
-    "ifShow":"false",
+    "ifShow":"true",
     "defaultHidden": "true",
     "ifAsCondition": "true"
   },
@@ -281,6 +292,6 @@
     "ifSearch":"true",
     "ifGroup": "true",
     "ifShow":"true",
-    "ifAsCondition": "true"
+    "ifAsCondition": "true",
   }
 ]