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

1.技术监督月报，供电次数重新统计

Browse Source 
2.终端通信管理_日表和终端数据评价_日表，pq和pms兼容修改
This commit is contained in:
wr
2023-09-28 14:33:24 +08:00
parent d327814ade
commit 76afa647bb
16 changed files with 196 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@
<select id="statisticPlanReport" resultType="ProcessPublicDTO">
select count(1) value,supv_Org_Id id from supv_plan
where
(delete_Flag = 0 or delete_Flag is null ) and
supv_Type = #{statisticType}
<if test="startTime!=null and endTime!=null">
and effect_End_Time between #{startTime} and #{endTime}
@@ -28,12 +29,13 @@
select count(1) value,a.duty_Org_Id id from supv_problem a
inner join supv_plan b on a.plan_Id = b.plan_id
where
(b.delete_Flag = 0 or b.delete_Flag is null ) and
b.supv_Type = #{statisticType}
<if test="startTime!=null and endTime!=null">
and a.discovery_Time between #{startTime} and #{endTime}
</if>
<if test="rectificationStatus !=null and rectificationStatus!=''">
and a.rectification_Status = #{rectificationStatus}
and a.rectification_Status = #{rectificationStatus}
</if>
<if test="objType !=null and objType!=''">
and b.obj_type = #{objType}
@@ -45,6 +47,7 @@
select count(1) value,a.duty_Org_Id id from supv_problem a
inner join supv_plan b on a.plan_Id = b.plan_id
where
(b.delete_Flag = 0 or b.delete_Flag is null ) and
b.supv_Type = #{statisticType}
<if test="startTime!=null and endTime!=null">
and a.rectification_Time between #{startTime} and #{endTime}
@@ -60,6 +63,7 @@
<select id="statisticPlanReportYear" resultType="com.njcn.process.pojo.dto.ProcessPublicDTO">
select count(1) value,supv_Org_Id id from supv_plan
where
(delete_Flag = 0 or delete_Flag is null ) and
supv_Type = #{statisticType}
<if test="startTime!=null and endTime!=null">
and plan_Supv_Date between #{startTime} and #{endTime}

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

@@ -151,8 +151,8 @@ public class SupvReportMServiceImpl extends MppServiceImpl<SupvReportMMapper, Su
List<ProcessPublicDTO> processPublicDTOQesMingGanYesAll = this.baseMapper.statisticQueReportRectify(firstYearDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),"02",null);
//供电电压本月前统计
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> 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> processPublicDTODianYaGanM = this.baseMapper.statisticQueReport(firstDay,endTime,mapStatistic.get(DicDataEnum.Technical_Super.getCode()).getId(),null,null);