12chenyi

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

@@ -536,7 +536,7 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
                 Map<String, Object> temMap = compareMessageService.queryforTemplate(patent.get("patentNo").toString(), reportId);
                 List<CompareMessageVO> compareMessageVOS = (List<CompareMessageVO>) temMap.get("compareMessageVOs");
                 //装载对比记录的信息
-                patentMap.put("compareMessage", compareMessageVOS);
+                patentMap.put("cM", compareMessageVOS);
                 patentMap.put("rightNum", temMap.get("right"));
                 patentMap.put("mainRightNum", temMap.get("mainRight"));
                 Integer status = Integer.parseInt(patent.get("simpleStatusInt").toString());
@@ -562,7 +562,7 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
         LoopRowTableRenderPolicy policy = new LoopRowTableRenderPolicy();
         HtmlRenderPolicy htmlRenderPolicy = new HtmlRenderPolicy();
         // 将bz设置为行循环绑定的数据源的key,即key是bz的value会在模板中的{{bz}}处进行解析
-        Configure configure = Configure.builder().bind("compareMessage", policy).bind("targetDescription", htmlRenderPolicy).build();
+        Configure configure = Configure.builder().bind("cM", policy).bind("targetDescription", htmlRenderPolicy).build();
         XWPFTemplate template = XWPFTemplate.compile(filePath, configure).render(map);
         return template;
     }

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

@@ -193,9 +193,8 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
                 List<Personnel> mapDuty = personnels.stream().filter(tem -> tem.getId().equals(item.getHandlePersonId())).collect(Collectors.toList());
                 if(mapCre.size()!=0)
                     item.setCreateName(mapCre.get(0).getPersonnelName());
-                if(mapDuty.size()!=0&&item.getHandlePersonName() ==null){
+                if(mapDuty.size()!=0&&item.getHandlePersonName() !=null){
                     item.setHandlePersonName(mapDuty.get(0).getPersonnelName());}
-                //装载部门名
 
             }
         }
@@ -305,6 +304,9 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         if (assignTaskVO.getPatentVO() != null) {
             patentVO = assignTaskVO.getPatentVO();
         }
+        if(1!=1){
+            return Response.error();
+        }
         LambdaQueryWrapper<Report> wrapper1 = new LambdaQueryWrapper<>();
         wrapper1.eq(Report::getId, assignTaskVO.getReportId());
         Report report = reportService.list(wrapper1).get(0);