Ver código fonte

422 保存无效证据

lwhhszx 1 ano atrás
pai
commit
d3a4885c66

+ 8 - 0
src/main/java/cn/cslg/pas/service/ReportExportService.java

@@ -385,6 +385,8 @@ public class ReportExportService {
                     if (patent.getRightHolder() != null && patent.getRightHolder().size() != 0) {
                         rightPerson = StringUtils.join(patent.getRightHolder(), "\n");
                     }
+                    else {
+                    }
                     List<String> affairs = esLegalEventService.getStrLegalEvent(patent.getAppNo());
                     String affairStrs = "";
                     if (affairs != null && affairs.size() != 0) {
@@ -398,6 +400,9 @@ public class ReportExportService {
                     try {
                         //装载同族信息
                         List<Map<String, Object>> familyMaps = esFamilyService.getPatentFamilyByNos(Arrays.asList(patent.getPatentNo()), "inpadoc");
+                        if (familyMaps.size() <= 0) {
+                            familyMaps = esFamilyService.getPatentFamilyByNos(Arrays.asList(patent.getPatentNo()), "simple");
+                        }
                         if (familyMaps != null && familyMaps.size() > 0) {
                             Map<String, Object> familyMap = familyMaps.get(0);
                             if (familyMap.get("nos") != null) {
@@ -466,6 +471,9 @@ public class ReportExportService {
                     patentMap.put("rightNum", temMap.get("rightNum"));
 
                     patentMap.put("mainNum", temMap.get("mainRightNum"));
+                    if (patent.getSimpleStatus() == null) {
+                        patent.setSimpleStatus("1");
+                    }
                     Integer status = Integer.parseInt(patent.getSimpleStatus());
                     if (status == 1 || status == 5 || status == 6) {
                         announcePatents.add(patentMap);

+ 0 - 1
src/main/resources/application-prodNetOut.yml

@@ -1,5 +1,4 @@
 spring:
- data:
   data:
     redis:
       host: 47.101.137.223