Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

技术监督月报调整

Browse Source
This commit is contained in:
cdf
2024-05-30 11:18:40 +08:00
parent 8e97578259
commit 1ab7a8ad38
2 changed files with 30 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -284,12 +284,6 @@ public class SupvReportM {
/**
* 各类型本年监督数量
*/
@TableField(exist = false)
private Integer planYearCountNum;
/**

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

@@ -154,6 +154,8 @@ public class SupvReportMServiceImpl extends MppServiceImpl<SupvReportMMapper, Su
//供电电压本月前统计
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,null);
List<ProcessPublicDTO> processPublicDTODianYaYearPlan = this.baseMapper.statisticPlanReportYear(firstYearDay,endYearDay,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);
@@ -196,7 +198,9 @@ public class SupvReportMServiceImpl extends MppServiceImpl<SupvReportMMapper, Su
if(deptGetBase.getDeptLevel() !=2 && deptGetBase.getDeptLevel() !=3 && deptGetBase.getDeptLevel() !=4){
continue;
}
//月累计监督数量
Integer all = 0;
Integer yearAll = 0;
SupvReportM supvReportM = new SupvReportM();
supvReportM.setStatisticsDate(timeId.with(TemporalAdjusters.firstDayOfMonth()));
supvReportM.setStatisticsDept(deptGetBase.getUnitId());
@@ -204,66 +208,64 @@ public class SupvReportMServiceImpl extends MppServiceImpl<SupvReportMMapper, Su
List<String> childrenDeptList = deptGetBase.getUnitChildrenList();
if(CollUtil.isNotEmpty(childrenDeptList)){
supvReportM.setConvertMonthSupvNum(dealData(childrenDeptList,processPublicDTOListM));
supvReportM.setConvertYearSupvNum(dealData(childrenDeptList,processPublicDTOListY));
yearAll+=supvReportM.getConvertYearSupvNum();
Integer a = dealData(childrenDeptList,processPublicDTOListAll);
supvReportM.setConvertTotalSupvNum(a);
all+=a;
supvReportM.setConvertTotalSupvNum(dealData(childrenDeptList,processPublicDTOListAll));
all+=supvReportM.getConvertTotalSupvNum();
supvReportM.setEnergyMonthSupvNum(dealData(childrenDeptList,processPublicDTOListNewM));
supvReportM.setEnergyYearSupvNum(dealData(childrenDeptList,processPublicDTOListNewY));
Integer b = dealData(childrenDeptList,processPublicDTOListNewAll);
supvReportM.setEnergyTotalSupvNum(b);
all+=b;
supvReportM.setEnergyYearSupvNum(dealData(childrenDeptList,processPublicDTOListNewY));
yearAll+=supvReportM.getEnergyYearSupvNum();
supvReportM.setEnergyTotalSupvNum(dealData(childrenDeptList,processPublicDTOListNewAll));
all+=supvReportM.getEnergyTotalSupvNum();
supvReportM.setEnergyMonthSupvNewNum(dealData(childrenDeptList,processPublicDTOListNewZM));
supvReportM.setEnergyYearSupvNewNum(dealData(childrenDeptList,processPublicDTOListNewZY));
yearAll+=supvReportM.getEnergyYearSupvNewNum();
supvReportM.setEnergyTotalSupvNewNum(dealData(childrenDeptList,processPublicDTOListNewZAll));
supvReportM.setConvertMonthQuesNum(dealData(childrenDeptList,processPublicDTOQesM));
supvReportM.setConvertTotalQuesNum(dealData(childrenDeptList,processPublicDTOQesAll));
supvReportM.setConvertMonthReformNum(dealData(childrenDeptList,processPublicDTOQesYesM));
supvReportM.setConvertTotalReformNum(dealData(childrenDeptList,processPublicDTOQesYesAll));
supvReportM.setEnergyMonthQuesNum(dealData(childrenDeptList,processPublicDTOQesNewM));
supvReportM.setEnergyTotalQuesNum(dealData(childrenDeptList,processPublicDTOQesNewAll));
supvReportM.setEnergyMonthReformNum(dealData(childrenDeptList,processPublicDTOQesNewYesM));
supvReportM.setEnergyTotalReformNum(dealData(childrenDeptList,processPublicDTOQesNewYesAll));
supvReportM.setEnergyMonthQuesNewNum(dealData(childrenDeptList,processPublicDTOQesNewGaiM));
supvReportM.setEnergyTotalQuesNewNum(dealData(childrenDeptList,processPublicDTOQesNewGaiAll));
supvReportM.setEnergyMonthReformNewNum(dealData(childrenDeptList,processPublicDTOQesNewGaiYesM));
supvReportM.setEnergyTotalReformNewNum(dealData(childrenDeptList,processPublicDTOQesNewGaiYesAll));
//敏感用户
supvReportM.setSensitiveMonthSupvNum(dealData(childrenDeptList,processPublicDTOMingGanM));
supvReportM.setSensitiveYearSupvNum(dealData(childrenDeptList,processPublicDTOMingGanY));
Integer c = dealData(childrenDeptList,processPublicDTOMingGanAll);
supvReportM.setSensitiveTotalSupvNum(c);
all+=c;
yearAll+=supvReportM.getSensitiveYearSupvNum();
supvReportM.setSensitiveTotalSupvNum(dealData(childrenDeptList,processPublicDTOMingGanAll));
all+=supvReportM.getSensitiveTotalSupvNum();
supvReportM.setSensitiveMonthQuesNum(dealData(childrenDeptList,processPublicDTOQesMingGanM));
supvReportM.setSensitiveTotalQuesNum(dealData(childrenDeptList,processPublicDTOQesMingGanAll));
supvReportM.setSensitiveMonthReformNum(dealData(childrenDeptList,processPublicDTOQesMingGanYesM));
supvReportM.setSensitiveTotalReformNum(dealData(childrenDeptList,processPublicDTOQesMingGanYesAll));
//电压
supvReportM.setPowerMonthPlanNum(dealData(childrenDeptList,processPublicDTODianYaListM));
Integer d = dealData(childrenDeptList,processPublicDTODianYaListAll);
supvReportM.setPowerMonthConductedNum(d);
supvReportM.setPowerMonthConductedNum(dealData(childrenDeptList,processPublicDTODianYaListAll));
all+=supvReportM.getPowerMonthConductedNum();
Integer dd = dealData(childrenDeptList,processPublicDTODianYaYearPlan);
yearAll+=dd;
supvReportM.setPowerMonthQuesNum(dealData(childrenDeptList,processPublicDTODianYaGanM));
supvReportM.setPowerTotalQuesNum(dealData(childrenDeptList,processPublicDTODianYaGanAll));
supvReportM.setPowerMonthReformNum(dealData(childrenDeptList,processPublicDTODianYaGanYesM));
supvReportM.setPowerTotalReformNum(dealData(childrenDeptList,processPublicDTODianYaGanYesAll));
all+=d;
//电容器组
supvReportM.setCapacitorYearSupvNum(dealData(childrenDeptList,processPublicYearDTOS));
@@ -274,6 +276,7 @@ public class SupvReportMServiceImpl extends MppServiceImpl<SupvReportMMapper, Su
supvReportM.setCapacitorMonthReformNum(dealData(childrenDeptList,processPublicDTOCapacitorGanYesM));
supvReportM.setCapacitorTotalReformNum(dealData(childrenDeptList,processPublicDTOCapacitorYesAll));
all+=supvReportM.getCapacitorTotalSupvNum();
yearAll+=supvReportM.getCapacitorYearSupvNum();
//评估报告
supvReportM.setAppraisalReportYearSupvNum(dealData(childrenDeptList,processPublicYearDTOAppraisalS));
supvReportM.setAppraisalReportMonthSupvNum(dealData(childrenDeptList,processPublicDTOAppraisalListM));
@@ -283,7 +286,9 @@ public class SupvReportMServiceImpl extends MppServiceImpl<SupvReportMMapper, Su
supvReportM.setAppraisalReportMonthReformNum(dealData(childrenDeptList,processPublicDTOAppraisalGanYesM));
supvReportM.setAppraisalReportTotalReformNum(dealData(childrenDeptList,processPublicDTOAppraisalYesAll));
all+=supvReportM.getAppraisalReportTotalSupvNum();
yearAll+=supvReportM.getAppraisalReportYearSupvNum();
supvReportM.setPlanYearCountNum(yearAll);
}
@@ -351,13 +356,7 @@ public class SupvReportMServiceImpl extends MppServiceImpl<SupvReportMMapper, Su
List<SupvReportM> records = page.getRecords();
if(CollUtil.isNotEmpty(records)){
for (SupvReportM record : records) {
record.setPlanYearCountNum(record.getConvertYearSupvNum()+
record.getEnergyYearSupvNum()+
record.getEnergyYearSupvNewNum()+
record.getSensitiveYearSupvNum()+
record.getCapacitorYearSupvNum()+
record.getAppraisalReportYearSupvNum()
);
record.setPlanCountNum(record.getConvertTotalSupvNum()+
record.getEnergyTotalSupvNum()+
record.getEnergyTotalSupvNewNum()+