12.15修改

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

@@ -9,6 +9,7 @@ import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.service.business.CompareFilesService;
 
 
+import cn.cslg.report.service.business.ReportFieldPatentLinkService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -25,6 +26,7 @@ import java.io.IOException;
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class CompareFilesController {
     private final CompareFilesService compareFilesService;
+    private final ReportFieldPatentLinkService fieldPatentLinkService;
 
     @GetMapping("/index/setting/all")
     @Operation(summary ="获取当前所有的,传过来报告（int）id，和（String）专利号")
@@ -37,6 +39,12 @@ public class CompareFilesController {
          compareFilesService.getPatentIndexSetting(params);
        return Response.success();
     }
+    @PostMapping("/index/setting/update")
+    @Operation(summary = "获取专利标引情况")
+    public String getPatentIndexSetting2(@RequestBody PatentIndexSettingVO params) throws IOException {
+        fieldPatentLinkService.updatePatentIndexSetting2(params);
+        return Response.success();
+    }
 
 
 

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

@@ -82,8 +82,10 @@ public class AssoTaskPersonelService extends ServiceImpl<AssoTaskPersonelMapper,
             //拿到专利号
             LambdaQueryWrapper<AssoTaskPersonel> wrappers = new LambdaQueryWrapper();
             wrappers.eq(AssoTaskPersonel::getTaskId, patentVO.getTaskId())
-                    .eq(AssoTaskPersonel::getState, patentVO.getState());
-
+                    .eq(AssoTaskPersonel::getState, patentVO.getTaskStatus());
+            List<AssoTaskPersonel> list = this.list(wrappers);
+            //专利号
+            patentNumber = list.stream().map(AssoTaskPersonel::getPatentNo).collect(Collectors.toList());
         }
 
         patentVO.setPatentNos(patentNumber);
@@ -91,7 +93,7 @@ public class AssoTaskPersonelService extends ServiceImpl<AssoTaskPersonelMapper,
 
         if (patentVO.getLocPosition() == 1) {
             patentVO.setStartNumber(0);
-           patentVO.setEndNumber(1);
+            patentVO.setEndNumber(1);
             String res = outInterfaceService.getPatentFromPAS(patentVO, 1);
             JSONObject jsonObject = JSONObject.parseObject(res);
             JSONObject jsonObject1 = JSONObject.parseObject(jsonObject.get("data").toString());

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

@@ -213,6 +213,7 @@ public class ReportFieldPatentLinkService extends ServiceImpl<ReportFieldPatentL
             case 4:
             case 5:
                 List<ReportFieldOption> projectFieldOptionList = reportFieldOptionService.getFieldOptionListByIds(optionIds);
+
                 for (ReportFieldOption projectFieldOption : projectFieldOptionList) {
                     LabelDTO map = new LabelDTO();
                     map.setValue(projectFieldOption.getId());
@@ -239,64 +240,95 @@ public class ReportFieldPatentLinkService extends ServiceImpl<ReportFieldPatentL
      * @param params
      */
     @Transactional(rollbackFor = Exception.class)
-//    public void updatePatentIndexSetting(PatentIndexSettingVO params) {
-//        this.delete(params.getReportId(), params.getPatentNo(), params.getFieldId());
-//        List<Integer> optionIds = params.getSelected().stream().map(LabelDTO::getValue).distinct().collect(Collectors.toList());
-//        List<String> texts = params.getSelected().stream().map(LabelDTO::getLabel).distinct().collect(Collectors.toList());
-//        List<ReportFieldPatentLink> projectFieldPatentLinkList = new ArrayList<>();
-//        switch (params.getType()) {
-//            case 0:
-//            case 1:
-//            case 2:
+    public void updatePatentIndexSetting(PatentIndexSettingVO params) {
+
+        List<Integer> optionIds = params.getSelected().stream().map(LabelDTO::getValue).distinct().collect(Collectors.toList());
+        List<String> texts = params.getSelected().stream().map(LabelDTO::getLabel).distinct().collect(Collectors.toList());
+        List<ReportFieldPatentLink> projectFieldPatentLinkList = new ArrayList<>();
+        switch (params.getType()) {
+            case 0:
+            case 1:
+            case 2:
 //                List<ReportFieldText> tempList = reportFieldTextService.getProjectFieldTextByFieldId(params.getFieldId());
 //                for (String text : texts) {
 //                    if (StringUtils.isEmpty(text)) {
 //                        continue;
 //                    }
 //                    ReportFieldText reportFieldText = tempList.stream().filter(item -> item.getText().equals(text)).findFirst().orElse(null);
-//                    if (reportFieldText == null) {
-//                        reportFieldText = new ReportFieldText();
+//                    if (reportFieldText != null) {
+//                        reportFieldText.setFieldId(params.getFieldId());
+//                        reportFieldText.setText(text);
+//                        reportFieldText.updateById();
+//                    }
+//                    else {
+//                        reportFieldText=new ReportFieldText();
 //                        reportFieldText.setFieldId(params.getFieldId());
 //                        reportFieldText.setText(text);
 //                        reportFieldText.insert();
 //                    }
-//                    ReportFieldPatentLink projectFieldPatentLink = new ReportFieldPatentLink();
-//                    projectFieldPatentLink.setPatentNo(params.getPatentNo());
-//                    projectFieldPatentLink.setReportId(params.getReportId());
-//                    projectFieldPatentLink.setType(params.getType());
-//                    projectFieldPatentLink.setFieldId(params.getFieldId());
-//                    projectFieldPatentLink.setCreateBy(loginUtils.getId());
-//                    projectFieldPatentLink.setOptionId(reportFieldText.getId());
-//                    projectFieldPatentLinkList.add(projectFieldPatentLink);
-//                }
-//                break;
-//            case 3:
-//            case 4:
-//            case 5:
-//            case 6:
-//                for (Integer optionId : optionIds) {
-//                    ReportFieldPatentLink projectFieldPatentLink = new ReportFieldPatentLink();
-//                    projectFieldPatentLink.setPatentNo(params.getPatentNo());
-//                    projectFieldPatentLink.setReportId(params.getReportId());
-//                    projectFieldPatentLink.setType(params.getType());
-//                    projectFieldPatentLink.setFieldId(params.getFieldId());
-//                    projectFieldPatentLink.setCreateBy(loginUtils.getId());
-//                    projectFieldPatentLink.setOptionId(optionId);
-//                    projectFieldPatentLinkList.add(projectFieldPatentLink);
-//                }
-//                break;
-//        }
-//        if (projectFieldPatentLinkList.size() != 0) {
-//            this.saveOrUpdateBatch(projectFieldPatentLinkList);
-//        }
-//
-//    }
-//    public List<ReportFieldPatentLink> get(int id) throws IOException{
-//        LambdaQueryWrapper<ReportFieldPatentLink> linkLambdaQueryWrapper=new LambdaQueryWrapper<>();
-//        linkLambdaQueryWrapper.eq(ReportFieldPatentLink::getReportId,id);
-//        return this.list(linkLambdaQueryWrapper);
-//    }
-    public void updatePatentIndexSetting(PatentIndexSettingVO params){
+                    LambdaQueryWrapper<ReportFieldPatentLink> queryWrapper = new LambdaQueryWrapper<>();
+                    queryWrapper.eq(ReportFieldPatentLink::getPatentNo, params.getPatentNo())
+                            .eq(ReportFieldPatentLink::getReportId, params.getReportId())
+                            .eq(ReportFieldPatentLink::getFieldId, params.getFieldId());
+                    List<ReportFieldPatentLink> list = this.list(queryWrapper);
+                    ReportFieldPatentLink reportFieldPatentLink;
+                    if(list.size()!=0) {
+                        reportFieldPatentLink=list.get(0);
+                        Integer optionId = reportFieldPatentLink.getOptionId();
+                        List<ReportFieldText> reportFieldTexts = reportFieldTextService.get(optionId);
+                        ReportFieldText reportFieldText = reportFieldTexts.get(0);
+                        reportFieldText.setText(params.getSelected().get(0).getLabel());
+                        reportFieldText.updateById();
+                        reportFieldPatentLink.setFieldId(reportFieldText.getFieldId());
+                        reportFieldPatentLink.setOptionId(reportFieldText.getId());
+                        reportFieldPatentLink.setCreateBy(loginUtils.getId());
+                        reportFieldPatentLink.setPatentNo(params.getPatentNo());
+                        reportFieldPatentLink.setReportId(params.getReportId());
+
+                        reportFieldPatentLink.updateById();
+                    }else {
+                        reportFieldPatentLink=new ReportFieldPatentLink();
+                        ReportFieldText reportFieldText=new ReportFieldText();
+                        reportFieldText.setText(params.getSelected().get(0).getLabel());
+                        reportFieldText.setFieldId(params.getFieldId());
+                        reportFieldText.insert();
+                        reportFieldPatentLink.setFieldId(reportFieldText.getFieldId());
+                        reportFieldPatentLink.setOptionId(reportFieldText.getId());
+                        reportFieldPatentLink.setCreateBy(loginUtils.getId());
+                        reportFieldPatentLink.setPatentNo(params.getPatentNo());
+                        reportFieldPatentLink.setReportId(params.getReportId());
+                        reportFieldPatentLink.insert();
+                    }
+
+
+                break;
+            case 3:
+            case 4:
+            case 5:
+            case 6:
+                for (Integer optionId : optionIds) {
+                    ReportFieldPatentLink projectFieldPatentLink = new ReportFieldPatentLink();
+                    projectFieldPatentLink.setPatentNo(params.getPatentNo());
+                    projectFieldPatentLink.setReportId(params.getReportId());
+                    projectFieldPatentLink.setType(params.getType());
+                    projectFieldPatentLink.setFieldId(params.getFieldId());
+                    projectFieldPatentLink.setCreateBy(loginUtils.getId());
+                    projectFieldPatentLink.setOptionId(optionId);
+                    projectFieldPatentLinkList.add(projectFieldPatentLink);
+                }
+                break;
+        }
+        if (projectFieldPatentLinkList.size() != 0) {
+            this.saveOrUpdateBatch(projectFieldPatentLinkList);
+        }
+
+    }
+    public List<ReportFieldPatentLink> get(int id) throws IOException{
+        LambdaQueryWrapper<ReportFieldPatentLink> linkLambdaQueryWrapper=new LambdaQueryWrapper<>();
+        linkLambdaQueryWrapper.eq(ReportFieldPatentLink::getReportId,id);
+        return this.list(linkLambdaQueryWrapper);
+    }
+    public void updatePatentIndexSetting2(PatentIndexSettingVO params){
         switch (params.getType()){
             case 0:
             case 1:

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

@@ -55,8 +55,15 @@ public class ReportFieldTextService extends ServiceImpl<ReportFieldTextMapper, R
     public List<ReportFieldText> getProjectFieldTextByFieldId(Integer fieldId) {
         LambdaQueryWrapper<ReportFieldText> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ReportFieldText::getFieldId, fieldId);
+
         return this.list(queryWrapper);
     }
+    public List<ReportFieldText> get(Integer id){
+        LambdaQueryWrapper<ReportFieldText> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ReportFieldText::getId, id);
+        return this.list(queryWrapper);
+    }
+
 //删除
     public void deleteByFieldId(Integer fieldId) {
         this.remove(Wrappers.<ReportFieldText>lambdaQuery().eq(ReportFieldText::getFieldId, fieldId));

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

@@ -110,12 +110,15 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
     //查询报告
     public String queryReport(ReportVO reportVO) throws IOException {
         LambdaQueryWrapper<Report> queryWrapper = new LambdaQueryWrapper<>();
-        if (reportVO.getName() != null) {
+        if (reportVO.getName() != null&&reportVO.getName()!="") {
             queryWrapper.like(Report::getName, reportVO.getName());
         }
         if (reportVO.getReportId() != null) {
             queryWrapper.eq(Report::getId, reportVO.getReportId());
         }
+        if(reportVO.getSignPatentNo()!=null&&reportVO.getSignPatentNo()!=""){
+            queryWrapper.like(Report::getSignPatentNo,reportVO.getSignPatentNo());
+        }
         queryWrapper.orderByDesc(Report::getId);
         //分页
         if (reportVO.getSize() != null && reportVO.getCurrent() != null) {