1.技术监督月报数据调整

pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvReportM.java

@@ -1,5 +1,6 @@
 package com.njcn.process.pojo.po;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
@@ -223,5 +224,40 @@ public class SupvReportM {
 
     private Integer isUploadHead;
 
+    /**
+     * 各类型本年监督数量
+     */
+    @TableField(exist = false)
+    private Integer  planYearCountNum;
+
+    /**
+     * 各类型累计监督数量
+     */
+    @TableField(exist = false)
+    private Integer  planCountNum;
+
+    /**
+     * 各类型累计问题数量
+     */
+    @TableField(exist = false)
+    private Integer problemCountNum;
+
+    /**
+     * 各类型整改问题数量
+     */
+    @TableField(exist = false)
+    private Integer reformCountNum;
+
+    /**
+     * 预告警单数量
+     */
+    @TableField(exist = false)
+    private Integer alarmCountNum;
+    /**
+     * 反馈单数量
+     */
+    @TableField(exist = false)
+    private Integer alarmBackCountNum;
+
 
 }

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

@@ -2,6 +2,7 @@ package com.njcn.process.service.impl;
 
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.TimeInterval;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -12,7 +13,11 @@ import com.njcn.device.biz.pojo.dto.DeptGetBase;
 import com.njcn.device.biz.pojo.param.DeptGetLineParam;
 import com.njcn.process.mapper.SupvReportMMapper;
 import com.njcn.process.pojo.dto.ProcessPublicDTO;
+import com.njcn.process.pojo.po.SupvAlarm;
+import com.njcn.process.pojo.po.SupvAlarmBack;
 import com.njcn.process.pojo.po.SupvReportM;
+import com.njcn.process.service.ISupvAlarmBackService;
+import com.njcn.process.service.ISupvAlarmService;
 import com.njcn.process.service.ISupvReportMService;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataEnum;
@@ -56,6 +61,8 @@ public class SupvReportMServiceImpl extends MppServiceImpl<SupvReportMMapper, Su
     private final DeptFeignClient deptFeignClient;
 
     private final DicDataFeignClient dicDataFeignClient;
+    private final ISupvAlarmService supvAlarmService;
+    private final ISupvAlarmBackService supvAlarmBackService;
 
     @Override
     @Async("asyncExecutor")
@@ -296,7 +303,45 @@ public class SupvReportMServiceImpl extends MppServiceImpl<SupvReportMMapper, Su
         LambdaQueryWrapper<SupvReportM> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.in(StrUtil.isNotBlank(baseParam.getSearchValue()),SupvReportM::getStatisticsDept,deptCodes)
                 .between(StrUtil.isNotBlank(baseParam.getSearchBeginTime()),SupvReportM::getStatisticsDate,baseParam.getSearchBeginTime(),baseParam.getSearchEndTime());
-        return this.page(new Page<>(PageFactory.getPageNum(baseParam),PageFactory.getPageSize(baseParam)),lambdaQueryWrapper);
+        Page<SupvReportM> page = this.page(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper);
+        List<SupvReportM> records = page.getRecords();
+        if(CollUtil.isNotEmpty(records)){
+            for (SupvReportM record : records) {
+                record.setPlanYearCountNum(record.getConvertYearSupvNum()+
+                                record.getEnergyYearSupvNum()+
+                                record.getEnergyYearSupvNewNum()+
+                                record.getSensitiveYearSupvNum()+
+                                record.getPowerMonthPlanNum()
+                        );
+                record.setPlanCountNum(record.getConvertTotalSupvNum()+
+                                record.getEnergyTotalSupvNum()+
+                                record.getEnergyTotalSupvNewNum()+
+                                record.getSensitiveTotalSupvNum()+
+                                record.getPowerMonthConductedNum()
+                );
+                record.setProblemCountNum(record.getConvertTotalQuesNum()+
+                        record.getEnergyTotalQuesNum()+
+                        record.getEnergyTotalQuesNewNum()+
+                        record.getSensitiveTotalQuesNum()+
+                        record.getPowerTotalQuesNum());
+                record.setReformCountNum(record.getConvertTotalReformNum()+
+                        record.getEnergyTotalReformNum()+
+                        record.getEnergyTotalReformNewNum()+
+                        record.getSensitiveTotalReformNum()+
+                        record.getPowerTotalReformNum());
+                List<String> deptIds = deptFeignClient.getDepSonSelfCodetByCode(record.getStatisticsDept()).getData();
+                //获取预告警单信息
+                List<SupvAlarm> list = supvAlarmService.list(new LambdaQueryWrapper<SupvAlarm>().in(SupvAlarm::getCreaterOrgId, deptIds));
+                int count =0;
+                if(CollUtil.isNotEmpty(list)){
+                    List<String> alarmIds = list.stream().map(SupvAlarm::getAlarmId).distinct().collect(Collectors.toList());
+                    count=supvAlarmBackService.count(new LambdaQueryWrapper<SupvAlarmBack>().in(SupvAlarmBack::getWorkAlarmId, alarmIds));
+                }
+                record.setAlarmCountNum(list.size());
+                record.setAlarmBackCountNum(count);
+            }
+        }
+        return page;
 
     }