8/27 定时更新修改

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

@@ -237,7 +237,6 @@ public class ReportExportService {
             patentMap.put("publicNo", patent.getGrantNo());
         } else {
             patentMap.put("publicNo", patent.getPublicNo());
-
         }
 
         patentMap.put("applicant", applicants);
@@ -260,7 +259,7 @@ public class ReportExportService {
         }
 
         //获得专利对比记录的信息
-        TortCompareRecordVO tortCompareRecordVO = tortCompareRecordService.getAllTortTaskResult(reportId, null, 1);
+        TortCompareRecordVO tortCompareRecordVO = tortCompareRecordService.getAllTortTaskResult(reportId, null, 2);
         List<TortRightVO> tortRightVOS = tortCompareRecordVO.getTortRightVOS();
 
         List<Map<String, Object>> tortMaps = new ArrayList<>();
@@ -282,6 +281,7 @@ public class ReportExportService {
                 if (ftoCompareRecordVO != null) {
                     tortMap.put("targetDescription", ftoCompareRecordVO.getTargetDescription());
                     Integer result = ftoCompareRecordVO.getCompareResult();
+                    System.out.println(result);
                     switch (result) {
                         case 0:
                             tortMap.put("resultStr", "字面相同");
@@ -303,14 +303,13 @@ public class ReportExportService {
         }
         //装载对比记录的信息
         patentMap.put("cM", tortMaps);
-//        patentMap.put("rightNum", temMap.get("right"));
-//        patentMap.put("mainRightNum", temMap.get("mainRight"));
+        System.out.println(tortMaps);
         Map<String, Object> map1 = new HashMap<>();
         String date = DateUtils.formatDate(new Date(), DateUtils.YYYY_MM_DD);
         String[] ds = date.split("-");
         map1.put("sys", new SystemMO(ds[0], ds[1], ds[2], "", "reportName"));
         map1.put("patentMap", patentMap);
-        map1.put("name",patentMap.get("name"));
+        System.out.println(patentMap);
         // 为表格的显示绑定行循环
         LoopRowTableRenderPolicy policy = new LoopRowTableRenderPolicy();
         HtmlRenderPolicy htmlRenderPolicy = new HtmlRenderPolicy();