Merge branch 'master' of http://39.105.58.247:3100/hydw/hycw

ruoyi-admin/src/main/resources/ftl/生产周例会配电汇报内容.ftl

@@ -1767,6 +1767,7 @@
 							<w:t>三级风险作业内容：</w:t>
 						</w:r>
 					</w:p>
+					<#list threeLevelRiskJobs as threeLevelRiskJob>
 					<w:p w:rsidR="005C2DD3" w:rsidRDefault="008E7328">
 						<w:pPr>
 							<w:widowControl w:val="0" />
@@ -1787,7 +1788,7 @@
 								<w:sz w:val="32" />
 								<w:highlight w:val="yellow" />
 							</w:rPr>
-							<w:t>${threeLevelRiskJobs!}</w:t>
+							<w:t>${threeLevelRiskJob!}</w:t>
 						</w:r>
 						<w:r w:rsidR="000E7473">
 							<w:rPr>
@@ -1799,6 +1800,7 @@
 							<w:t></w:t>
 						</w:r>
 					</w:p>
+					</#list>
 					<w:p w:rsidR="005C2DD3" w:rsidRDefault="000E7473">
 						<w:pPr>
 							<w:pStyle w:val="a6" />

ruoyi-admin/src/main/resources/ftl/衡阳公司配电专业安全管控专班日报.ftl

@@ -305,7 +305,7 @@
                                 <w:highlight w:val="none"/>
                                 <w:lang w:val="en-US" w:eastAsia="zh-CN" w:bidi="ar"/>
                             </w:rPr>
-                            <w:t>${month}月${beginDay}-${endDay}日，配网专业被省公司查处违章${provinceInvestPunishRecNum}起，其中严重违章${provinceInvestSeriousRecNum}起；被市公司查处违章${cityInvestPunishRecNum}起，其中严重违章${cityInvestSeriousRecNum}起；县公司自查违章${countySelfInvestPunishRecNum}起，其中严重违章${countySelfInvestSeriousRecNum}起；保障体系自查问题${guaraSelfIssuesRecNum}个，其中市公司查处问题${guaraCityIssuesRecNum}处。详见表1。</w:t>
+                            <w:t>${month}月${beginDay}日-${endDay}日，配网专业被省公司查处违章${provinceInvestPunishRecNum}起，其中严重违章${provinceInvestSeriousRecNum}起；被市公司查处违章${cityInvestPunishRecNum}起，其中严重违章${cityInvestSeriousRecNum}起；县公司自查违章${countySelfInvestPunishRecNum}起，其中严重违章${countySelfInvestSeriousRecNum}起；保障体系自查问题${guaraSelfIssuesRecNum}个，其中市公司查处问题${guaraCityIssuesRecNum}处。详见表1。</w:t>
                         </w:r>
                     </w:p>
                     <w:p w14:paraId="5DD52850">
@@ -1681,7 +1681,7 @@
                                 <w:highlight w:val="none"/>
                                 <w:lang w:val="en-US" w:eastAsia="zh-CN" w:bidi="ar"/>
                             </w:rPr>
-                            <w:t>${month}月${beginDay}日-${endDay}日，配网专业周计划共计发布作业信息${jobRecNum}条，其中已执行${exceRecNum}条，取消${cancelRecNum}条，计划执行率${implementationRate}。临时计划${tmpPlanRecNum}条，取消${cancelTmpPlanRecNum}条，临时计划率${tmpPlanRate}。详见表2。</w:t>
+                            <w:t>${month}月${beginDay}日-${endDay}日，配网专业周计划共计发布作业信息${jobRecNum}条，其中已执行${exceRecNum}条，取消${cancelRecNum}条，计划执行率${implementationRate}。临时计划${tmpPlanRecNum}条，取消${cancelTmpPlanRecNum}条，临时计划率${tmpPlanRate!}。详见表2。</w:t>
                         </w:r>
                     </w:p>
                     <w:p w14:paraId="6E4FA31B">
@@ -6983,6 +6983,7 @@
                             <w:t>${tomorrow}，全市${cityThreeRiskPlanNum}项三级作业风险计划。</w:t>
                         </w:r>
                     </w:p>
+                    <#list cityThreeRiskPlanList as cityThreeRiskPlan>
                     <w:p w14:paraId="2AA8613C">
                         <w:pPr>
                             <w:spacing w:line="560" w:lineRule="exact"/>
@@ -7015,9 +7016,10 @@
                                 <w:szCs w:val="32"/>
                                 <w:lang w:bidi="ar"/>
                             </w:rPr>
-                            <w:t>${cityThreeRiskPlan}</w:t>
+                                <w:t>${cityThreeRiskPlan}</w:t>
                         </w:r>
                     </w:p>
+                    </#list>
                     <w:p w14:paraId="427F966E">
                         <w:pPr>
                             <w:keepNext w:val="0"/>

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

@@ -3,16 +3,11 @@ package com.ruoyi.powerdistribution.controller;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.uuid.UUID;
-import com.ruoyi.powerdistribution.domain.PdmReportAppointmentDay;
+import com.ruoyi.powerdistribution.domain.*;
-import com.ruoyi.powerdistribution.domain.PdmReportIllegalDay;
+import com.ruoyi.powerdistribution.domain.dto.PdmWorkPlanDTO;
-import com.ruoyi.powerdistribution.domain.PdmReportPlanDay;
-import com.ruoyi.powerdistribution.domain.PdmReportPlanNextDay;
 import com.ruoyi.powerdistribution.domain.vo.SupRiskTeam;
 import com.ruoyi.powerdistribution.domain.vo.TaskRiskPlan;
-import com.ruoyi.powerdistribution.service.IPdmReportAppointmentDayService;
+import com.ruoyi.powerdistribution.service.*;
-import com.ruoyi.powerdistribution.service.IPdmReportIllegalDayService;
-import com.ruoyi.powerdistribution.service.IPdmReportPlanDayService;
-import com.ruoyi.powerdistribution.service.IPdmReportPlanNextDayService;
 import com.ruoyi.powerdistribution.util.GenerateWordUtil;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,7 +42,8 @@ public class DailyReportController extends BaseController {
     private IPdmReportAppointmentDayService pdmReportAppointmentDayService;
     @Autowired
     private IPdmReportPlanNextDayService pdmReportPlanNextDayService;
-
+    @Autowired
+    private IPdmWorkPlanService pdmWorkPlanService;
 
     @PostMapping("/export")
     @ApiOperation(value = "日报导出")
@@ -56,84 +52,154 @@ public class DailyReportController extends BaseController {
         pdmReportIllegalDay.setStartDate(beingDate);
         pdmReportIllegalDay.setEndDate(endDate);
         Map<String,Object> dataMap = new HashMap();
-        dataMap.put("rptDate", DateUtils.dateTimeNow("yyyy年MM月dd日"));//日报生成日期
+
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
         Date cvrtFirstDate = sdf.parse(beingDate);
         Date cvrtEndDate = sdf.parse(endDate);
         //日期公共使用
+        dataMap.put("rptDate", DateUtils.parseDateToStr("yyyy年MM月dd日",cvrtEndDate));//日报生成日期
         dataMap.put("month",new SimpleDateFormat("MM").format(cvrtFirstDate));//月
         dataMap.put("beginDay",new SimpleDateFormat("dd").format(cvrtFirstDate));//开始日
         dataMap.put("endDay",new SimpleDateFormat("dd").format(cvrtEndDate));//结束日
         //1.违章查处情况
-        dataMap.put("provinceInvestPunishRecNum",0);//被省公司查处违章
+        long provinceInvestPunishRecNum=0;
-        dataMap.put("provinceInvestSeriousRecNum",0);//严重违章
+        long provinceInvestSeriousRecNum=0;
-        dataMap.put("cityInvestPunishRecNum",0);//被市公司查处违章
+        long cityInvestPunishRecNum=0;
-        dataMap.put("cityInvestSeriousRecNum",0);//严重违章
+        long cityInvestSeriousRecNum=0;
-        dataMap.put("countySelfInvestPunishRecNum",0);//县区公司自查处违章
+        long countySelfInvestPunishRecNum=0;
-        dataMap.put("countySelfInvestSeriousRecNum",0);//严重违章
+        long countySelfInvestSeriousRecNum=0;
-        dataMap.put("guaraSelfIssuesRecNum",0);//保障体系自查问题
+        long guaraSelfIssuesRecNum=0;
-        dataMap.put("guaraCityIssuesRecNum",0);//其中市公司查处问题
         List<PdmReportIllegalDay> illegalList = pdmReportIllegalDayService.selectPdmReportIllegalDayList(pdmReportIllegalDay); File descFile=null;
+        if(illegalList!=null && illegalList.size()>1){
+            pdmReportIllegalDay=illegalList.get(illegalList.size()-1);
+            provinceInvestPunishRecNum=pdmReportIllegalDay.getProvinceNum1()+pdmReportIllegalDay.getProvinceNum2();
+            provinceInvestSeriousRecNum=pdmReportIllegalDay.getProvinceNum1();
+            cityInvestPunishRecNum=pdmReportIllegalDay.getCityNum1()+pdmReportIllegalDay.getCityNum2();
+            cityInvestSeriousRecNum=pdmReportIllegalDay.getCityNum1();
+            countySelfInvestPunishRecNum=pdmReportIllegalDay.getCountyNum1()+pdmReportIllegalDay.getCountyNum2();
+            countySelfInvestSeriousRecNum=pdmReportIllegalDay.getCountyNum1();
+            guaraSelfIssuesRecNum=pdmReportIllegalDay.getCheckNum();
+        }
 
         dataMap.put("illegalList",illegalList);//列表明细
+        dataMap.put("provinceInvestPunishRecNum",provinceInvestPunishRecNum);//被省公司查处违章
+        dataMap.put("provinceInvestSeriousRecNum",provinceInvestSeriousRecNum);//严重违章
+        dataMap.put("cityInvestPunishRecNum",cityInvestPunishRecNum);//被市公司查处违章
+        dataMap.put("cityInvestSeriousRecNum",cityInvestSeriousRecNum);//严重违章
+        dataMap.put("countySelfInvestPunishRecNum",countySelfInvestPunishRecNum);//县区公司自查处违章
+        dataMap.put("countySelfInvestSeriousRecNum",countySelfInvestSeriousRecNum);//严重违章
+        dataMap.put("guaraSelfIssuesRecNum",guaraSelfIssuesRecNum);//保障体系自查问题
+        dataMap.put("guaraCityIssuesRecNum",0);//其中市公司查处问题
+
         //(二）作业计划执行情况
-        dataMap.put("jobRecNum",0);//发布作业信息条数
+        long jobRecNum=0;
-        dataMap.put("exceRecNum",0);//已执行
+        long exceRecNum=0;
-        dataMap.put("cancelRecNum",0);//已取消
+        long cancelRecNum=0;
-        dataMap.put("implementationRate",0);//执行率
+        String implementationRate="0%";
-        dataMap.put("tmpPlanRecNum",0);//临时计划
+        long tmpPlanRecNum=0;
-        dataMap.put("cancelTmpPlanRecNum",0);//取消计划数
+        String tmpPlanRate="0%";
-        dataMap.put("tmpPlanRate",0);//临时计划率
+        long temporaryCancelSum=0;
-        dataMap.put("repairRecNum",0);//已执行临时计划包含抢修
-        dataMap.put("operateRecNum",0);//操作条数
         PdmReportPlanDay pdmReportPlanDay = new PdmReportPlanDay();
         pdmReportPlanDay.setReportDate(beingDate);
         List<PdmReportPlanDay> planlist = pdmReportPlanDayService.selectPdmReportPlanDayList(pdmReportPlanDay);
-
+        if(planlist!=null && planlist.size()>1){
+            pdmReportPlanDay=planlist.get(planlist.size()-1);
+            jobRecNum=pdmReportPlanDay.getWeekSum();
+            exceRecNum=pdmReportPlanDay.getWeekSum()-pdmReportPlanDay.getWeekCancelSum();
+            cancelRecNum=pdmReportPlanDay.getWeekCancelSum();
+            implementationRate=pdmReportPlanDay.getWeekRatio();
+            tmpPlanRecNum=pdmReportPlanDay.getTemporarySum();
+            temporaryCancelSum=pdmReportPlanDay.getTemporaryCancelSum();
+            tmpPlanRate=pdmReportPlanDay.getTemporaryPlanRatio();
+        }
+        dataMap.put("jobRecNum",jobRecNum);//周计划发布作业信息条数
+        dataMap.put("exceRecNum",exceRecNum);//已执行
+        dataMap.put("cancelRecNum",cancelRecNum);//已取消
+        dataMap.put("implementationRate",implementationRate);//执行率
+        dataMap.put("tmpPlanRecNum",tmpPlanRecNum);//临时计划
+        dataMap.put("cancelTmpPlanRecNum",temporaryCancelSum);//取消计划数
+        dataMap.put("tmpPlanRate",tmpPlanRate);//临时计划率
+        dataMap.put("repairRecNum",0);//已执行临时计划包含抢修
+        dataMap.put("operateRecNum",0);//操作条数
         dataMap.put("planlist",planlist);//操作条数
+
         //（三）人员到岗到位履职情况
-        dataMap.put("supervTimes",0);//督察共计次数
+        long supervTimes=0;
-        dataMap.put("leaderSupervTimes",0);//领导督察共计次数
+        long leaderSupervTimes=0;
-        dataMap.put("manageSupervTimes",0);//管理人员督察次数
+        long manageSupervTimes=0;
-        dataMap.put("nonfulfilmentNum",0);//未履职（应查未查）现场
+        long nonfulfilmentNum=0;
-        dataMap.put("derelictionDutyNum",0);//履职不到位
+        long derelictionDutyNum=0;
         PdmReportAppointmentDay pdmReportAppointmentDay = new PdmReportAppointmentDay();
         pdmReportAppointmentDay.setReportDate(beingDate);
         List<PdmReportAppointmentDay> appointmentlist = pdmReportAppointmentDayService.selectPdmReportAppointmentDayList(pdmReportAppointmentDay);
-
+        if(appointmentlist!=null && appointmentlist.size()>1){
+            pdmReportAppointmentDay=appointmentlist.get(appointmentlist.size()-1);
+            supervTimes=pdmReportAppointmentDay.getBossSum()+pdmReportAppointmentDay.getManageSum();
+            leaderSupervTimes=pdmReportAppointmentDay.getBossSum();
+            manageSupervTimes=pdmReportAppointmentDay.getManageSum();
+            nonfulfilmentNum=pdmReportAppointmentDay.getAbsentSum();
+            derelictionDutyNum= pdmReportAppointmentDay.getAbsentBadSum();
+        }
+        dataMap.put("supervTimes",supervTimes);//督察共计次数
+        dataMap.put("leaderSupervTimes",leaderSupervTimes);//领导督察共计次数
+        dataMap.put("manageSupervTimes",manageSupervTimes);//管理人员督察次数
+        dataMap.put("nonfulfilmentNum",nonfulfilmentNum);//未履职（应查未查）现场
+        dataMap.put("derelictionDutyNum",derelictionDutyNum);//履职不到位
         dataMap.put("appointmentlist",appointmentlist);//操作条数
 
         //二、明日配网安全工作安排
-        dataMap.put("distNetworkProfesRecNum",0);//作业信息总共条数
+        long distNetworkProfesRecNum=0;
-        dataMap.put("switchOperatNum",0);//倒闸操作操作项
+        long switchOperatNum=0;
-        dataMap.put("distNetworkProjectNum",0);//配网工程项
+        long distNetworkProjectNum=0;
-        dataMap.put("expanRelocationNum",0);//业扩杆迁
+        long expanRelocationNum=0;
-        dataMap.put("maintenanceNum",0);//运维检修
+        long maintenanceNum=0;
-        dataMap.put("other",0);//其他
+        long other=0;
-        dataMap.put("tempPlanNum",0);//临时计划共计
+        long tempPlanNum=0;
+        long liveWorkingNum=0;
+        String threeRiskNum="0";
+        String fourRiskNum="0";
+        String fiveRiskNum="0";
+        PdmReportPlanNextDay nextDay = new PdmReportPlanNextDay();
+        nextDay.setReportDate(DateUtils.getNextDateStr(beingDate,DateUtils.YYYYMMDD,1));
+        List<PdmReportPlanNextDay> nextDayList = pdmReportPlanNextDayService.selectPdmReportPlanNextDayList(nextDay);
+        if(nextDayList!=null&& nextDayList.size()>1){
+            nextDay=nextDayList.get(nextDayList.size()-1);
+            distNetworkProfesRecNum=nextDay.getWorkTotal();
+            switchOperatNum=nextDay.getWorkType1Sum();
+            distNetworkProjectNum=nextDay.getWorkType2Sum();
+            expanRelocationNum=nextDay.getWorkType3Sum();
+            maintenanceNum=nextDay.getWorkType4Sum();
+            other=nextDay.getWorkType5Sum();
+            tempPlanNum=nextDay.getTemporaryPlanSum();
+            liveWorkingNum=nextDay.getElePlanSum();
+            threeRiskNum=nextDay.getPlanLeve3();
+            fourRiskNum=nextDay.getPlanLeve4();
+            fiveRiskNum=nextDay.getPlanLeve5();
+        }
+        dataMap.put("distNetworkProfesRecNum",distNetworkProfesRecNum);//作业信息总共条数
+        dataMap.put("switchOperatNum",switchOperatNum);//倒闸操作操作项
+        dataMap.put("distNetworkProjectNum",distNetworkProjectNum);//配网工程项
+        dataMap.put("expanRelocationNum",expanRelocationNum);//业扩杆迁
+        dataMap.put("maintenanceNum",maintenanceNum);//运维检修
+        dataMap.put("other",other);//其他
+        dataMap.put("tempPlanNum",tempPlanNum);//临时计划共计
         dataMap.put("operateNum",0);//操作项
         dataMap.put("kv10Num",0);//10千伏作业
         dataMap.put("zeroPointFourKvNum",0);//0.4千伏作业
-        dataMap.put("liveWorkingNum",0);//带电作业
+        dataMap.put("liveWorkingNum",liveWorkingNum);//带电作业
         dataMap.put("liveDisconnectLeadNum",0);//带电断接引
         dataMap.put("assemDeviceNum",0);//带电消缺、装拆设备
-        dataMap.put("threeRiskNum",0);//三级风险作业
+        dataMap.put("threeRiskNum",threeRiskNum);//三级风险作业
-        dataMap.put("fourRiskNum",0);//四级风险作业
+        dataMap.put("fourRiskNum",fourRiskNum);//四级风险作业
-        dataMap.put("fiveRiskNum",0);//五级风险作业
+        dataMap.put("fiveRiskNum",fiveRiskNum);//五级风险作业
         dataMap.put("liftingOperationNum",0);//起重作业
         dataMap.put("verticalPoleNum",0);//立杆
         dataMap.put("chgeDeviceNum",0);//更换配变、综配箱等设备
         dataMap.put("keyAssignments",0);//重点作业面
-
-        PdmReportPlanNextDay nextDay = new PdmReportPlanNextDay();
-        nextDay.setReportDate(DateUtils.getNextDateStr(beingDate,DateUtils.YYYYMMDD,1));
-        List<PdmReportPlanNextDay> nextDayList = pdmReportPlanNextDayService.selectPdmReportPlanNextDayList(nextDay);
-
         dataMap.put("nextDayList",nextDayList);//
         //（二）“七分准备”及承载力审查情况
         List<String> morrowExistSupRiskCompList=new ArrayList<>(); //存放次日存在超管理承载力风险的单位数据
         dataMap.put("morrowExistSupRiskComp",morrowExistSupRiskCompList==null||morrowExistSupRiskCompList.size()==0?"无":String.join(",",morrowExistSupRiskCompList));//次日存在超管理承载力风险的单位
-
         List<SupRiskTeam> supRiskTeamList=new ArrayList<>(); //存放次日存在超作业承载力风险的班组
         StringBuilder builder=new StringBuilder();
         for(int i=0;i<supRiskTeamList.size();i++){
@@ -145,17 +211,22 @@ public class DailyReportController extends BaseController {
         SimpleDateFormat formatter = new SimpleDateFormat("MM月dd日");
         SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
         dataMap.put("tomorrow",formatter.format(format.parse(DateUtils.getNextDateStr(endDate,"yyyyMMdd",1))));//获取明天的日期
-        List<TaskRiskPlan> taskRiskPlanList=new ArrayList<>(); //获取风险作业计划数据
+        dataMap.put("cityThreeRiskPlanNum",threeRiskNum);//全市三级作业风险计划
-        dataMap.put("cityThreeRiskPlanNum",taskRiskPlanList==null?0:taskRiskPlanList.size());//全市三级作业风险计划
-        StringBuilder riskPlanBuilder=new StringBuilder();
-        for(int i=0;i<taskRiskPlanList.size();i++){
-            TaskRiskPlan taskRiskPlan=taskRiskPlanList.get(i);
-            riskPlanBuilder.append((i+1)).append(".").append(taskRiskPlan.getCompName()).append(":").append(String.join(",",taskRiskPlan.getHandlingMatters())).append(taskRiskPlan.getLeader()).append(".")
-                    .append("把关领导:").append("\r\n")
-            ;
-        }
-        dataMap.put("cityThreeRiskPlan",taskRiskPlanList==null||taskRiskPlanList.size()==0?"":riskPlanBuilder.toString());//全市三级作业风险计划
 
+        PdmWorkPlanDTO workPlan = new PdmWorkPlanDTO();
+        workPlan.setStartDate(beingDate);
+        workPlan.setEndDate(endDate);
+        workPlan.setLevel3Flag("1");//三级及以上作业
+        List<PdmWorkPlan> workList = pdmWorkPlanService.selectPdmWorkPlanList(workPlan);
+        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());
+            cityThreeRiskPlanList.add(riskPlanBuilder.toString());
+        }
+        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

@@ -182,14 +182,6 @@ public class WeeklyReportController extends BaseController {
         dataMap.put("liveWorkingNum",liveWorkingNum);//带电作业
         dataMap.put("liveDisconnectLeadNum",0);//带电断接引
         dataMap.put("assemDeviceNum",0);//带电消缺、装拆设备
-        //三级风险作业内容：
-        List<ThreeLevelRiskJob> threeLevelRiskJobs=new ArrayList<ThreeLevelRiskJob>() ;
-        StringBuilder builder=new StringBuilder();
-        for(int i=0;i<threeLevelRiskJobs.size();i++){
-            ThreeLevelRiskJob threeLevelRiskJob=threeLevelRiskJobs.get(i);
-            builder.append(threeLevelRiskJob.getCompName()).append(": ").append(threeLevelRiskJob.getJobDate()).append(",").append(threeLevelRiskJob.getJobContent()).append("。").append("\r\n");
-        }
-        dataMap.put("threeLevelRiskJobs",StringUtils.isEmpty(builder.toString())?"无":builder.toString());//三级风险作业内容：
         //三级及以上作业风险计划
         PdmWorkPlanDTO workPlan = new PdmWorkPlanDTO();
         workPlan.setStartDate(nextMonday);
@@ -197,6 +189,18 @@ public class WeeklyReportController extends BaseController {
         workPlan.setLevel3Flag("1");//三级及以上作业
         List<PdmWorkPlan> workList = pdmWorkPlanService.selectPdmWorkPlanList(workPlan);
         dataMap.put("threeLevelRiskWorkList",workList);//三级及以上作业列表明细
+
+        //三级风险作业内容：
+       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("。");
+            threeLevelRiskJobs.add(builder.toString());
+        }
+        dataMap.put("threeLevelRiskJobs",threeLevelRiskJobs);//三级风险作业内容：
         dataMap.put("fousMaintenanceNum",0);//重点关注检修面个数
         String fousMaintenanceInfo="";//重点关注检修面内容
         dataMap.put("fousMaintenanceInfo", StringUtils.isEmpty(fousMaintenanceInfo)?"无":fousMaintenanceInfo);//重点关注检修面内容

ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmReportPlanDayMapper.xml

@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sum(ifnull(temporary_sum,0)) temporary_sum,
         sum(ifnull(temporary_cancel_sum,0)) temporary_cancel_sum,
         CONCAT(round((sum(ifnull(temporary_sum,0))-sum(ifnull(temporary_cancel_sum,0)))/sum(ifnull(temporary_sum,0))*100,2),'%')  temporary_ratio,
-        null temporary_plan_ratio,
+        CONCAT(round(sum(ifnull(temporary_sum,0))/(sum(ifnull(week_sum,0))+sum(ifnull(temporary_sum,0)))*100,2),'%') temporary_plan_ratio,
         null create_by ,
         null create_time,
         null update_by,

ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmReportPlanWeekMapper.xml

@@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sum(ifnull(temporary_sum,0)) temporary_sum,
         sum(ifnull(temporary_cancel_sum,0)) temporary_cancel_sum,
         CONCAT(round((sum(ifnull(temporary_sum,0))-sum(ifnull(temporary_cancel_sum,0)))/sum(ifnull(temporary_sum,0))*100,2),'%')  temporary_ratio,
-        null temporary_plan_ratio,
+        CONCAT(round(sum(ifnull(temporary_sum,0))/(sum(ifnull(week_sum,0))+sum(ifnull(temporary_sum,0)))*100,2),'%') temporary_plan_ratio,
         null create_by ,
         null create_time,
         null update_by,

ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmWorkPlanMapper.xml

@@ -234,6 +234,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and risk_type not in ('0','1')
             </if>
         </where>
+        order by  plan_start_wk_tm
     </select>
 
     <select id="selectPdmWorkPlanById" parameterType="Long" resultMap="PdmWorkPlanResult">