20250214 审核任务

src/main/java/cn/cslg/pas/factorys/noveltyTemplateFacotry/GetCommonTempalte.java

@@ -1,6 +1,8 @@
 package cn.cslg.pas.factorys.noveltyTemplateFacotry;
 
+import cn.cslg.pas.common.model.cronModel.PersonnelVO;
 import cn.cslg.pas.common.model.cronModel.SystemFile;
+import cn.cslg.pas.common.utils.DateUtils;
 import cn.cslg.pas.common.utils.StringUtils;
 import cn.cslg.pas.common.vo.CompareLiteratureVO;
 import cn.cslg.pas.common.vo.NoveltyProjectVO.NoveltyCompareRecordQueryVO;
@@ -26,9 +28,9 @@ import java.util.stream.Collectors;
  */
 @Component
 public class GetCommonTempalte implements GetTemplateMapsImp {
-    public  Map<String,Object> getMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs,TechnicalCaseVO technicalCaseVO,List<CompareLiteratureVO> compareLiteratureVOS,List<NoveltyCompareRecordQueryVO> noveltyCompareRecordQueryVOS,List<RetrieveRecordVO> retrieveRecordVOS){
-        Map<String,Object> map =new HashMap<>();
-        Map<String, Object> baseMap = this.getBaseMap(queryNoveltyProjectVOs);
+    public Map<String, Object> getMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs, TechnicalCaseVO technicalCaseVO, List<CompareLiteratureVO> compareLiteratureVOS, List<NoveltyCompareRecordQueryVO> noveltyCompareRecordQueryVOS, List<RetrieveRecordVO> retrieveRecordVOS, PersonnelVO personnelVO) {
+        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> baseMap = this.getBaseMap(queryNoveltyProjectVOs, retrieveRecordVOS, personnelVO);
         Map<String, Object> technicalCaseMap = this.getTechnicalCaseMap(technicalCaseVO);
         List<Map<String, Object>> compareLiteratureMap = this.getCompareLiteratureMap(compareLiteratureVOS);
         List<Map<String, Object>> compareRecordMap = this.getCompareRecordMap(noveltyCompareRecordQueryVOS, compareLiteratureVOS);
@@ -40,6 +42,7 @@ public class GetCommonTempalte implements GetTemplateMapsImp {
         map.put("searchRecord", searchRecordMap);
         return map;
     }
+
     @Override
     public Map<String, Object> getTechnicalCaseMap(TechnicalCaseVO technicalCaseVO) {
         Map<String, Object> technicalMap = new HashMap<>();
@@ -53,7 +56,7 @@ public class GetCommonTempalte implements GetTemplateMapsImp {
     }
 
     @Override
-    public Map<String, Object> getBaseMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs) {
+    public Map<String, Object> getBaseMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs, List<RetrieveRecordVO> retrieveRecordVOS, PersonnelVO personnelVO) {
         Map<String, Object> baseMap = new HashMap<>();
         if (queryNoveltyProjectVOs == null || queryNoveltyProjectVOs.size() == 0) {
             return baseMap;
@@ -74,7 +77,17 @@ public class GetCommonTempalte implements GetTemplateMapsImp {
         baseMap.put("preliminaryConclusions", queryNoveltyProjectVO.getPreliminaryConclusions());
         baseMap.put("applicationAdvice", queryNoveltyProjectVO.getApplicationAdvice());
         baseMap.put("finalConclusions", NoveltyTempalteUtil.reFinalConclusions(Arrays.asList(queryNoveltyProjectVO.getPreliminaryConclusions(), queryNoveltyProjectVO.getApplicationAdvice())));
-
+        if (retrieveRecordVOS != null && retrieveRecordVOS.size() > 0) {
+            RetrieveRecordVO retrieveRecordVO = retrieveRecordVOS.get(retrieveRecordVOS.size() - 1);
+            Date date = retrieveRecordVO.getRetrieveTime();
+            if (date != null) {
+                String dateStr = DateUtils.formatDate(date, "yyyy-MM-dd");
+                baseMap.put("searchTime", dateStr);
+            }
+            if (queryNoveltyProjectVO.getSearchUnit() == null || queryNoveltyProjectVO.getSearchUnit().trim().equals("")) {
+                baseMap.put("searchUnit", personnelVO.getTenantName());
+            }
+        }
         return baseMap;
     }
 
@@ -167,8 +180,18 @@ public class GetCommonTempalte implements GetTemplateMapsImp {
             retrieveRecordVOS.forEach(item -> {
                 Map<String, Object> map = new HashMap<>();
                 map.put("conditions", item.getConditions());
-                map.put("dbType", item.getDbType());
+                String dbType = item.getDbType();
+                if (dbType == null || dbType.trim().equals("")) {
+                    dbType = "小世系统";
+                }
+                String re = NoveltyTempalteUtil.getDbTypes(dbType);
+                if (re == null) {
+                    re = "";
+                }
+                map.put("area", re);
+                map.put("dbType", dbType);
                 map.put("totalNum", item.getTotalNum());
+
                 maps.add(map);
             });
         }

src/main/java/cn/cslg/pas/factorys/noveltyTemplateFacotry/GetDahuaTempalte.java

@@ -1,6 +1,8 @@
 package cn.cslg.pas.factorys.noveltyTemplateFacotry;
 
+import cn.cslg.pas.common.model.cronModel.PersonnelVO;
 import cn.cslg.pas.common.model.cronModel.SystemFile;
+import cn.cslg.pas.common.utils.DateUtils;
 import cn.cslg.pas.common.utils.StringUtils;
 import cn.cslg.pas.common.vo.CompareLiteratureVO;
 import cn.cslg.pas.common.vo.NoveltyProjectVO.NoveltyCompareRecordQueryVO;
@@ -27,9 +29,9 @@ public class GetDahuaTempalte implements GetTemplateMapsImp {
     private EsPatentService esPatentService;
 
     @Override
-    public Map<String, Object> getMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs, TechnicalCaseVO technicalCaseVO, List<CompareLiteratureVO> compareLiteratureVOS, List<NoveltyCompareRecordQueryVO> noveltyCompareRecordQueryVOS, List<RetrieveRecordVO> retrieveRecordVOS) {
+    public Map<String, Object> getMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs, TechnicalCaseVO technicalCaseVO, List<CompareLiteratureVO> compareLiteratureVOS, List<NoveltyCompareRecordQueryVO> noveltyCompareRecordQueryVOS, List<RetrieveRecordVO> retrieveRecordVOS, PersonnelVO personnelVO) {
         Map<String, Object> map = new HashMap<>();
-        Map<String, Object> baseMap = this.getBaseMap(queryNoveltyProjectVOs);
+        Map<String, Object> baseMap = this.getBaseMap(queryNoveltyProjectVOs, retrieveRecordVOS,personnelVO);
         Map<String, Object> technicalCaseMap = this.getTechnicalCaseMap(technicalCaseVO);
         List<Map<String, Object>> compareLiteratureMap = this.getCompareLiteratureMap(compareLiteratureVOS);
         List<Map<String, Object>> compareRecordMap = this.getCompareRecordMap(noveltyCompareRecordQueryVOS, compareLiteratureVOS);
@@ -56,7 +58,7 @@ public class GetDahuaTempalte implements GetTemplateMapsImp {
     }
 
     @Override
-    public Map<String, Object> getBaseMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs) {
+    public Map<String, Object> getBaseMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs,List<RetrieveRecordVO> retrieveRecordVOS,PersonnelVO personnelVO) {
         Map<String, Object> baseMap = new HashMap<>();
         if (queryNoveltyProjectVOs == null || queryNoveltyProjectVOs.size() == 0) {
             return baseMap;
@@ -81,9 +83,20 @@ public class GetDahuaTempalte implements GetTemplateMapsImp {
         baseMap.put("ipr", queryNoveltyProjectVO.getIpr());
         if (queryNoveltyProjectVO.getHeadName() != null) {
             baseMap.put("searchName", queryNoveltyProjectVO.getHeadName());
-        } else if (queryNoveltyProjectVO.getCaseName() != null) {
+        } else if (queryNoveltyProjectVO.getCreateName() != null) {
             baseMap.put("searchName", queryNoveltyProjectVO.getCreateName());
         }
+        if (retrieveRecordVOS != null && retrieveRecordVOS.size() > 0) {
+            RetrieveRecordVO retrieveRecordVO = retrieveRecordVOS.get(retrieveRecordVOS.size() - 1);
+            Date date = retrieveRecordVO.getRetrieveTime();
+            if (date != null) {
+                String dateStr = DateUtils.formatDate(date, "yyyy-MM-dd");
+                baseMap.put("searchTime", dateStr);
+            }
+            if (queryNoveltyProjectVO.getSearchUnit() == null || queryNoveltyProjectVO.getSearchUnit().trim().equals("")) {
+                baseMap.put("searchUnit", personnelVO.getTenantName());
+            }
+        }
         return baseMap;
     }
 

src/main/java/cn/cslg/pas/factorys/noveltyTemplateFacotry/GetShenNanTempalte.java

@@ -1,5 +1,6 @@
 package cn.cslg.pas.factorys.noveltyTemplateFacotry;
 
+import cn.cslg.pas.common.model.cronModel.PersonnelVO;
 import cn.cslg.pas.common.model.cronModel.SystemFile;
 import cn.cslg.pas.common.utils.DateUtils;
 import cn.cslg.pas.common.utils.StringUtils;
@@ -27,9 +28,9 @@ public class GetShenNanTempalte implements GetTemplateMapsImp {
     @Autowired
     private EsPatentService esPatentService;
     @Override
-    public  Map<String,Object> getMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs,TechnicalCaseVO technicalCaseVO,List<CompareLiteratureVO> compareLiteratureVOS,List<NoveltyCompareRecordQueryVO> noveltyCompareRecordQueryVOS,List<RetrieveRecordVO> retrieveRecordVOS){
+    public  Map<String,Object> getMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs,TechnicalCaseVO technicalCaseVO,List<CompareLiteratureVO> compareLiteratureVOS,List<NoveltyCompareRecordQueryVO> noveltyCompareRecordQueryVOS,List<RetrieveRecordVO> retrieveRecordVOS, PersonnelVO personnelVO){
         Map<String,Object> map =new HashMap<>();
-        Map<String, Object> baseMap = this.getBaseMap(queryNoveltyProjectVOs);
+        Map<String, Object> baseMap = this.getBaseMap(queryNoveltyProjectVOs, retrieveRecordVOS,personnelVO);
         Map<String, Object> technicalCaseMap = this.getTechnicalCaseMap(technicalCaseVO);
         List<Map<String, Object>> compareLiteratureMap = this.getCompareLiteratureMap(compareLiteratureVOS);
         List<Map<String, Object>> compareRecordMap = this.getCompareRecordMap(noveltyCompareRecordQueryVOS, compareLiteratureVOS);
@@ -54,7 +55,7 @@ public class GetShenNanTempalte implements GetTemplateMapsImp {
     }
 
     @Override
-    public Map<String, Object> getBaseMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs) {
+    public Map<String, Object> getBaseMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs,List<RetrieveRecordVO> retrieveRecordVOS,PersonnelVO personnelVO) {
         Map<String, Object> baseMap = new HashMap<>();
         if (queryNoveltyProjectVOs == null || queryNoveltyProjectVOs.size() == 0) {
             return baseMap;
@@ -79,9 +80,20 @@ public class GetShenNanTempalte implements GetTemplateMapsImp {
         baseMap.put("ipr", queryNoveltyProjectVO.getIpr());
         if (queryNoveltyProjectVO.getHeadName() != null) {
             baseMap.put("searchName", queryNoveltyProjectVO.getHeadName());
-        } else if (queryNoveltyProjectVO.getCaseName() != null) {
+        } else if (queryNoveltyProjectVO.getCreateName() != null) {
             baseMap.put("searchName", queryNoveltyProjectVO.getCreateName());
         }
+        if (retrieveRecordVOS != null && retrieveRecordVOS.size() > 0) {
+            RetrieveRecordVO retrieveRecordVO = retrieveRecordVOS.get(retrieveRecordVOS.size() - 1);
+            Date date = retrieveRecordVO.getRetrieveTime();
+            if (date != null) {
+                String dateStr = DateUtils.formatDate(date, "yyyy-MM-dd");
+                baseMap.put("searchTime", dateStr);
+            }
+            if (queryNoveltyProjectVO.getSearchUnit() == null || queryNoveltyProjectVO.getSearchUnit().trim().equals("")) {
+                baseMap.put("searchUnit", personnelVO.getTenantName());
+            }
+        }
         return baseMap;
     }
 
@@ -163,7 +175,7 @@ public class GetShenNanTempalte implements GetTemplateMapsImp {
                     stringBuilder.append("[" + markSelectField + "]");
                     stringBuilder.append(markSelectText);
                     if (technicalFeature != null && !technicalFeature.trim().equals("")) {
-                        stringBuilder.append("揭示了" + technicalFeature);
+                        stringBuilder.append("（揭示了" + technicalFeature+"）");
                     }
                     stringBuilder.append(markNoteText);
                     contentList.add(stringBuilder.toString());

src/main/java/cn/cslg/pas/factorys/noveltyTemplateFacotry/GetTemplateMapsImp.java

@@ -1,6 +1,7 @@
 package cn.cslg.pas.factorys.noveltyTemplateFacotry;
 
 
+import cn.cslg.pas.common.model.cronModel.PersonnelVO;
 import cn.cslg.pas.common.vo.CompareLiteratureVO;
 import cn.cslg.pas.common.vo.NoveltyProjectVO.NoveltyCompareRecordQueryVO;
 import cn.cslg.pas.common.vo.NoveltyProjectVO.RetrieveRecordVO;
@@ -11,10 +12,10 @@ import java.util.List;
 import java.util.Map;
 
 public interface GetTemplateMapsImp {
-    public  Map<String,Object> getMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs,TechnicalCaseVO technicalCaseVO,List<CompareLiteratureVO> compareLiteratureVOS,List<NoveltyCompareRecordQueryVO> noveltyCompareRecordQueryVOS,List<RetrieveRecordVO> retrieveRecordVOS);
+    public  Map<String,Object> getMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs, TechnicalCaseVO technicalCaseVO, List<CompareLiteratureVO> compareLiteratureVOS, List<NoveltyCompareRecordQueryVO> noveltyCompareRecordQueryVOS, List<RetrieveRecordVO> retrieveRecordVOS, PersonnelVO personnelVO);
     public Map<String, Object> getTechnicalCaseMap(TechnicalCaseVO technicalCaseVO);
 
-    public Map<String, Object> getBaseMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs);
+    public Map<String, Object> getBaseMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs,List<RetrieveRecordVO> retrieveRecordVOS,PersonnelVO personnelVO);
 
     public List<Map<String, Object>> getCompareLiteratureMap(List<CompareLiteratureVO> compareLiteratureVOS);
 

src/main/java/cn/cslg/pas/factorys/noveltyTemplateFacotry/GetVisionoxTempalte.java

@@ -1,6 +1,8 @@
 package cn.cslg.pas.factorys.noveltyTemplateFacotry;
 
+import cn.cslg.pas.common.model.cronModel.PersonnelVO;
 import cn.cslg.pas.common.model.cronModel.SystemFile;
+import cn.cslg.pas.common.utils.DateUtils;
 import cn.cslg.pas.common.utils.StringUtils;
 import cn.cslg.pas.common.vo.CompareLiteratureVO;
 import cn.cslg.pas.common.vo.NoveltyProjectVO.NoveltyCompareRecordQueryVO;
@@ -27,9 +29,9 @@ public class GetVisionoxTempalte implements GetTemplateMapsImp {
     @Autowired
     private EsPatentService esPatentService;
     @Override
-    public  Map<String,Object> getMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs,TechnicalCaseVO technicalCaseVO,List<CompareLiteratureVO> compareLiteratureVOS,List<NoveltyCompareRecordQueryVO> noveltyCompareRecordQueryVOS,List<RetrieveRecordVO> retrieveRecordVOS){
+    public  Map<String,Object> getMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs,TechnicalCaseVO technicalCaseVO,List<CompareLiteratureVO> compareLiteratureVOS,List<NoveltyCompareRecordQueryVO> noveltyCompareRecordQueryVOS,List<RetrieveRecordVO> retrieveRecordVOS, PersonnelVO personnelVO){
         Map<String,Object> map =new HashMap<>();
-        Map<String, Object> baseMap = this.getBaseMap(queryNoveltyProjectVOs);
+        Map<String, Object> baseMap = this.getBaseMap(queryNoveltyProjectVOs, retrieveRecordVOS,personnelVO);
         Map<String, Object> technicalCaseMap = this.getTechnicalCaseMap(technicalCaseVO);
         List<Map<String, Object>> compareLiteratureMap = this.getCompareLiteratureMap(compareLiteratureVOS);
         List<Map<String, Object>> compareRecordMap = this.getCompareRecordMap(noveltyCompareRecordQueryVOS, compareLiteratureVOS);
@@ -54,7 +56,7 @@ public class GetVisionoxTempalte implements GetTemplateMapsImp {
     }
 
     @Override
-    public Map<String, Object> getBaseMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs) {
+    public Map<String, Object> getBaseMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs,List<RetrieveRecordVO> retrieveRecordVOS,PersonnelVO personnelVO) {
         Map<String, Object> baseMap = new HashMap<>();
         if (queryNoveltyProjectVOs == null || queryNoveltyProjectVOs.size() == 0) {
             return baseMap;
@@ -65,8 +67,12 @@ public class GetVisionoxTempalte implements GetTemplateMapsImp {
         baseMap.put("customCaseNumber", queryNoveltyProjectVO.getCustomCaseNumber());
         baseMap.put("caseName", queryNoveltyProjectVO.getCaseName());
         baseMap.put("technicalContact", queryNoveltyProjectVO.getTechnicalContact());
-        baseMap.put("searchUnit", queryNoveltyProjectVO.getSearchUnit());
-
+        String searchUnit = queryNoveltyProjectVO.getSearchUnit();
+        if (searchUnit == null || searchUnit.trim().equals("")) {
+            baseMap.put("searchUnit", "广东君龙律师事务所");
+        } else {
+            baseMap.put("searchUnit", queryNoveltyProjectVO.getSearchUnit());
+        }
         baseMap.put("inventor", queryNoveltyProjectVO.getInventor());
         baseMap.put("inventorContact", "");
         baseMap.put("distinguishTechnical", "");
@@ -75,13 +81,21 @@ public class GetVisionoxTempalte implements GetTemplateMapsImp {
         baseMap.put("preliminaryConclusions", queryNoveltyProjectVO.getPreliminaryConclusions());
         baseMap.put("applicationAdvice", queryNoveltyProjectVO.getApplicationAdvice());
         baseMap.put("finalConclusions", NoveltyTempalteUtil.reFinalConclusions(Arrays.asList(queryNoveltyProjectVO.getPreliminaryConclusions(), queryNoveltyProjectVO.getApplicationAdvice())));
-        baseMap.put("ifPatentability", "是");
+        baseMap.put("ifPatentability", queryNoveltyProjectVO.getIfPatentability());
         baseMap.put("ipr", queryNoveltyProjectVO.getIpr());
         if (queryNoveltyProjectVO.getHeadName() != null) {
             baseMap.put("searchName", queryNoveltyProjectVO.getHeadName());
-        } else if (queryNoveltyProjectVO.getCaseName() != null) {
+        } else if (queryNoveltyProjectVO.getCreateName() != null) {
             baseMap.put("searchName", queryNoveltyProjectVO.getCreateName());
         }
+        if (retrieveRecordVOS != null && retrieveRecordVOS.size() > 0) {
+            RetrieveRecordVO retrieveRecordVO = retrieveRecordVOS.get(retrieveRecordVOS.size() - 1);
+            Date date = retrieveRecordVO.getRetrieveTime();
+            if (date != null) {
+                String dateStr = DateUtils.formatDate(date, "yyyy-MM-dd");
+                baseMap.put("searchTime", dateStr);
+            }
+        }
         return baseMap;
     }
 
@@ -109,7 +123,7 @@ public class GetVisionoxTempalte implements GetTemplateMapsImp {
         List<String> patentNos = compareLiteratureVOS.stream().map(CompareLiteratureVO::getLiteratureNo).collect(Collectors.toList());
         List<Patent> patents = new ArrayList<>();
         try {
-            patents = esPatentService.getPatentsByNo(patentNos, false, null, null);
+            patents = esPatentService.getPatentsByNo(patentNos, true, null, null);
 
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/cn/cslg/pas/factorys/noveltyTemplateFacotry/GetVisionoxcxTempalte.java

@@ -1,6 +1,8 @@
 package cn.cslg.pas.factorys.noveltyTemplateFacotry;
 
+import cn.cslg.pas.common.model.cronModel.PersonnelVO;
 import cn.cslg.pas.common.model.cronModel.SystemFile;
+import cn.cslg.pas.common.utils.DateUtils;
 import cn.cslg.pas.common.utils.StringUtils;
 import cn.cslg.pas.common.vo.CompareLiteratureVO;
 import cn.cslg.pas.common.vo.NoveltyProjectVO.NoveltyCompareRecordQueryVO;
@@ -25,10 +27,11 @@ import java.util.stream.Collectors;
 public class GetVisionoxcxTempalte implements GetTemplateMapsImp {
     @Autowired
     private EsPatentService esPatentService;
+
     @Override
-    public  Map<String,Object> getMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs,TechnicalCaseVO technicalCaseVO,List<CompareLiteratureVO> compareLiteratureVOS,List<NoveltyCompareRecordQueryVO> noveltyCompareRecordQueryVOS,List<RetrieveRecordVO> retrieveRecordVOS){
-        Map<String,Object> map =new HashMap<>();
-        Map<String, Object> baseMap = this.getBaseMap(queryNoveltyProjectVOs);
+    public Map<String, Object> getMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs, TechnicalCaseVO technicalCaseVO, List<CompareLiteratureVO> compareLiteratureVOS, List<NoveltyCompareRecordQueryVO> noveltyCompareRecordQueryVOS, List<RetrieveRecordVO> retrieveRecordVOS, PersonnelVO personnelVO) {
+        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> baseMap = this.getBaseMap(queryNoveltyProjectVOs, retrieveRecordVOS, personnelVO);
         Map<String, Object> technicalCaseMap = this.getTechnicalCaseMap(technicalCaseVO);
         List<Map<String, Object>> compareLiteratureMap = this.getCompareLiteratureMap(compareLiteratureVOS);
         List<Map<String, Object>> compareRecordMap = this.getCompareRecordMap(noveltyCompareRecordQueryVOS, compareLiteratureVOS);
@@ -40,6 +43,7 @@ public class GetVisionoxcxTempalte implements GetTemplateMapsImp {
         map.put("searchRecord", searchRecordMap);
         return map;
     }
+
     @Override
     public Map<String, Object> getTechnicalCaseMap(TechnicalCaseVO technicalCaseVO) {
         Map<String, Object> technicalMap = new HashMap<>();
@@ -53,7 +57,7 @@ public class GetVisionoxcxTempalte implements GetTemplateMapsImp {
     }
 
     @Override
-    public Map<String, Object> getBaseMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs) {
+    public Map<String, Object> getBaseMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs, List<RetrieveRecordVO> retrieveRecordVOS, PersonnelVO personnelVO) {
         Map<String, Object> baseMap = new HashMap<>();
         if (queryNoveltyProjectVOs == null || queryNoveltyProjectVOs.size() == 0) {
             return baseMap;
@@ -64,8 +68,12 @@ public class GetVisionoxcxTempalte implements GetTemplateMapsImp {
         baseMap.put("customCaseNumber", queryNoveltyProjectVO.getCustomCaseNumber());
         baseMap.put("caseName", queryNoveltyProjectVO.getCaseName());
         baseMap.put("technicalContact", queryNoveltyProjectVO.getTechnicalContact());
-        baseMap.put("searchUnit", queryNoveltyProjectVO.getSearchUnit());
-
+        String searchUnit = queryNoveltyProjectVO.getSearchUnit();
+        if (searchUnit == null || searchUnit.trim().equals("")) {
+            baseMap.put("searchUnit", "广东君龙律师事务所");
+        } else {
+            baseMap.put("searchUnit", queryNoveltyProjectVO.getSearchUnit());
+        }
         baseMap.put("inventor", queryNoveltyProjectVO.getInventor());
         baseMap.put("inventorContact", "");
         baseMap.put("distinguishTechnical", "");
@@ -74,13 +82,21 @@ public class GetVisionoxcxTempalte implements GetTemplateMapsImp {
         baseMap.put("preliminaryConclusions", queryNoveltyProjectVO.getPreliminaryConclusions());
         baseMap.put("applicationAdvice", queryNoveltyProjectVO.getApplicationAdvice());
         baseMap.put("finalConclusions", NoveltyTempalteUtil.reFinalConclusions(Arrays.asList(queryNoveltyProjectVO.getPreliminaryConclusions(), queryNoveltyProjectVO.getApplicationAdvice())));
-        baseMap.put("ifPatentability", "是");
+        baseMap.put("ifPatentability", queryNoveltyProjectVO.getIfPatentability());
         baseMap.put("ipr", queryNoveltyProjectVO.getIpr());
         if (queryNoveltyProjectVO.getHeadName() != null) {
             baseMap.put("searchName", queryNoveltyProjectVO.getHeadName());
-        } else if (queryNoveltyProjectVO.getCaseName() != null) {
+        } else if (queryNoveltyProjectVO.getCreateName() != null) {
             baseMap.put("searchName", queryNoveltyProjectVO.getCreateName());
         }
+        if (retrieveRecordVOS != null && retrieveRecordVOS.size() > 0) {
+            RetrieveRecordVO retrieveRecordVO = retrieveRecordVOS.get(retrieveRecordVOS.size() - 1);
+            Date date = retrieveRecordVO.getRetrieveTime();
+            if (date != null) {
+                String dateStr = DateUtils.formatDate(date, "yyyy-MM-dd");
+                baseMap.put("searchTime", dateStr);
+            }
+        }
         return baseMap;
     }
 
@@ -108,7 +124,7 @@ public class GetVisionoxcxTempalte implements GetTemplateMapsImp {
         List<String> patentNos = compareLiteratureVOS.stream().map(CompareLiteratureVO::getLiteratureNo).collect(Collectors.toList());
         List<Patent> patents = new ArrayList<>();
         try {
-            patents = esPatentService.getPatentsByNo(patentNos, false, null, null);
+            patents = esPatentService.getPatentsByNo(patentNos, true, null, null);
 
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/cn/cslg/pas/factorys/noveltyTemplateFacotry/GetaiqijiTempalte.java

@@ -1,5 +1,6 @@
 package cn.cslg.pas.factorys.noveltyTemplateFacotry;
 
+import cn.cslg.pas.common.model.cronModel.PersonnelVO;
 import cn.cslg.pas.common.model.cronModel.SystemFile;
 import cn.cslg.pas.common.utils.DateUtils;
 import cn.cslg.pas.common.utils.StringUtils;
@@ -26,9 +27,9 @@ public class GetaiqijiTempalte implements GetTemplateMapsImp {
 
     @Autowired
     private EsPatentService esPatentService;
-    public  Map<String,Object> getMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs,TechnicalCaseVO technicalCaseVO,List<CompareLiteratureVO> compareLiteratureVOS,List<NoveltyCompareRecordQueryVO> noveltyCompareRecordQueryVOS,List<RetrieveRecordVO> retrieveRecordVOS){
+    public  Map<String,Object> getMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs,TechnicalCaseVO technicalCaseVO,List<CompareLiteratureVO> compareLiteratureVOS,List<NoveltyCompareRecordQueryVO> noveltyCompareRecordQueryVOS,List<RetrieveRecordVO> retrieveRecordVOS,PersonnelVO personnelVO){
         Map<String,Object> map =new HashMap<>();
-        Map<String, Object> baseMap = this.getBaseMap(queryNoveltyProjectVOs);
+        Map<String, Object> baseMap = this.getBaseMap(queryNoveltyProjectVOs, retrieveRecordVOS,personnelVO);
         Map<String, Object> technicalCaseMap = this.getTechnicalCaseMap(technicalCaseVO);
         List<Map<String, Object>> compareLiteratureMap = this.getCompareLiteratureMap(compareLiteratureVOS);
         List<Map<String, Object>> compareRecordMap = this.getCompareRecordMap(noveltyCompareRecordQueryVOS, compareLiteratureVOS);
@@ -54,7 +55,7 @@ public class GetaiqijiTempalte implements GetTemplateMapsImp {
     }
 
     @Override
-    public Map<String, Object> getBaseMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs) {
+    public Map<String, Object> getBaseMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs,List<RetrieveRecordVO> retrieveRecordVOS,PersonnelVO personnelVO) {
         Map<String, Object> baseMap = new HashMap<>();
         if (queryNoveltyProjectVOs == null || queryNoveltyProjectVOs.size() == 0) {
             return baseMap;

src/main/java/cn/cslg/pas/factorys/noveltyTemplateFacotry/GetlingpaoTempalte.java

@@ -1,5 +1,6 @@
 package cn.cslg.pas.factorys.noveltyTemplateFacotry;
 
+import cn.cslg.pas.common.model.cronModel.PersonnelVO;
 import cn.cslg.pas.common.model.cronModel.SystemFile;
 import cn.cslg.pas.common.utils.DateUtils;
 import cn.cslg.pas.common.utils.StringUtils;
@@ -27,9 +28,9 @@ public class GetlingpaoTempalte implements GetTemplateMapsImp {
     private EsPatentService esPatentService;
 
     @Override
-    public Map<String, Object> getMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs, TechnicalCaseVO technicalCaseVO, List<CompareLiteratureVO> compareLiteratureVOS, List<NoveltyCompareRecordQueryVO> noveltyCompareRecordQueryVOS, List<RetrieveRecordVO> retrieveRecordVOS) {
+    public Map<String, Object> getMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs, TechnicalCaseVO technicalCaseVO, List<CompareLiteratureVO> compareLiteratureVOS, List<NoveltyCompareRecordQueryVO> noveltyCompareRecordQueryVOS, List<RetrieveRecordVO> retrieveRecordVOS, PersonnelVO personnelVO) {
         Map<String, Object> map = new HashMap<>();
-        Map<String, Object> baseMap = this.getBaseMap(queryNoveltyProjectVOs);
+        Map<String, Object> baseMap = this.getBaseMap(queryNoveltyProjectVOs, retrieveRecordVOS,personnelVO);
         Map<String, Object> technicalCaseMap = this.getTechnicalCaseMap(technicalCaseVO);
         List<Map<String, Object>> compareLiteratureMap = this.getCompareLiteratureMap(compareLiteratureVOS);
         List<Map<String, Object>> compareRecordMap = this.getCompareRecordMap(noveltyCompareRecordQueryVOS, compareLiteratureVOS);
@@ -54,7 +55,7 @@ public class GetlingpaoTempalte implements GetTemplateMapsImp {
     }
 
     @Override
-    public Map<String, Object> getBaseMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs) {
+    public Map<String, Object> getBaseMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs,List<RetrieveRecordVO> retrieveRecordVOS,PersonnelVO personnelVO) {
         Map<String, Object> baseMap = new HashMap<>();
         if (queryNoveltyProjectVOs == null || queryNoveltyProjectVOs.size() == 0) {
             return baseMap;
@@ -79,9 +80,20 @@ public class GetlingpaoTempalte implements GetTemplateMapsImp {
         baseMap.put("ipr", queryNoveltyProjectVO.getIpr());
         if (queryNoveltyProjectVO.getHeadName() != null) {
             baseMap.put("searchName", queryNoveltyProjectVO.getHeadName());
-        } else if (queryNoveltyProjectVO.getCaseName() != null) {
+        } else if (queryNoveltyProjectVO.getCreateName() != null) {
             baseMap.put("searchName", queryNoveltyProjectVO.getCreateName());
         }
+        if (retrieveRecordVOS != null && retrieveRecordVOS.size() > 0) {
+            RetrieveRecordVO retrieveRecordVO = retrieveRecordVOS.get(retrieveRecordVOS.size() - 1);
+            Date date = retrieveRecordVO.getRetrieveTime();
+            if (date != null) {
+                String dateStr = DateUtils.formatDate(date, "yyyy-MM-dd");
+                baseMap.put("searchTime", dateStr);
+            }
+            if (queryNoveltyProjectVO.getSearchUnit() == null || queryNoveltyProjectVO.getSearchUnit().trim().equals("")) {
+                baseMap.put("searchUnit", personnelVO.getTenantName());
+            }
+        }
         return baseMap;
     }
 

src/main/java/cn/cslg/pas/factorys/noveltyTemplateFacotry/GetningdeTempalte.java

@@ -1,5 +1,6 @@
 package cn.cslg.pas.factorys.noveltyTemplateFacotry;
 
+import cn.cslg.pas.common.model.cronModel.PersonnelVO;
 import cn.cslg.pas.common.model.cronModel.SystemFile;
 import cn.cslg.pas.common.utils.DateUtils;
 import cn.cslg.pas.common.utils.StringUtils;
@@ -28,9 +29,9 @@ public class GetningdeTempalte implements GetTemplateMapsImp {
     private EsPatentService esPatentService;
 
     @Override
-    public Map<String, Object> getMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs, TechnicalCaseVO technicalCaseVO, List<CompareLiteratureVO> compareLiteratureVOS, List<NoveltyCompareRecordQueryVO> noveltyCompareRecordQueryVOS, List<RetrieveRecordVO> retrieveRecordVOS) {
+    public Map<String, Object> getMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs, TechnicalCaseVO technicalCaseVO, List<CompareLiteratureVO> compareLiteratureVOS, List<NoveltyCompareRecordQueryVO> noveltyCompareRecordQueryVOS, List<RetrieveRecordVO> retrieveRecordVOS,PersonnelVO personnelVO) {
         Map<String, Object> map = new HashMap<>();
-        Map<String, Object> baseMap = this.getBaseMap(queryNoveltyProjectVOs, retrieveRecordVOS);
+        Map<String, Object> baseMap = this.getBaseMap(queryNoveltyProjectVOs, retrieveRecordVOS,personnelVO);
         Map<String, Object> technicalCaseMap = this.getTechnicalCaseMap(technicalCaseVO);
         List<Map<String, Object>> compareLiteratureMap = this.getCompareLiteratureMap(compareLiteratureVOS);
         List<Map<String, Object>> compareRecordMap = this.getCompareRecordMap(noveltyCompareRecordQueryVOS, compareLiteratureVOS);
@@ -57,7 +58,7 @@ public class GetningdeTempalte implements GetTemplateMapsImp {
     }
 
     @Override
-    public Map<String, Object> getBaseMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs) {
+    public Map<String, Object> getBaseMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs,List<RetrieveRecordVO> retrieveRecordVOS,PersonnelVO personnelVO) {
         Map<String, Object> baseMap = new HashMap<>();
         if (queryNoveltyProjectVOs == null || queryNoveltyProjectVOs.size() == 0) {
             return baseMap;
@@ -82,9 +83,20 @@ public class GetningdeTempalte implements GetTemplateMapsImp {
         baseMap.put("ipr", queryNoveltyProjectVO.getIpr());
         if (queryNoveltyProjectVO.getHeadName() != null) {
             baseMap.put("searchName", queryNoveltyProjectVO.getHeadName());
-        } else if (queryNoveltyProjectVO.getCaseName() != null) {
+        } else if (queryNoveltyProjectVO.getCreateName() != null) {
             baseMap.put("searchName", queryNoveltyProjectVO.getCreateName());
         }
+        if (retrieveRecordVOS != null && retrieveRecordVOS.size() > 0) {
+            RetrieveRecordVO retrieveRecordVO = retrieveRecordVOS.get(retrieveRecordVOS.size() - 1);
+            Date date = retrieveRecordVO.getRetrieveTime();
+            if (date != null) {
+                String dateStr = DateUtils.formatDate(date, "yyyy-MM-dd");
+                baseMap.put("searchTime", dateStr);
+            }
+            if (queryNoveltyProjectVO.getSearchUnit() == null || queryNoveltyProjectVO.getSearchUnit().trim().equals("")) {
+                baseMap.put("searchUnit", personnelVO.getTenantName());
+            }
+        }
         return baseMap;
     }
 

src/main/java/cn/cslg/pas/factorys/noveltyTemplateFacotry/GetshidaixinganTempalte.java

@@ -1,5 +1,6 @@
 package cn.cslg.pas.factorys.noveltyTemplateFacotry;
 
+import cn.cslg.pas.common.model.cronModel.PersonnelVO;
 import cn.cslg.pas.common.model.cronModel.SystemFile;
 import cn.cslg.pas.common.utils.DateUtils;
 import cn.cslg.pas.common.utils.StringUtils;
@@ -27,9 +28,9 @@ public class GetshidaixinganTempalte implements GetTemplateMapsImp {
     @Autowired
     private EsPatentService esPatentService;
     @Override
-    public  Map<String,Object> getMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs,TechnicalCaseVO technicalCaseVO,List<CompareLiteratureVO> compareLiteratureVOS,List<NoveltyCompareRecordQueryVO> noveltyCompareRecordQueryVOS,List<RetrieveRecordVO> retrieveRecordVOS){
+    public  Map<String,Object> getMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs,TechnicalCaseVO technicalCaseVO,List<CompareLiteratureVO> compareLiteratureVOS,List<NoveltyCompareRecordQueryVO> noveltyCompareRecordQueryVOS,List<RetrieveRecordVO> retrieveRecordVOS, PersonnelVO personnelVO){
         Map<String,Object> map =new HashMap<>();
-        Map<String, Object> baseMap = this.getBaseMap(queryNoveltyProjectVOs);
+        Map<String, Object> baseMap = this.getBaseMap(queryNoveltyProjectVOs, retrieveRecordVOS,personnelVO);
         Map<String, Object> technicalCaseMap = this.getTechnicalCaseMap(technicalCaseVO);
         List<Map<String, Object>> compareLiteratureMap = this.getCompareLiteratureMap(compareLiteratureVOS);
         List<Map<String, Object>> compareRecordMap = this.getCompareRecordMap(noveltyCompareRecordQueryVOS, compareLiteratureVOS);
@@ -55,7 +56,7 @@ public class GetshidaixinganTempalte implements GetTemplateMapsImp {
     }
 
     @Override
-    public Map<String, Object> getBaseMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs) {
+    public Map<String, Object> getBaseMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs,List<RetrieveRecordVO> retrieveRecordVOS,PersonnelVO personnelVO) {
         Map<String, Object> baseMap = new HashMap<>();
         if (queryNoveltyProjectVOs == null || queryNoveltyProjectVOs.size() == 0) {
             return baseMap;

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

@@ -141,6 +141,7 @@ public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTa
 
         //如果专利挖掘项目DTO不为空，则需要先建立专利挖掘项目
         if (patentDigProjectDTO != null) {
+            patentDigProjectDTO.setId(null);
             Integer projectId = (Integer) patentDigProjectService.addMessage(patentDigProjectDTO);
             if (projectId != null) {
                 projectTaskDTO.setProjectId(projectId);
@@ -1484,7 +1485,7 @@ public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTa
         List<ProjectTask> projectTasks = new ArrayList<>();
         if (ifGetLast != null && ifGetLast) {
             queryWrapper.orderByDesc(ProjectTask::getCreateTime);
-            ProjectTask projectTask1 = this.getOne(queryWrapper,false);
+            ProjectTask projectTask1 = this.getOne(queryWrapper, false);
             if (projectTask1 != null) {
                 projectTasks.add(projectTask1);
             }

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

@@ -338,7 +338,7 @@ public class TaskHandleResultService extends ServiceImpl<TaskHandleResultMapper,
                     patentDigProjectFilesService.update(filesUpdateWrapper);
                 } else {
                     LambdaUpdateWrapper<ProjectTask> updateWrapper = new LambdaUpdateWrapper<>();
-                    updateWrapper.eq(ProjectTask::getId, Arrays.asList(taskId, projectTask.getAssoTaskId()));
+                    updateWrapper.in(ProjectTask::getId, Arrays.asList(taskId, projectTask.getAssoTaskId()));
                     updateWrapper.set(ProjectTask::getStatus, 3);
                     projectTaskService.update(updateWrapper);
                     LambdaUpdateWrapper<TaskHandleResult> resultWrapper = new LambdaUpdateWrapper<>();
@@ -347,7 +347,12 @@ public class TaskHandleResultService extends ServiceImpl<TaskHandleResultMapper,
                     this.update(resultWrapper);
                 }
             }
-
+            else {
+                LambdaUpdateWrapper<ProjectTask> updateWrapper = new LambdaUpdateWrapper<>();
+                updateWrapper.eq(ProjectTask::getId, taskId);
+                updateWrapper.set(ProjectTask::getStatus, 3);
+                projectTaskService.update(updateWrapper);
+            }
 
         }
 

src/main/java/cn/cslg/pas/service/novelty/NoveltyReportReferencesService.java

@@ -180,13 +180,14 @@ public class NoveltyReportReferencesService extends ServiceImpl<NoveltyReportRef
 
 
         List<QueryNoveltyProjectVO> queryNoveltyProjectVOs = this.getQueryNoveltyProjectVOs(projectId);
-//        String searchTime = noveltySearchRecordService.getLastRecordTime(projectId);
+        String searchTime = noveltySearchRecordService.getLastRecordTime(projectId);
 //        baseMap.put("searchTime", searchTime);
         TechnicalCaseVO technicalCaseVO = this.getTechnicalCaseVO(projectId);
         List<CompareLiteratureVO> compareLiteratureVOS = this.getCompareCompareLiteratureVO(projectId);
         List<NoveltyCompareRecordQueryVO> noveltyCompareRecordQueryVOS = this.getNoveltyCompareRecordQueryVOs(projectId);
         List<RetrieveRecordVO> retrieveRecordVOS = this.getRetrieveRecordVOs(projectId);
-        Map<String, Object> map = getTemplateMapsImp.getMap(queryNoveltyProjectVOs, technicalCaseVO, compareLiteratureVOS, noveltyCompareRecordQueryVOS, retrieveRecordVOS);
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        Map<String, Object> map = getTemplateMapsImp.getMap(queryNoveltyProjectVOs, technicalCaseVO, compareLiteratureVOS, noveltyCompareRecordQueryVOS, retrieveRecordVOS,personnelVO);
         String json = JsonUtils.objectToJson(map);
         noveltyReportReferenceDTO.setDataSource(json);
         id = this.addOrUpdate(noveltyReportReferenceDTO);

src/main/resources/application-dev.yml

@@ -65,7 +65,7 @@ PCSUrl: http://192.168.2.24:8871
 #OPSUrl: http://192.168.2.24:5001
 OPSUrl: http://139.224.24.90:5001
 PASUrl: http://localhost:8879
-FMSUrl: http://192.168.2.24:8803
+FMSUrl: http://127.0.0.1:8803
 WDUrl: http://1.116.113.26:81
 PythonUrl: http://192.168.2.24:8001
 FileSource: 1

src/main/resources/mapper/AssoHandleResultFileMapper.xml

@@ -5,7 +5,7 @@
         select count(*)  from
         asso_handle_result_file where
     task_handle_result_id in (select id from task_handle_result where task_id in (select id from
-          project_task where  project_id =#{projectId} and process_id =#{processId}
+          project_task where  project_id =#{projectId} and process_id =#{processId} and type!=5
 
         ))
     </select>