修改检修完成情况停电次数逻辑

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/controller/PdmMaintenanceProcessController.java

@@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -59,6 +60,20 @@ public class PdmMaintenanceProcessController extends BaseController
     public void export(HttpServletResponse response, PdmMaintenanceProcess pdmMaintenanceProcess)
     {
         List<PdmMaintenanceProcess> list = pdmMaintenanceProcessService.selectPdmMaintenanceProcessList(pdmMaintenanceProcess);
+        for(PdmMaintenanceProcess main:list){
+            if(CollectionUtils.isNotEmpty(main.getExamiAmount()) &&main.getExamiAmount().size()==8){
+                List<Double> examiAmount = main.getExamiAmount();
+                main.setManageAmt(examiAmount.get(0).toString());
+                main.setManageAssistantAmt(examiAmount.get(1).toString());
+                main.setDeptDirectorAmt(examiAmount.get(2).toString());
+                main.setDeptDirectorAssistantAmt(examiAmount.get(3).toString());
+                main.setDeptManageAmt(examiAmount.get(4).toString());
+                main.setPrincipAmt(examiAmount.get(5).toString());
+                main.setWorkPrincipAmt(examiAmount.get(6).toString());
+                main.setOwnerAmt(examiAmount.get(7).toString());
+            }
+        }
+
         ExcelUtil<PdmMaintenanceProcess> util = new ExcelUtil<PdmMaintenanceProcess>(PdmMaintenanceProcess.class);
         util.exportExcel(response, list, "检修计划全流程管理数据");
     }

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/PdmMaintenanceProcess.java

@@ -95,24 +95,24 @@ public class PdmMaintenanceProcess extends BaseEntity
     @Excel(name = "时户数")
     private String hourNum;
 
-    @Excel(name = "考核金额")
+    //@Excel(name = "考核金额")
     private List<Double> examiAmount;
-//    @Excel(name = "党政一把手考核金额")
-//    private String manageAmt;
-//    @Excel(name = "分管副经理")
-//    private String manageAssistantAmt;
-//    @Excel(name = "部室主任考核金额")
-//    private String deptDirectorAmt;
-//    @Excel(name = "部室分管主任考核金额")
-//    private String deptDirectorAssistantAmt;
-//    @Excel(name = "部室责任专责考核金额")
-//    private String deptManageAmt;
-//    @Excel(name = "总负责人考核金额")
-//    private String principAmt;
-//    @Excel(name = "工作负责人考核金额")
-//    private String workPrincipAmt;
-//    @Excel(name = "设备主人考核金额")
-//    private String ownerAmt;
+    @Excel(name = "党政一把手考核金额")
+    private String manageAmt;
+    @Excel(name = "分管副经理")
+    private String manageAssistantAmt;
+    @Excel(name = "部室主任考核金额")
+    private String deptDirectorAmt;
+    @Excel(name = "部室分管主任考核金额")
+    private String deptDirectorAssistantAmt;
+    @Excel(name = "部室责任专责考核金额")
+    private String deptManageAmt;
+    @Excel(name = "总负责人考核金额")
+    private String principAmt;
+    @Excel(name = "工作负责人考核金额")
+    private String workPrincipAmt;
+    @Excel(name = "设备主人考核金额")
+    private String ownerAmt;
 //
 //    @Override
     public String toString() {

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

@@ -64,7 +64,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectPdmBranchLineVo">
         select id, big_feeder_branch_line_id, line_nm, eqp_no, run_no, blg_big_feeder_id, blg_big_feeder_nm, volt_lvl_cd, volt_lvl_dsc, erect_mode_cd, erect_mode_dsc, overhd_line_len, cable_line_len, line_tol_len, start_eqp_id, start_eqp_nm, start_eqp_typ_cd, start_eqp_typ_dsc, line_nature_cd, line_nature_dsc, blg_super_line_id, blg_super_line_nm, blg_city_id, blg_city_nm, op_maint_org_id, op_maint_org_nm, maint_team_id, maint_team_nm, run_st_cd, run_st_dsc, release_st_dsc, repmaint_line_len, is_have_figur, std_eqp_master_id, std_eqp_master_nm, ship_dt, std_org_no, std_org_nm, SUBSTRING_INDEX(std_city_org_nm, '国网湖南省电力有限公司', -1)std_city_org_nm , std_county_org_no, SUBSTRING_INDEX(std_county_org_nm, '国网湖南省电力有限公司', -1)std_county_org_nm, data_dt, etl_tm, std_city_org_no, start_pos, eqp_master_id, eqp_master_nm, battalion_id, battalion_nm, retrogres_dt, create_tm, latest_upd_tm,bouns as reward_amount,fault_free_duration
-        , (SELECT count(1) from ads_cst_hywzqlc_pdmstopbranchrecords_df t1 where t1.branch_line_id=t.big_feeder_branch_line_id)poweroff_num, t.fault_poweroff_tm,t.poweroff_tm
+        , (SELECT count(1) from ads_cst_hywzqlc_pdmstopbranchrecords_df t1 where t1.branch_line_id=t.big_feeder_branch_line_id and poweroff_start_tm > DATE_SUB(NOW(), INTERVAL 2 MONTH) )poweroff_num,
+          t.fault_poweroff_tm,t.poweroff_tm
         from pdm_branch_line t
     </sql>
 

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

@@ -44,7 +44,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectPdmWorkCompleStatisticsTmpVo">
         select batch_id, batch_name, batch_code, plan_year, id, pro_code, pro_name, sort_serial, small_village_name, village_name, complete_flag, pro_category,
-               line_cable_new_plan_qt, line_cable_new_accu_qt, line_overhd_new_plan_qt, line_overhd_new_accu_qt, dist_trans_new_plan_qt, dist_trans_new_accu_qt, low_volt_line_plan_qt, low_volt_line_accu_qt, tower_plan_qt, tower_accu_qt, ring_cabinet_plan_qt, ring_cabinet_accu_qt, pole_tab_plan_qt, pole_tab_accu_qt,
+               line_cable_new_plan_qt, IFNULL(line_cable_new_accu_qt,0) line_cable_new_accu_qt,
+               line_overhd_new_plan_qt, IFNULL(line_overhd_new_accu_qt,0) line_overhd_new_accu_qt,
+               dist_trans_new_plan_qt, IFNULL(dist_trans_new_accu_qt,0) dist_trans_new_accu_qt,
+               low_volt_line_plan_qt, IFNULL(low_volt_line_accu_qt,0) low_volt_line_accu_qt,
+               tower_plan_qt, IFNULL(tower_accu_qt,0) tower_accu_qt,
+               ring_cabinet_plan_qt, IFNULL(ring_cabinet_accu_qt,0) ring_cabinet_accu_qt,
+               pole_tab_plan_qt, IFNULL(pole_tab_accu_qt,0) pole_tab_accu_qt,
                std_org_no, std_org_nm, std_city_org_no, std_city_org_nm, std_county_org_no, std_county_org_nm, data_dt, etl_tm, deal_status
         from ads_cst_hywzqlc_pdmworkcomplestatistics_wf
     </sql>