Merge remote-tracking branch 'origin/master'

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

@@ -4,12 +4,10 @@ import lombok.Data;
 
 @Data
 public class AddBatchLiteratureDTO {
-
     private String name; //文件名称
     private String fileGuid; //文件guid
     private String description; //描述
     private Integer projectId; //报告id
     private String authorName; //作者
     private Integer type;//类型
-
 }

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

@@ -0,0 +1,13 @@
+package cn.cslg.pas.common.dto.invalidDTO;
+
+public class AddClaimDTO {
+    private Integer id;
+    private Integer sysOrder;
+    private String content;
+    private Integer claimType;
+    private Integer contentType;
+    private Integer parentOrder;
+    private Integer projectId;
+    private Integer optionType;
+
+}

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

@@ -0,0 +1,15 @@
+package cn.cslg.pas.common.dto.invalidDTO;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 上传无效请求书DTO类
+ */
+public class AddInvalidRequestFileDTO {
+ private Date invalidRequestDate;
+ private Date invalidFileSendDate;
+ private Integer project;
+ private List<String> fileGuids;
+private String description;
+}

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

@@ -0,0 +1,8 @@
+package cn.cslg.pas.common.dto.invalidDTO;
+
+/**
+ * 查询权利要求
+ */
+public class QueryClaimDTO {
+    private  Integer projectId;
+}

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

@@ -0,0 +1,11 @@
+package cn.cslg.pas.common.dto.invalidDTO;
+
+import lombok.Data;
+
+/**
+ * 拆分权利要求dto
+ */
+@Data
+public class SplitClaimDTO {
+    private Integer projectId;
+}

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

@@ -0,0 +1,13 @@
+package cn.cslg.pas.common.dto.invalidDTO;
+
+import lombok.Data;
+
+@Data
+public class UpdateBatchLiteratureDTO {
+    private Integer id;
+    private String name; //文件名称
+    private String fileGuid; //文件guid
+    private String description; //描述
+    private String authorName; //作者
+    private Integer sysOrder;//排序
+}

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

@@ -27,6 +27,6 @@ public class PersonSelfFieldVO {
     private Boolean ifShow;
     private Boolean ifHidden;
     private Integer createType;
-    private Boolean  DefaultHidden;
+    private Boolean  defaultHidden;
 
 }

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

@@ -0,0 +1,41 @@
+package cn.cslg.pas.controller;
+
+import cn.cslg.pas.common.core.base.Constants;
+import cn.cslg.pas.common.dto.invalidDTO.AddClaimDTO;
+import cn.cslg.pas.common.dto.invalidDTO.QueryClaimDTO;
+import cn.cslg.pas.common.dto.invalidDTO.SplitClaimDTO;
+import cn.cslg.pas.common.model.cronModel.Records;
+import cn.cslg.pas.common.utils.Response;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Slf4j
+@RequestMapping(Constants.API_XiaoSHI + "/patentClaim")
+@RestController
+public class PatentClaimController {
+    @Operation(summary = "拆分权利要求")
+    @PostMapping("/splitClaim")
+    public Response splitClaim(@RequestBody SplitClaimDTO splitClaimDTO) throws Exception {
+        Records records =new Records();
+        return Response.success(records);
+    }
+    @Operation(summary = "查询权利要求")
+    @PostMapping("/queryClaim")
+    public Response queryClaim(@RequestBody QueryClaimDTO queryClaimDTO) throws Exception {
+        Records records =new Records();
+        return Response.success(records);
+    }
+
+    @Operation(summary = "保存权利要求")
+    @PostMapping("/addClaim")
+    public Response addClaim(@RequestBody List<AddClaimDTO> addClaimDTOs) throws Exception {
+        Records records =new Records();
+        return Response.success(records);
+    }
+}

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

@@ -0,0 +1,29 @@
+package cn.cslg.pas.controller;
+
+import cn.cslg.pas.common.core.base.Constants;
+import cn.cslg.pas.common.dto.invalidDTO.SplitClaimDTO;
+import cn.cslg.pas.common.model.cronModel.Records;
+import cn.cslg.pas.common.utils.Response;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author lrj
+ * @Date 2023/12/22
+ */
+@Slf4j
+@RequestMapping(Constants.API_XiaoSHI + "/reportAffair")
+@RestController
+public class ReportAffairController {
+    @Operation(summary = "")
+    @PostMapping("/queryReportAffair")
+    public Response splitClaim(@RequestBody SplitClaimDTO splitClaimDTO) throws Exception {
+        Records records =new Records();
+        return Response.success(records);
+    }
+
+}

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

@@ -181,16 +181,51 @@ public class PersonFieldService {
                         QueryFiledVO queryFieldsVO1 = new QueryFiledVO();
                         //装载名称
                         queryFieldsVO1.setName(i.getName());
-                        //装载组别
-                        queryFieldsVO1.setGroup("customField");
+
                         //装载类型
-                        if (i.getType() <= 6) {
-                            queryFieldsVO1.setFiledKind(0);
-                        } else {
-                            queryFieldsVO1.setFiledKind(i.getType());
-                        }
+                      Integer  type =i.getType();
+                      switch (type){
+                          case 0:
+                              //装载组别
+                              queryFieldsVO1.setGroup("customField");
+                              queryFieldsVO1.setType("Integer");
+                           break;
+                          case 1:
+                              queryFieldsVO1.setGroup("customField");
+                              queryFieldsVO1.setType("DateTime");
+                           break;
+                          case 2:
+                              queryFieldsVO1.setGroup("customField");
+                              queryFieldsVO1.setType("String");
+                              break;
+                          case 4:
+
+
+                          case 5:
+                              queryFieldsVO1.setGroup("customField");
+                              queryFieldsVO1.setType("Array");
+                              break;
+                          case 6:
+                              queryFieldsVO1.setGroup("customField");
+                              queryFieldsVO1.setType("tree");
+                              break;
+                          case 7:
+                              queryFieldsVO1.setGroup("product");
+                              queryFieldsVO1.setType("tree");
+                              break;
+                          case 8:
+                              queryFieldsVO1.setGroup("productCategory");
+                              queryFieldsVO1.setType("tree");
+                              break;
+                          case 9:
+                              queryFieldsVO1.setGroup("technical");
+                              queryFieldsVO1.setType("tree");
+                              break;
+                      }
                         //装载id
                         queryFieldsVO1.setField(i.getId().toString());
+                        queryFieldsVO1.setIfSearch(true);
+                        queryFieldsVO1.setIfGroup(false);
                         queryFiledVOS.add(queryFieldsVO1);
                     });
                     queryFiledVOList.addAll(queryFiledVOS);