12.12修改

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

@@ -88,6 +88,9 @@ public class ReportField extends BaseEntity<ReportField> {
     @TableField(exist = false)
     public List<ReportFieldExpand> expand;
 
+    @Schema(description ="原始ID")
+    @TableField(exist = false)
+    public Integer originId;
     /**
      * 选项
      */

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

@@ -219,7 +219,7 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
     }
 
     /**
-     * @function删除单个对比专利
+     * @function  删除单个对比专利
      * @param compareFilesVO
      * @return 是否删除成功
      * @throws IOException
@@ -342,4 +342,5 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
         return reMap;
     }
 
+
 }

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

@@ -46,7 +46,9 @@ public class ReportFieldService extends ServiceImpl<ReportFieldMapper, ReportFie
  private  final ReportFieldPatentLinkService reportFieldPatentLinkService;
 private  final  AssoTaskPersonelService assoTaskPersonelService;
     private final ReportFieldService reportFieldService;
-//增加自定义字段
+    private ReportField reportField ;
+
+    //增加自定义字段
     public String add(ReportField reportField) {
         ReportField temp = this.getProjectFieldByName(reportField.getName(), reportField.getReportId());
         if (temp != null) {
@@ -206,28 +208,31 @@ private  final  AssoTaskPersonelService assoTaskPersonelService;
         if(reportFields!=null&&reportFields.size()!=0)
         {
          reportFields.forEach(p->{
-             p.setReportId(reportId);p.setId(null); p.setCreateName(null);});
+             p.setReportId(reportId);p.setOriginId(p.getId());p.setId(null); p.setCreateName(null);}
+         );
              reportFieldService.saveBatch(reportFields);
         }
 
         reportFields.forEach(p->{
-            if(p.getPtype()==1||p.getPtype()==0||p.getPtype()==2){
-                reportFieldTextService.add(p.getId(),p.getName());
+            if(p.getType().equals(1)||p.getType().equals(0)||p.getType().equals(2)){
+
+
 
             }
-            if(p.getPtype()==3||p.getPtype()==4||p.getPtype()==5){
-                ReportFieldOption reportFieldOption = new ReportFieldOption();
-                reportFieldOption.setName(p.getName());
-                reportFieldOption.setFieldId(p.getId());
-                reportFieldOptionService.add(reportFieldOption);
-            }
+            if(p.getType().equals(3)||p.getType().equals(4)||p.getType().equals(5)){
+                //根据自定义字段的ID 从表中查出选项列表
+                 LambdaQueryWrapper<ReportFieldOption> wrapper = new LambdaQueryWrapper<>();
+                 wrapper.eq(ReportFieldOption::getFieldId, p.getOriginId());
+                List<ReportFieldOption> reportFieldOptions =reportFieldOptionService.list(wrapper);
 
-            if(p.getPtype()==6){
-                ReportFieldTree reportFieldTree = new ReportFieldTree();
-                reportFieldTree.setName(p.getName());
-                reportFieldTree.setFieldId(p.getId());
-                reportFieldTreeService.add(reportFieldTree);
+                reportFieldOptionService.addBatch(reportFieldOptions,p.getId());
+            }
 
+            if(p.getType().equals(6)){
+                LambdaQueryWrapper<ReportFieldTree> wrapper = new LambdaQueryWrapper<>();
+                wrapper.eq(ReportFieldTree::getFieldId,p.getOriginId());
+                List<ReportFieldTree> list = reportFieldTreeService.list(wrapper);
+                reportFieldTreeService.addBatchs(list,p.getId());
 
             }
         });
@@ -297,7 +302,7 @@ private  final  AssoTaskPersonelService assoTaskPersonelService;
         ReportField reportField =this.list(wrapper).get(0);
 
         //根据自定义字段的类型，从三张值表中查询该自定义字段所有值的id
-        Integer type1 =reportField.getType();
+         int type1 =reportField.getType();
         switch (type1){
             //数字
             case 0:
@@ -411,7 +416,7 @@ private  final  AssoTaskPersonelService assoTaskPersonelService;
         wrapper.eq(ReportField::getId,id);
         ReportField reportField =this.list(wrapper).get(0);
         //获得类型
-        Integer type1 =reportField.getType();
+        int  type1 =reportField.getType();
         if(type1==1){
             LambdaQueryWrapper<ReportFieldText> queryWrapper =new LambdaQueryWrapper<>();
              queryWrapper.eq(ReportFieldText::getFieldId, id)

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

@@ -41,7 +41,7 @@ public class ReportFieldTreeService extends ServiceImpl<ReportFieldTreeMapper, R
     private final ReportFieldPatentLinkService reportFieldPatentLinkService;
     private final ReportFieldService reportFieldService;
 
-    public  List<ReportFieldTree> getProjectFieldTreeOptionByIds(List<Integer> ids) {
+    public List<ReportFieldTree> getProjectFieldTreeOptionByIds(List<Integer> ids) {
         if (ids == null || ids.size() == 0) {
             return new ArrayList<>();
         }
@@ -131,14 +131,16 @@ public class ReportFieldTreeService extends ServiceImpl<ReportFieldTreeMapper, R
         queryWrapper.orderByAsc(ReportFieldTree::getOrder);
         return this.list(queryWrapper);
     }
-    public List<ReportFieldTree> getReportFieldTree(Integer id,Integer reportID){
+
+    public List<ReportFieldTree> getReportFieldTree(Integer id, Integer reportID) {
         LambdaQueryWrapper<ReportFieldTree> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.in(ReportFieldTree::getFieldId,id)
+        queryWrapper.in(ReportFieldTree::getFieldId, id)
                 .in(ReportFieldTree::getReportId, reportID);
         queryWrapper.orderByAsc(ReportFieldTree::getOrder);
         return this.list(queryWrapper);
     }
-    public List<Tree<Integer>> get(Integer id,Integer reportID){
+
+    public List<Tree<Integer>> get(Integer id, Integer reportID) {
         List<ReportFieldTree> dataList = this.getReportFieldTree(id, reportID);
 
         for (ReportFieldTree tree : dataList) {
@@ -166,7 +168,6 @@ public class ReportFieldTreeService extends ServiceImpl<ReportFieldTreeMapper, R
     }
 
 
-
     public List<Tree<Integer>> getReportFieldTreeNodeByFieldId(Integer fieldId) {
         List<ReportFieldTree> dataList = this.getReportFieldTreeOptionByFieldId(fieldId);
         for (ReportFieldTree tree : dataList) {
@@ -217,7 +218,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);
@@ -319,6 +320,7 @@ public class ReportFieldTreeService extends ServiceImpl<ReportFieldTreeMapper, R
 
     /**
      * 删除
+     *
      * @param fieldId
      */
     public void deleteByFieldId(Integer fieldId) {
@@ -327,6 +329,7 @@ public class ReportFieldTreeService extends ServiceImpl<ReportFieldTreeMapper, R
 
     /**
      * 查询
+     *
      * @param id
      * @param nodes
      * @return
@@ -346,6 +349,7 @@ public class ReportFieldTreeService extends ServiceImpl<ReportFieldTreeMapper, R
 
     /**
      * 删除（关联的reportFieldPatentLink也要删除）
+     *
      * @param id
      */
 
@@ -355,8 +359,10 @@ public class ReportFieldTreeService extends ServiceImpl<ReportFieldTreeMapper, R
         reportFieldPatentLinkService.deleteByOptionIds(nodes);
         this.removeByIds(nodes);
     }
+
     /**
      * 删除（关联的reportFieldPatentLink也要删除）
+     *
      * @param id
      */
 
@@ -370,6 +376,7 @@ public class ReportFieldTreeService extends ServiceImpl<ReportFieldTreeMapper, R
 
     /**
      * 修改
+     *
      * @param projectFieldOption
      * @return
      */
@@ -391,4 +398,13 @@ public class ReportFieldTreeService extends ServiceImpl<ReportFieldTreeMapper, R
         this.edit(projectFieldTree);
         return Response.success(projectFieldTree.getId());
     }
+
+    public void addBatchs(List<ReportFieldTree> treeList, Integer fieldid) {
+        if (treeList.size() != 0) {
+            treeList.forEach(ite -> ite.setFieldId(fieldid));
+            this.saveOrUpdateBatch(treeList);
+        }
+    }
 }
+
+