Merge remote-tracking branch 'origin/master'

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

@@ -40,11 +40,14 @@ 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,std_county_org_no,week_start_dt,week_end_dt 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,std_org_no,week_start_dt,week_end_dt from pdm_maintenance_process
     </sql>
 
     <select id="selectPdmMaintenanceProcessList" parameterType="PdmMaintenanceProcess" resultMap="PdmMaintenanceProcessResult">
-        select a.*,getExamiAmountFun(getHourNumFun(std_county_org_no,week_start_dt,week_end_dt),per_hour_households_w)  exami_Amount from ( <include refid="selectPdmMaintenanceProcessVo"/>
+        select a.*,getExamiAmountFun((select ROUND(sum(hour_num))  from pdm_stop_records where std_org_no=a.std_org_no
+        and poweroff_nature_cd in('2111','2112','2121','2122','2141','2211','2212','2221','2231','2241')
+        and DATE_FORMAT(poweroff_start_tm, '%Y-%m-%d') &gt;= a.week_start_dt
+        and DATE_FORMAT(poweroff_term_tm, '%Y-%m-%d') &lt;= a.week_end_dt),per_hour_households_w) exami_Amount   from ( <include refid="selectPdmMaintenanceProcessVo"/>
         <where>
             <if test="planCode != null  and planCode != ''"> and plan_code like concat('%', #{planCode}, '%')</if>
             <if test="planCodeW != null  and planCodeW != ''"> and plan_code_w like concat('%', #{planCodeW}, '%')</if>