8/27 定时更新修改

src/main/java/cn/cslg/pas/service/ReportExportService.java

@@ -1228,8 +1228,19 @@ public class ReportExportService {
 
             patentListMap.put("name", item.getTitle());
             patentListMap.put("fileName", "D" + order);
-            patentListMap.put("publicDate", item.getPublicDate());
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            if (item.getGrantDate() != null) {
+                patentListMap.put("publicDate",dateFormat.format(item.getGrantDate()));
+            }
+            else {
+                patentListMap.put("publicDate",dateFormat.format(item.getPublicDate()));
+            }
+
+        if (item.getGrantNo() != null) {
+            patentListMap.put("publicNo", item.getGrantNo());
+        } else {
             patentListMap.put("publicNo", item.getPublicNo());
+        }
             patentListMap.put("SSIM", "");
             patentListMap.put("applicant", applicants);
             patentListMap.put("patentNo", item.getPatentNo());