1.模板字段*添加红色标识

2.预警单,反馈单导出接口增加
3.修改技术监督月报统计逻辑

pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvAlarmBackController.java

@@ -68,6 +68,12 @@ public class SupvAlarmBackController extends BaseController {
         Boolean b = supvAlarmBackService.delAlarmBack(planIds);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
     }
+    @PostMapping("/downAlarmBack")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
+    @ApiOperation("导出预告警单反馈数据信息")
+    public void downAlarm(){
+        supvAlarmBackService.downAlarmBack();
+    }
 
     @PostMapping("pageAlarmBack")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)

pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvAlarmController.java

@@ -69,6 +69,13 @@ public class SupvAlarmController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
     }
 
+    @PostMapping("/downAlarm")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
+    @ApiOperation("导出预告警单信息")
+    public void downAlarm(){
+        supvAlarmService.downAlarm();
+    }
+
     @PostMapping("pageAlarm")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @ApiOperation("分页查询预告警单")

pqs-process/process-boot/src/main/java/com/njcn/process/mapper/SupvAlarmBackMapper.java

@@ -21,4 +21,5 @@ public interface SupvAlarmBackMapper extends BaseMapper<SupvAlarmBack> {
 
 
     Page<SupvAlarmBack> pageAlarmBack(Page objectPage,@Param("ids") List<String> ids,@Param("param") SupvAlarmBackParam param);
+    List<SupvAlarmBack> selectAlarmBack();
 }

pqs-process/process-boot/src/main/java/com/njcn/process/mapper/SupvReportMMapper.java

@@ -21,12 +21,15 @@ import java.util.List;
  */
 public interface SupvReportMMapper extends MppBaseMapper<SupvReportM> {
 
+    //月报计划统计(按照实施结束时间统计)
     List<ProcessPublicDTO> statisticPlanReport(@Param("startTime")LocalDateTime startTime, @Param("endTime")LocalDateTime endTime, @Param("statisticType")String statisticType,@Param("objType")String objType,@Param("effectStatus")List<String> effectStatus);
+    //本年计划统计(按照计划时间统计)
+    List<ProcessPublicDTO> statisticPlanReportYear(@Param("startTime")LocalDateTime startTime, @Param("endTime")LocalDateTime endTime, @Param("statisticType")String statisticType,@Param("objType")String objType,@Param("effectStatus")List<String> effectStatus);
 
-    //问题数据
+    //问题数据(问题发现时间统计)
     List<ProcessPublicDTO> statisticQueReport(@Param("startTime")LocalDateTime startTime, @Param("endTime")LocalDateTime endTime, @Param("statisticType")String statisticType,@Param("rectificationStatus")String rectificationStatus,@Param("objType")String objType);
 
-    //问题整改数量
+    //问题整改数量(问题整改时间统计)
     List<ProcessPublicDTO> statisticQueReportRectify(@Param("startTime")LocalDateTime startTime, @Param("endTime")LocalDateTime endTime, @Param("statisticType")String statisticType,@Param("rectificationStatus")String rectificationStatus,@Param("objType")String objType);
 
 

pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvAlarmBackMapper.xml

@@ -19,4 +19,14 @@
             </if>
         </where>
     </select>
+    <select id="selectAlarmBack" resultType="com.njcn.process.pojo.po.SupvAlarmBack">
+        select
+            sab.*,
+            sab.complete_Time as time,
+            sa.bill_No,
+            sa.bill_Name
+        from
+            supv_alarm sa
+        INNER JOIN supv_alarm_back sab on sab.work_Alarm_Id = sa.Alarm_Id
+    </select>
 </mapper>

pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvReportMMapper.xml

@@ -10,7 +10,7 @@
         where
         supv_Type = #{statisticType}
         <if test="startTime!=null and endTime!=null">
-            and plan_Supv_Date between #{startTime} and #{endTime}
+            and effect_End_Time between #{startTime} and #{endTime}
         </if>
         <if test="objType !=null and objType!=''">
             and obj_type = #{objType}
@@ -57,4 +57,22 @@
         </if>
         group by a.duty_Org_Id
     </select>
+    <select id="statisticPlanReportYear" resultType="com.njcn.process.pojo.dto.ProcessPublicDTO">
+        select count(1) value,supv_Org_Id id from supv_plan
+        where
+        supv_Type = #{statisticType}
+        <if test="startTime!=null and endTime!=null">
+            and plan_Supv_Date between #{startTime} and #{endTime}
+        </if>
+        <if test="objType !=null and objType!=''">
+            and obj_type = #{objType}
+        </if>
+        <if test="effectStatus !=null">
+            and effect_Status in
+            <foreach collection="effectStatus" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        group by supv_Org_Id
+    </select>
 </mapper>

pqs-process/process-boot/src/main/java/com/njcn/process/service/ISupvAlarmBackService.java

@@ -25,4 +25,6 @@ public interface ISupvAlarmBackService extends IService<SupvAlarmBack> {
     boolean delAlarmBack(List<String> planIds);
 
     Page<SupvAlarmBack> pageAlarmBack(SupvAlarmBackParam param);
+
+    void downAlarmBack();
 }

pqs-process/process-boot/src/main/java/com/njcn/process/service/ISupvAlarmService.java

@@ -24,4 +24,6 @@ public interface ISupvAlarmService extends IService<SupvAlarm> {
     boolean delAlarm(List<String> planIds);
 
     Page<SupvAlarm> pageAlarm(SupvAlarmParam param);
+
+    void downAlarm();
 }

pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvAlarmBackServiceImpl.java

@@ -1,17 +1,18 @@
 package com.njcn.process.service.impl;
 
+import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.poi.excel.ExcelUtil;
 import com.njcn.process.mapper.SupvAlarmBackMapper;
 import com.njcn.process.pojo.param.SupvAlarmBackParam;
-import com.njcn.process.pojo.po.SupvAlarm;
 import com.njcn.process.pojo.po.SupvAlarmBack;
 import com.njcn.process.service.ISupvAlarmBackService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.user.api.DeptFeignClient;
 import com.njcn.user.pojo.po.Dept;
 import lombok.RequiredArgsConstructor;
@@ -79,4 +80,11 @@ public class SupvAlarmBackServiceImpl extends ServiceImpl<SupvAlarmBackMapper, S
         );
         return page;
     }
+
+    @Override
+    public void downAlarmBack() {
+        List<SupvAlarmBack> list = this.baseMapper.selectAlarmBack();
+        ExportParams exportParams = new ExportParams("预告警单反馈数据模板（带*字段均是必填,请严格按照模板标准填入数据）", "预告警单反馈数据信息");
+        ExcelUtil.exportExcel(exportParams,"预告警单反馈数据信息.xlsx",SupvAlarmBack.class, list);
+    }
 }

pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvAlarmServiceImpl.java

@@ -1,23 +1,33 @@
 package com.njcn.process.service.impl;
 
+import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.poi.excel.ExcelUtil;
 import com.njcn.process.mapper.SupvAlarmMapper;
 import com.njcn.process.pojo.param.SupvAlarmParam;
 import com.njcn.process.pojo.po.SupvAlarm;
-import com.njcn.process.pojo.po.SupvPlanHis;
 import com.njcn.process.service.ISupvAlarmService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataTypeEnum;
+import com.njcn.system.pojo.po.DictData;
 import com.njcn.user.api.DeptFeignClient;
 import com.njcn.user.pojo.po.Dept;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.time.format.DateTimeFormatter;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -32,6 +42,7 @@ import java.util.List;
 public class SupvAlarmServiceImpl extends ServiceImpl<SupvAlarmMapper, SupvAlarm> implements ISupvAlarmService {
 
     private final DeptFeignClient deptFeignClient;
+    private final DicDataFeignClient dicDataFeignClient;
 
     @Value("${gw.code}")
     private String code;
@@ -79,4 +90,32 @@ public class SupvAlarmServiceImpl extends ServiceImpl<SupvAlarmMapper, SupvAlarm
         );
         return page;
     }
+
+    @Override
+    public void downAlarm() {
+        //单据类型
+        List<DictData> billList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.BILL_TYPE.getCode()).getData();
+        Map<String, DictData> mapBill = billList.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
+
+        //所属专业
+        List<DictData> specialityList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.SPECIALITY_TYPE.getCode()).getData();
+        Map<String, DictData> mapSpeciality = specialityList.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
+
+        List<SupvAlarm> list = this.list();
+        if(CollUtil.isNotEmpty(list)){
+            for (SupvAlarm supvAlarm : list) {
+                supvAlarm.setTime(supvAlarm.getCreaterTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN)));
+                if (mapBill.containsKey(supvAlarm.getBillType())) {
+                    supvAlarm.setBillType(mapBill.get(supvAlarm.getBillType()).getName());
+                }
+
+                if (mapSpeciality.containsKey(supvAlarm.getSpecialityType())) {
+                    supvAlarm.setSpecialityType(mapSpeciality.get(supvAlarm.getSpecialityType()).getName());
+                }
+            }
+        }
+        ExportParams exportParams = new ExportParams("预告警单模板（带*字段均是必填,请严格按照模板标准填入数据）", "预告警单信息");
+        ExcelUtil.exportExcel(exportParams,"预告警单信息.xlsx",SupvAlarm.class, list);
+
+    }
 }

pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvProblemServiceImpl.java

@@ -145,6 +145,10 @@ public class SupvProblemServiceImpl extends ServiceImpl<SupvProblemMapper, SupvP
         List<DictData> problemTypeList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.SUPV_PROBLEM_TYPE.getCode()).getData();
         Map<String, DictData> mapProblemType = problemTypeList.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
 
+        //问题类型
+        List<DictData> problemLevelList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.problem_level_type.getCode().trim()).getData();
+        Map<String, DictData> mapProblemLeve = problemLevelList.stream().collect(Collectors.toMap(DictData::getValue, Function.identity()));
+
         for (SupvProblemVO supvProblem : supvProblemVOS) {
             Dept dept = deptFeignClient.getDeptByCode(supvProblem.getDutyOrgId()).getData();
             supvProblem.setDutyOrgName(dept.getName());
@@ -155,6 +159,9 @@ public class SupvProblemServiceImpl extends ServiceImpl<SupvProblemMapper, SupvP
             if (mapProblemType.containsKey(supvProblem.getProblemType())) {
                 supvProblem.setProblemType(mapProblemType.get(supvProblem.getProblemType()).getName());
             }
+            if (mapProblemLeve.containsKey(supvProblem.getProblemLevel())) {
+                supvProblem.setProblemLevel(mapProblemLeve.get(supvProblem.getProblemLevel()).getName());
+            }
         }
 
         ExcelUtil.exportExcel("实施问题信息.xlsx",SupvProblemVO.class,supvProblemVOS);

pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvReportMServiceImpl.java

@@ -79,9 +79,11 @@ public class SupvReportMServiceImpl extends MppServiceImpl<SupvReportMMapper, Su
         //年度最后一天
         LocalDateTime endYearDay = timeId.with(TemporalAdjusters.lastDayOfYear()).atTime(23,59,59);
 
+        //当前统计时间(当月最后一天)
+        LocalDateTime endTime = timeId.with(TemporalAdjusters.lastDayOfMonth()).atTime(23,59,59);
 
-        //当前统计时间
-        LocalDateTime endTime = timeId.atTime(23,59,59);
+        //统计时间的上一个月
+        LocalDateTime lastEndTime = endTime.minusMonths(1L).with(TemporalAdjusters.lastDayOfMonth());
 
         List<DictData> dictDataUhv = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.SUPV_TYPE.getCode()).getData();
         Map<String,DictData> mapStatistic = dictDataUhv.stream().collect(Collectors.toMap(DictData::getCode, Function.identity()));
@@ -93,17 +95,27 @@ public class SupvReportMServiceImpl extends MppServiceImpl<SupvReportMMapper, Su
         Map<String,PvTerminalTreeVO> mapCode = deptList.stream().collect(Collectors.toMap(PvTerminalTreeVO::getCode, Function.identity()));
         Map<String,PvTerminalTreeVO> mapList = deptList.stream().collect(Collectors.toMap(PvTerminalTreeVO::getId, Function.identity()));
 
-        List<ProcessPublicDTO> processPublicDTOListM = this.baseMapper.statisticPlanReport(firstDay,endTime,mapStatistic.get(DicDataEnum.UHV_Converter.getCode()).getId(),null,Stream.of("02","03","04").collect(Collectors.toList()));
-        List<ProcessPublicDTO> processPublicDTOListY = this.baseMapper.statisticPlanReport(firstYearDay,endYearDay,mapStatistic.get(DicDataEnum.UHV_Converter.getCode()).getId(),null,null);
-        List<ProcessPublicDTO> processPublicDTOListAll = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.UHV_Converter.getCode()).getId(),null, Stream.of("02","03","04").collect(Collectors.toList()));
+        //特高压换流站月报监督数量
+        List<ProcessPublicDTO> processPublicDTOListM = this.baseMapper.statisticPlanReport(firstDay,endTime,mapStatistic.get(DicDataEnum.UHV_Converter.getCode()).getId(),null,null);
+        List<ProcessPublicDTO> processPublicDTOListY = this.baseMapper.statisticPlanReportYear(firstYearDay,endYearDay,mapStatistic.get(DicDataEnum.UHV_Converter.getCode()).getId(),null,null);
+        List<ProcessPublicDTO> processPublicDTOListAll = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.UHV_Converter.getCode()).getId(),null, null);
+
+        //新能源场站(在运站)月报监督数量
+        List<ProcessPublicDTO> processPublicDTOListNewM = this.baseMapper.statisticPlanReport(firstDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"01",null);
+        List<ProcessPublicDTO> processPublicDTOListNewY = this.baseMapper.statisticPlanReportYear(firstYearDay,endYearDay,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"01",null);
+        List<ProcessPublicDTO> processPublicDTOListNewAll = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"01",null);
+
+        //新能源场站(改扩建)月报监督新数量
+        List<ProcessPublicDTO> processPublicDTOListNewZM = this.baseMapper.statisticPlanReport(firstDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"02",null);
+        List<ProcessPublicDTO> processPublicDTOListNewZY = this.baseMapper.statisticPlanReportYear(firstYearDay,endYearDay,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"02",null);
+        List<ProcessPublicDTO> processPublicDTOListNewZAll = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"02",null);
+
+        //敏感用户月报监督数量
+        List<ProcessPublicDTO> processPublicDTOMingGanM = this.baseMapper.statisticPlanReport(firstDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),null,null);
+        List<ProcessPublicDTO> processPublicDTOMingGanY = this.baseMapper.statisticPlanReportYear(firstYearDay,endYearDay,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),null,null);
+        List<ProcessPublicDTO> processPublicDTOMingGanAll = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),null,null);
 
-        List<ProcessPublicDTO> processPublicDTOListNewM = this.baseMapper.statisticPlanReport(firstDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"01",Stream.of("02","03","04").collect(Collectors.toList()));
-        List<ProcessPublicDTO> processPublicDTOListNewY = this.baseMapper.statisticPlanReport(firstYearDay,endYearDay,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"01",null);
-        List<ProcessPublicDTO> processPublicDTOListNewAll = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"01",Stream.of("02","03","04").collect(Collectors.toList()));
 
-        List<ProcessPublicDTO> processPublicDTOListNewZM = this.baseMapper.statisticPlanReport(firstDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"02",Stream.of("02","03","04").collect(Collectors.toList()));
-        List<ProcessPublicDTO> processPublicDTOListNewZY = this.baseMapper.statisticPlanReport(firstYearDay,endYearDay,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"02",null);
-        List<ProcessPublicDTO> processPublicDTOListNewZAll = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"02",Stream.of("02","03","04").collect(Collectors.toList()));
 
 
         //换流站问题总数量
@@ -111,49 +123,43 @@ public class SupvReportMServiceImpl extends MppServiceImpl<SupvReportMMapper, Su
         List<ProcessPublicDTO> processPublicDTOQesAll = this.baseMapper.statisticQueReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.UHV_Converter.getCode()).getId(),null,null);
 
         //换流站问题已整改数量
-        List<ProcessPublicDTO> processPublicDTOQesYesM = this.baseMapper.statisticQueReport(firstDay,endTime,mapStatistic.get(DicDataEnum.UHV_Converter.getCode()).getId(),"01",null);
-        List<ProcessPublicDTO> processPublicDTOQesYesAll = this.baseMapper.statisticQueReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.UHV_Converter.getCode()).getId(),"01",null);
+        List<ProcessPublicDTO> processPublicDTOQesYesM = this.baseMapper.statisticQueReportRectify(firstDay,endTime,mapStatistic.get(DicDataEnum.UHV_Converter.getCode()).getId(),"01",null);
+        List<ProcessPublicDTO> processPublicDTOQesYesAll = this.baseMapper.statisticQueReportRectify(firstYearDay,endTime,mapStatistic.get(DicDataEnum.UHV_Converter.getCode()).getId(),"01",null);
 
-        //新能源问题总数量
+        //新能源(在运站)问题总数量
         List<ProcessPublicDTO> processPublicDTOQesNewM = this.baseMapper.statisticQueReport(firstDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),null,"01");
         List<ProcessPublicDTO> processPublicDTOQesNewAll = this.baseMapper.statisticQueReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),null,"01");
 
-        //新能源问题已整改数量
-        List<ProcessPublicDTO> processPublicDTOQesNewYesM = this.baseMapper.statisticQueReportRectify(firstDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"01","01");
-        List<ProcessPublicDTO> processPublicDTOQesNewYesAll = this.baseMapper.statisticQueReportRectify(firstYearDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"01","01");
+        //新能源(在运站)问题已整改数量
+        List<ProcessPublicDTO> processPublicDTOQesNewYesM = this.baseMapper.statisticQueReportRectify(firstDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"02","01");
+        List<ProcessPublicDTO> processPublicDTOQesNewYesAll = this.baseMapper.statisticQueReportRectify(firstYearDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"02","01");
 
-        //新能源改扩建问题数量
+        //新能源(改扩建)问题数量
         List<ProcessPublicDTO> processPublicDTOQesNewGaiM = this.baseMapper.statisticQueReport(firstDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),null,"02");
         List<ProcessPublicDTO> processPublicDTOQesNewGaiAll = this.baseMapper.statisticQueReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),null,"02");
 
-        //新能源改扩建整改问题数量
-        List<ProcessPublicDTO> processPublicDTOQesNewGaiYesM = this.baseMapper.statisticQueReportRectify(firstDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"01","02");
-        List<ProcessPublicDTO> processPublicDTOQesNewGaiYesAll = this.baseMapper.statisticQueReportRectify(firstYearDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"01","02");
-
-
-        //敏感用户
-        List<ProcessPublicDTO> processPublicDTOMingGanM = this.baseMapper.statisticPlanReport(firstDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),null,Stream.of("02","03","04").collect(Collectors.toList()));
-        List<ProcessPublicDTO> processPublicDTOMingGanY = this.baseMapper.statisticPlanReport(firstYearDay,endYearDay,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),null,null);
-        List<ProcessPublicDTO> processPublicDTOMingGanAll = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),null,Stream.of("02","03","04").collect(Collectors.toList()));
+        //新能源(改扩建)整改问题数量
+        List<ProcessPublicDTO> processPublicDTOQesNewGaiYesM = this.baseMapper.statisticQueReportRectify(firstDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"02","02");
+        List<ProcessPublicDTO> processPublicDTOQesNewGaiYesAll = this.baseMapper.statisticQueReportRectify(firstYearDay,endTime,mapStatistic.get(DicDataEnum.New_Energy.getCode()).getId(),"02","02");
 
         //敏感用户问题总数量
         List<ProcessPublicDTO> processPublicDTOQesMingGanM = this.baseMapper.statisticQueReport(firstDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),null,null);
         List<ProcessPublicDTO> processPublicDTOQesMingGanAll = this.baseMapper.statisticQueReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),null,null);
 
         //敏感用户问题已整改数量
-        List<ProcessPublicDTO> processPublicDTOQesMingGanYesM = this.baseMapper.statisticQueReportRectify(firstDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),"01",null);
-        List<ProcessPublicDTO> processPublicDTOQesMingGanYesAll = this.baseMapper.statisticQueReportRectify(firstYearDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),"01",null);
+        List<ProcessPublicDTO> processPublicDTOQesMingGanYesM = this.baseMapper.statisticQueReportRectify(firstDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),"02",null);
+        List<ProcessPublicDTO> processPublicDTOQesMingGanYesAll = this.baseMapper.statisticQueReportRectify(firstYearDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),"02",null);
 
-        //电压
-        List<ProcessPublicDTO> processPublicDTODianYaListM = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.Technical_Super.getCode()).getId(),null,null);
-        List<ProcessPublicDTO> processPublicDTODianYaListAll = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.Technical_Super.getCode()).getId(),null,Stream.of("02","03","04").collect(Collectors.toList()));
+        //供电电压本月前统计
+        List<ProcessPublicDTO> processPublicDTODianYaListM = this.baseMapper.statisticPlanReport(firstYearDay,lastEndTime,mapStatistic.get(DicDataEnum.Technical_Super.getCode()).getId(),null,null);
+        List<ProcessPublicDTO> processPublicDTODianYaListAll = this.baseMapper.statisticPlanReport(firstYearDay,lastEndTime,mapStatistic.get(DicDataEnum.Technical_Super.getCode()).getId(),null,null);
 
-        //本月问题数量和累计问题数量
+        //供电电压问题数量
         List<ProcessPublicDTO> processPublicDTODianYaGanM = this.baseMapper.statisticQueReport(firstDay,endTime,mapStatistic.get(DicDataEnum.Technical_Super.getCode()).getId(),null,null);
         List<ProcessPublicDTO> processPublicDTODianYaGanAll = this.baseMapper.statisticQueReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.Technical_Super.getCode()).getId(),null,null);
-        //整改
-        List<ProcessPublicDTO> processPublicDTODianYaGanYesM = this.baseMapper.statisticQueReportRectify(firstDay,endTime,mapStatistic.get(DicDataEnum.Technical_Super.getCode()).getId(),"01",null);
-        List<ProcessPublicDTO> processPublicDTODianYaGanYesAll = this.baseMapper.statisticQueReportRectify(firstYearDay,endTime,mapStatistic.get(DicDataEnum.Technical_Super.getCode()).getId(),"01",null);
+        //供电电压已整改问题
+        List<ProcessPublicDTO> processPublicDTODianYaGanYesM = this.baseMapper.statisticQueReportRectify(firstDay,endTime,mapStatistic.get(DicDataEnum.Technical_Super.getCode()).getId(),"02",null);
+        List<ProcessPublicDTO> processPublicDTODianYaGanYesAll = this.baseMapper.statisticQueReportRectify(firstYearDay,endTime,mapStatistic.get(DicDataEnum.Technical_Super.getCode()).getId(),"02",null);
 
 
         List<SupvReportM> supvReportMBatch = new ArrayList<>();