1

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/controller/DailyReportController.java

@@ -218,13 +218,15 @@ public class DailyReportController extends BaseController {
         workPlan.setEndDate(endDate);
         workPlan.setLevel3Flag("1");//三级及以上作业
         List<PdmWorkPlan> workList = pdmWorkPlanService.selectPdmWorkPlanList(workPlan);
-        StringBuilder riskPlanBuilder=new StringBuilder();
+        List<String > cityThreeRiskPlanList=new ArrayList<>();
         for(int i=0;i<workList.size();i++){
+            StringBuilder riskPlanBuilder=new StringBuilder();
             PdmWorkPlan taskRiskPlan=workList.get(i);
             riskPlanBuilder.append((i+1)).append(".").append(taskRiskPlan.getSubmitOrgNm()).append("：").append(taskRiskPlan.getOpContent()).append("。")
-                    .append("把关领导：").append(taskRiskPlan.getWorkPrincipNm()).append("/").append(taskRiskPlan.getWorkPrincipContactMode()).append("\r\n").append("&nbsp;&nbsp;&nbsp;");
+                    .append("把关领导：").append(taskRiskPlan.getWorkPrincipNm()).append("/").append(taskRiskPlan.getWorkPrincipContactMode());
+            cityThreeRiskPlanList.add(riskPlanBuilder.toString());
         }
-        dataMap.put("cityThreeRiskPlan",workList==null||workList.size()==0?"":riskPlanBuilder.toString().replaceAll("\r\n", "<w:br/>").replaceAll("&nbsp;","<w:tab/>"));//全市三级作业风险计划
+        dataMap.put("cityThreeRiskPlanList",cityThreeRiskPlanList);//全市三级作业风险计划
         try {
             String fileN = UUID.randomUUID().toString();
             File fileFold = new File(printReplenishmentPath+"/temp_print/");

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/controller/WeeklyReportController.java

@@ -191,15 +191,16 @@ public class WeeklyReportController extends BaseController {
         dataMap.put("threeLevelRiskWorkList",workList);//三级及以上作业列表明细
 
         //三级风险作业内容：
-       // List<ThreeLevelRiskJob> threeLevelRiskJobs=new ArrayList<ThreeLevelRiskJob>() ;
-        StringBuilder builder=new StringBuilder();
+       List<String> threeLevelRiskJobs=new ArrayList<String>() ;
         for(int i=0;i<workList.size();i++){
+            StringBuilder builder=new StringBuilder();
             PdmWorkPlan  threeLevelRiskJob=workList.get(i);
             month=new SimpleDateFormat("MM").format(threeLevelRiskJob.getPlanStartWkTm());
             String day=new SimpleDateFormat("dd").format(threeLevelRiskJob.getPlanStartWkTm());
-            builder.append(threeLevelRiskJob.getSubmitOrgNm()).append(": ").append(month+"月"+day+"日").append(",").append(threeLevelRiskJob.getOpContent()).append("。").append("\r\n").append("&nbsp;&nbsp;&nbsp;");
+            builder.append(threeLevelRiskJob.getSubmitOrgNm()).append(": ").append(month+"月"+day+"日").append(",").append(threeLevelRiskJob.getOpContent()).append("。");
+            threeLevelRiskJobs.add(builder.toString());
         }
-        dataMap.put("threeLevelRiskJobs",StringUtils.isEmpty(builder.toString())?"无":builder.toString().replaceAll("\r\n", "<w:br/>").replaceAll("&nbsp;","<w:tab/>"));//三级风险作业内容：
+        dataMap.put("threeLevelRiskJobs",threeLevelRiskJobs);//三级风险作业内容：
         dataMap.put("fousMaintenanceNum",0);//重点关注检修面个数
         String fousMaintenanceInfo="";//重点关注检修面内容
         dataMap.put("fousMaintenanceInfo", StringUtils.isEmpty(fousMaintenanceInfo)?"无":fousMaintenanceInfo);//重点关注检修面内容