修改计划流程和停电数据关联条件

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

@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectPdmMaintenanceProcessVo">
-        select id, plan_code,plan_code_w, power_outage_devices, per_hour_households_m, per_hour_households_w, SUBSTRING_INDEX(city, '国网湖南省电力有限公司', -1)city, SUBSTRING_INDEX(SUBSTRING_INDEX(county, '国网湖南省电力有限公司', -1),'国网衡阳供电公司',-1)county, SUBSTRING_INDEX(station, '国网湖南省电力有限公司', -1)station, line_code, line_name, per_hour_households_artif,SUBSTRING_INDEX(declar_agency, '国网衡阳供电公司', -1) declar_agency, is_maintenance, is_approve, maintenance_file_path,maintenance_file_name, approve_file_path,approve_file_name, create_by, create_time, update_by, update_time,getHourNumFun(std_org_no,week_start_dt,week_end_dt)hour_num from pdm_maintenance_process
+        select id, plan_code,plan_code_w, power_outage_devices, per_hour_households_m, per_hour_households_w, SUBSTRING_INDEX(city, '国网湖南省电力有限公司', -1)city, SUBSTRING_INDEX(SUBSTRING_INDEX(county, '国网湖南省电力有限公司', -1),'国网衡阳供电公司',-1)county, SUBSTRING_INDEX(station, '国网湖南省电力有限公司', -1)station, line_code, line_name, per_hour_households_artif,SUBSTRING_INDEX(declar_agency, '国网衡阳供电公司', -1) declar_agency, is_maintenance, is_approve, maintenance_file_path,maintenance_file_name, approve_file_path,approve_file_name, create_by, create_time, update_by, update_time,getHourNumFun(std_county_org_no,week_start_dt,week_end_dt)hour_num from pdm_maintenance_process
     </sql>
 
     <select id="selectPdmMaintenanceProcessList" parameterType="PdmMaintenanceProcess" resultMap="PdmMaintenanceProcessResult">

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

@@ -151,7 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            LEFT JOIN (
             select
                 sum(if((to_post_in_place_person_typ_cd in ('2035002','2035004') and is_in_place = '1'),1,0)) boss_sum,
-                sum(if((to_post_in_place_person_typ_cd in ('2035003','2035003') and is_in_place = '1'),1,0)) manage_sum,
+                sum(if((to_post_in_place_person_typ_cd in ('2035003','2035005') and is_in_place = '1'),1,0)) manage_sum,
                 sum(if(is_in_place = '0',1,0)) absent_sum,
                 submit_org_nm
             from pdm_work_plan_in_place t1,pdm_work_plan t2 where