11/24 upat

RMS/src/main/java/cn/cslg/report/controller/BaseController.java

@@ -94,6 +94,11 @@ public class BaseController {
     public String getPartPersonnel(@RequestBody PersonnelVO personnelVO) {
         return baseService.getPartPersonnel(personnelVO);
     }
+    @GetMapping("/getPartPersonnelID")
+    @Operation(summary = "根据人员id查人员")
+    public String getAllPersonnelId (Integer ID)throws IOException {
+        return baseService.getPartPersonnelID(ID);
+    }
 
     @GetMapping("/getAllClient")
     @Operation(summary = "获取所有客户")

RMS/src/main/java/cn/cslg/report/controller/PatentFiledController.java

@@ -34,12 +34,20 @@ public class PatentFiledController {
     @PostMapping("edit")
     @Operation(summary = "编辑自定义字段")
     public String edit(@RequestBody ReportField reportField) {
+        Integer reportId = reportField.getReportId();
+        if(reportId!=null){
+            return reportFieldService.updateReportId(reportField);
+        }
+
         return reportFieldService.edit(reportField);
     }
 
     @GetMapping("delete")
     @Operation(summary = "删除自定义字段")
-    public String delete(Integer id) {
+    public String delete(Integer id,Integer reportId) {
+        if(reportId!=null){
+            return reportFieldService.deleteReportId(reportId,id);
+        }
         return reportFieldService.delete(id);
     }
 
@@ -53,7 +61,12 @@ public class PatentFiledController {
     @Operation(summary = "选项列表")
     public String getList(Integer fieldId,Integer type ,Integer reportId)throws IOException {
         if(reportId!=null){
-            return reportFieldService.getReportField(reportId);
+            if(type == 6){
+               return Response.success(reportFieldTreeService.get(fieldId,reportId));
+            }else {
+                return Response.success(reportFieldService.getReportField(reportId, fieldId));
+            }
+
         }else {
             if (type == 6) {
                 return Response.success(reportFieldTreeService.getReportFieldTreeNodeByFieldId(fieldId));
@@ -70,7 +83,10 @@ public class PatentFiledController {
 
     @GetMapping("option/delete")
     @Operation(summary = "删除选项")
-    public String delete(Integer type, Integer id) {
+    public String delete(Integer type, Integer id,Integer reportId) {
+        if(reportId!=null){
+          return reportFieldService.deleteReportId(reportId,id);
+        }
         if (type == 6) {
             reportFieldService.delete(id);
         } else {

RMS/src/main/java/cn/cslg/report/entity/ReportFieldOption.java

@@ -29,7 +29,7 @@ public class ReportFieldOption extends BaseEntity<ReportFieldOption> {
     /**
      * 多选选项名称
      */
-    @TableField("NAME")
+    @TableField("CID")
     private String name;
 
     /**
@@ -82,4 +82,5 @@ public class ReportFieldOption extends BaseEntity<ReportFieldOption> {
 
     @TableField(exist = false)
     private Integer total;
-}
+//}
+}

RMS/src/main/java/cn/cslg/report/entity/ReportFieldTree.java

@@ -58,4 +58,29 @@ public class ReportFieldTree extends BaseEntity<ReportFieldTree> {
      */
     @TableField("PATH")
     private String path;
+    @TableField("REPORT_ID")
+    private Integer reportId;
+    @TableField(exist = false)
+    private Integer type;
+
+    /**
+     * 树形层级
+     */
+//    @TableField(exist = false)
+//    private Integer level;
+//
+//    /**
+//     * 路径
+//     */
+//    @TableField(exist = false)
+//    private String path;
+//
+//    @TableField(exist = false)
+//    private Integer order;
+//
+//    @TableField(exist = false)
+//    private String remark;
+//
+//    @TableField(exist = false)
+//    private Integer total;
 }

RMS/src/main/java/cn/cslg/report/mapper/ReportFieldMapper.java

@@ -10,5 +10,7 @@ import java.util.List;
 
 @Mapper
 public interface ReportFieldMapper extends BaseMapper<ReportField> {
-    List<ReportField> find(@Param("reportId") int reportId);
+    List<ReportField> find(@Param("reportId") int reportId,@Param("id") int id);
+    int deleteReportId(@Param("reportId") int reportId,@Param("id") int id);
+    int updateReportId(ReportField reportField);
 }

RMS/src/main/java/cn/cslg/report/service/BaseService.java

@@ -193,6 +193,17 @@ public class BaseService {
             return Response.error(Constants.NET_ERROR);
         }
     }
+    public String getPartPersonnelID(Integer id){
+        try {
+            String resBody = outInterfaceService.getPartPersonnelID(id);
+            return resBody;
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            log.error("权限系统获取人员列表失败,错误信息:" + LogExceptionUtil.getMessage(ex));
+            return Response.error(Constants.NET_ERROR);
+        }
+    }
+
 
     /**
      * @return 成功返回客户列表信息 失败返回错误信息

RMS/src/main/java/cn/cslg/report/service/OutInterfaceService.java

@@ -168,7 +168,24 @@ public class OutInterfaceService {
      * @title 获取所有人员(无权限控制)
      * @description 接口来源:PCS
      */
+    public String getPartPersonnelID(Integer ID)throws IOException{
+        OkHttpClient okHttpClient = new OkHttpClient();
+          Request request = new Request.Builder()
+                    .url(PCSUrl + "/permission/api/system/getPerson?id=ID")
+                     .get()
+                    .build();
+          return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
+    }
+
     public String getAllPersonnelFromPCS() throws IOException {
+//        if(id!=null){
+//            OkHttpClient okHttpClient = new OkHttpClient();
+//            Request request = new Request.Builder()
+//                    .url(PCSUrl + "/permission/api/system/getPerson?id=id")
+//                    .get()
+//                    .build();
+//            return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
+//        }
         OkHttpClient okHttpClient = new OkHttpClient();
         Request request = new Request.Builder()
                 .url(PCSUrl + "/permission/api/system/getAllPersonnel")

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

@@ -61,6 +61,11 @@ public class ReportFieldService extends ServiceImpl<ReportFieldMapper, ReportFie
         return Response.success(true);
     }
     //删除自定义字段
+    public String deleteReportId(int reportId, int id){
+        reportFieldMapper.deleteReportId(reportId,id);
+       return Response.success();
+    }
+
   @Transactional
   public String delete(Integer id) {
       this.removeById(id);
@@ -160,9 +165,14 @@ public class ReportFieldService extends ServiceImpl<ReportFieldMapper, ReportFie
         }
     }
 
-    public String getReportField(int id){
-        List<ReportField> reportFields = reportFieldMapper.find(id);
+    public String getReportField(int reportId,int id){
+        List<ReportField> reportFields = reportFieldMapper.find(reportId,id);
         return Response.success(reportFields);
     }
+    public String updateReportId(ReportField reportField){
+        reportFieldMapper.updateReportId(reportField);
+        return Response.success();
+    }
+
 
 }

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

@@ -119,6 +119,41 @@ public class ReportFieldTreeService extends ServiceImpl<ReportFieldTreeMapper, R
         queryWrapper.orderByAsc(ReportFieldTree::getOrder);
         return this.list(queryWrapper);
     }
+    public List<ReportFieldTree> getReportFieldTree(Integer id,Integer reportID){
+        LambdaQueryWrapper<ReportFieldTree> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.in(ReportFieldTree::getId,id)
+                .in(ReportFieldTree::getReportId, reportID);
+        queryWrapper.orderByAsc(ReportFieldTree::getOrder);
+        return this.list(queryWrapper);
+    }
+    public List<Tree<Integer>> get(Integer id,Integer reportID){
+        List<ReportFieldTree> dataList = this.getReportFieldTree(id, reportID);
+
+        for (ReportFieldTree tree : dataList) {
+            List<ReportFieldTree> tempList = dataList.stream().filter(item -> item.getParentId().equals(tree.getTreeId())).collect(Collectors.toList());
+            tempList.forEach(item -> item.setParentId(tree.getId()));
+        }
+        TreeNodeConfig treeNodeConfig = new TreeNodeConfig();
+        treeNodeConfig.setWeightKey("order");
+        List<TreeNode<Integer>> nodeList = CollUtil.newArrayList();
+        for (ReportFieldTree data : dataList) {
+            nodeList.add(new TreeNode<>(data.getId(), data.getParentId(), data.getName(), data.getOrder()));
+        }
+        List<Tree<Integer>> treeNodes = TreeUtil.build(nodeList, 0, treeNodeConfig, (treeNode, tree) -> {
+            ReportFieldTree temp = dataList.stream().filter(item -> item.getId().equals(treeNode.getId())).findFirst().orElse(new ReportFieldTree());
+            tree.setId(treeNode.getId());
+            tree.setParentId(treeNode.getParentId());
+            tree.setWeight(treeNode.getWeight());
+            tree.setName(treeNode.getName());
+            tree.putExtra("level", temp.getLevel());
+            tree.putExtra("path", temp.getPath());
+            tree.putExtra("fieldId", temp.getFieldId());
+        });
+        return treeNodes;
+
+    }
+
+
 
     public List<Tree<Integer>> getReportFieldTreeNodeByFieldId(Integer fieldId) {
         List<ReportFieldTree> dataList = this.getReportFieldTreeOptionByFieldId(fieldId);
@@ -170,7 +205,7 @@ public class ReportFieldTreeService extends ServiceImpl<ReportFieldTreeMapper, R
 
     @Transactional
     public Integer add(ReportFieldTree tree) {
-//        Integer total = this.getFieldTreeNodeTotal(tree.getFieldId());
+    Integer total = this.getFieldTreeNodeTotal(tree.getFieldId());
         tree.setOrder(-1);
         tree.insert();
         this.edit(tree);
@@ -313,6 +348,7 @@ public class ReportFieldTreeService extends ServiceImpl<ReportFieldTreeMapper, R
         projectFieldTree.setOrder(projectFieldOption.getOrder());
         projectFieldTree.setParentId(projectFieldOption.getParentId());
         projectFieldTree.setName(projectFieldOption.getName());
+//        projectFieldTree.setReportId();
         projectFieldTree.insertOrUpdate();
         this.edit(projectFieldTree);
         return Response.success(projectFieldTree.getId());

RMS/src/main/resources/mapper/CompareRecordsMapper.xml

@@ -4,6 +4,7 @@
    <select id="find" resultType="cn.cslg.report.entity.CompareRecords">
        select *  from COMPARE_RECORDS where PATENT_NO=#{patentNo} and PERSON_ID=#{personId} and REPORT_ID=#{reportId}
    </select>
+
 <select id="getCompareRecords" resultType="cn.cslg.report.entity.CompareRecords">
     select * from COMPARE_RECORDS where REPORT_ID=#{reportId}
 </select>
@@ -13,4 +14,5 @@
     <update id="updateCompareRecords">
         update COMPARE_RECORDS set FEATURES_ID=#{featuresId} where ID=#{id}
     </update>
+
 </mapper>

RMS/src/main/resources/mapper/ReportFieldMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="cn.cslg.report.mapper.ReportFieldMapper">
+    <select id="find" resultType="cn.cslg.report.entity.ReportField">
+     select * from OS_PATENT_FIELD where REPORT_ID=#{reportId} and ID=#{id}
+    </select>
+    <delete id="deleteReportId">
+        delete from OS_PATENT_FIELD where REPORT_ID=#{reportId} and ID=#{id}
+    </delete>
+    <update id="updateReportId" parameterType="cn.cslg.report.entity.ReportField">
+      update OS_PATENT_FIELD set`NAME`=#{name},PTYPE=#{ptype},`TYPE`=#{type},STATUS=#{status},REMARK=#{remark},
+                                CID=#{createBy},CREATE_TIME=#{createTime},REPORT_TYPE=#{reportType} where REPORT_ID=#{reportId} and ID=#{id}
+
+    </update>
+
+</mapper>