首页作业统计新增明细查询-按照施工单位统计

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

@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.ruoyi.powerdistribution.domain.dto.PdmWorkPlanDTO;
 import com.ruoyi.powerdistribution.domain.vo.WorkNumByCompanyStatistics;
 import com.ruoyi.powerdistribution.domain.vo.WorkNumStatisticsHome;
+import com.ruoyi.powerdistribution.domain.vo.WorkNumStatisticsHomeChild;
 import com.ruoyi.powerdistribution.domain.vo.WorkRiskStatistics;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -141,4 +142,13 @@ public class PdmWorkPlanController extends BaseController
     public List<WorkNumStatisticsHome> getWorkNumStatisticsHome(WorkNumStatisticsHome workNumStatisticsHome) {
         return pdmWorkPlanService.getWorkNumStatisticsHome(workNumStatisticsHome);
     }
+
+    /**
+     * 首页查询作业统计--施工单位分组
+     */
+    @ApiOperation(value = "首页查询作业统计施工单位分组")
+    @GetMapping("/getWorkNumStatisticsHomeChild")
+    public List<WorkNumStatisticsHomeChild> getWorkNumStatisticsHome(WorkNumStatisticsHomeChild workNumStatisticsHome) {
+        return pdmWorkPlanService.getWorkNumStatisticsHomeChild(workNumStatisticsHome);
+    }
 }

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/vo/WorkNumStatisticsHome.java

@@ -9,7 +9,7 @@ import lombok.Data;
 public class WorkNumStatisticsHome {
 
     /**
-     * 作业单位
+     * 作业单位简称
      */
     private String company;
 
@@ -59,4 +59,9 @@ public class WorkNumStatisticsHome {
      */
     private String endDate;
 
+    /**
+     * 作业单位名称
+     */
+    private String submitOrgNm;
+
  }

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/vo/WorkNumStatisticsHomeChild.java

@@ -0,0 +1,67 @@
+package com.ruoyi.powerdistribution.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 首页作业数量统计-施工单位分组
+ */
+@Data
+public class WorkNumStatisticsHomeChild {
+
+    /**
+     * 作业单位
+     */
+    private String submitOrgNm;
+
+    /**
+     * 施工单位
+     */
+    private String constOrgNm;
+
+    /**
+     * 作业数量
+     */
+    private Long planSum;
+
+    /**
+     * 取消数量
+     */
+    private Long cancelSum;
+
+    /**
+     * 作业执行率
+     */
+    private String executeRatio;
+
+    /**
+     * 风险数量
+     */
+    private Long riskSum;
+
+    /**
+     * 三级作业数量
+     */
+    private Long planSum3;
+
+    /**
+     * 四级作业数量
+     */
+    private Long planSum4;
+
+    /**
+     * 五级作业数量
+     */
+    private Long planSum5;
+
+
+    /**
+     * 查询开始时间
+     */
+    private String startDate;
+
+    /**
+     * 查询结束时间
+     */
+    private String endDate;
+
+ }

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/mapper/PdmWorkPlanMapper.java

@@ -3,10 +3,7 @@ package com.ruoyi.powerdistribution.mapper;
 import java.util.List;
 import com.ruoyi.powerdistribution.domain.PdmWorkPlan;
 import com.ruoyi.powerdistribution.domain.dto.PdmWorkPlanDTO;
-import com.ruoyi.powerdistribution.domain.vo.WorkNumByCompanyStatistics;
-import com.ruoyi.powerdistribution.domain.vo.WorkNumStatisticsHome;
-import com.ruoyi.powerdistribution.domain.vo.WorkPlanStatistics;
-import com.ruoyi.powerdistribution.domain.vo.WorkRiskStatistics;
+import com.ruoyi.powerdistribution.domain.vo.*;
 
 /**
  * 作业计划Mapper接口
@@ -94,6 +91,13 @@ public interface PdmWorkPlanMapper
     List<WorkNumStatisticsHome> getWorkNumStatisticsHome(WorkNumStatisticsHome workNumStatisticsHome);
 
     /**
+     * 首页查询作业数量统计--施工单位
+     * @param workNumStatisticsHome
+     * @return
+     */
+    List<WorkNumStatisticsHomeChild> getWorkNumStatisticsHomeChild(WorkNumStatisticsHomeChild workNumStatisticsHome);
+
+    /**
      * 获取工程相关作业统计
      * @param workPlanStatistics
      * @return

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/IPdmWorkPlanService.java

@@ -5,6 +5,7 @@ import com.ruoyi.powerdistribution.domain.PdmWorkPlan;
 import com.ruoyi.powerdistribution.domain.dto.PdmWorkPlanDTO;
 import com.ruoyi.powerdistribution.domain.vo.WorkNumByCompanyStatistics;
 import com.ruoyi.powerdistribution.domain.vo.WorkNumStatisticsHome;
+import com.ruoyi.powerdistribution.domain.vo.WorkNumStatisticsHomeChild;
 import com.ruoyi.powerdistribution.domain.vo.WorkRiskStatistics;
 
 /**
@@ -95,4 +96,11 @@ public interface IPdmWorkPlanService
      * @return
      */
     List<WorkNumStatisticsHome> getWorkNumStatisticsHome(WorkNumStatisticsHome workNumStatisticsHome);
+
+    /**
+     * 首页查询作业数量统计--施工单位
+     * @param workNumStatisticsHome
+     * @return
+     */
+    List<WorkNumStatisticsHomeChild> getWorkNumStatisticsHomeChild(WorkNumStatisticsHomeChild workNumStatisticsHome);
 }

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/impl/PdmWorkPlanServiceImpl.java

@@ -11,6 +11,7 @@ import com.ruoyi.powerdistribution.domain.PdmRiskRole;
 import com.ruoyi.powerdistribution.domain.dto.PdmWorkPlanDTO;
 import com.ruoyi.powerdistribution.domain.vo.WorkNumByCompanyStatistics;
 import com.ruoyi.powerdistribution.domain.vo.WorkNumStatisticsHome;
+import com.ruoyi.powerdistribution.domain.vo.WorkNumStatisticsHomeChild;
 import com.ruoyi.powerdistribution.domain.vo.WorkRiskStatistics;
 import com.ruoyi.powerdistribution.service.IPdmRiskRoleService;
 import lombok.extern.slf4j.Slf4j;
@@ -167,6 +168,11 @@ public class PdmWorkPlanServiceImpl implements IPdmWorkPlanService
         return pdmWorkPlanMapper.getWorkNumStatisticsHome(workNumStatisticsHome);
     }
 
+    @Override
+    public List<WorkNumStatisticsHomeChild> getWorkNumStatisticsHomeChild(WorkNumStatisticsHomeChild workNumStatisticsHome) {
+         return pdmWorkPlanMapper.getWorkNumStatisticsHomeChild(workNumStatisticsHome);
+    }
+
     /**
      * 校验是否高风险
      * @param plan

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

@@ -630,6 +630,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getWorkNumStatisticsHome" resultType="com.ruoyi.powerdistribution.domain.vo.WorkNumStatisticsHome">
         select
         t1.organ_abbr company,
+        t1.organ_name submit_org_nm,
         IFNULL(t2.plan_sum,0) plan_sum,
         IFNULL(t2.cancel_sum,0) cancel_sum,
         IFNULL(t2.execute_ratio,'0%') execute_ratio,
@@ -648,16 +649,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sum(if(op_risk_lvl_cd = '2007003',1,0)) plan_sum_3,
         sum(if(op_risk_lvl_cd = '2007004',1,0)) plan_sum_4,
         sum(if(op_risk_lvl_cd = '2007005',1,0)) plan_sum_5,
+        submit_org_id,
         submit_org_nm
         from
         ads_cst_hywzqlc_pdmworkplan_df
         where  date_format(plan_start_wk_tm,'%Y%m%d') &gt;= #{startDate}
           and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}
-        GROUP BY submit_org_nm
+        GROUP BY submit_org_id,submit_org_nm
         ) t2 on t1.organ_name = t2.submit_org_nm
 
     </select>
 
+    <select id="getWorkNumStatisticsHomeChild" resultType="com.ruoyi.powerdistribution.domain.vo.WorkNumStatisticsHomeChild">
+        SELECT
+            submit_org_nm,
+            const_org_nm,
+            sum(1) plan_sum,
+            sum(if(plan_exec_st_cd = '2029005',1,0)) cancel_sum,
+            CONCAT(ROUND(sum(if(plan_exec_st_cd != '2029005',1,0))/sum(1)*100,2),'%') execute_ratio,
+            sum(if(risk_type not in ('0,','1'),1,0)) risk_sum,
+            sum(if(op_risk_lvl_cd = '2007003',1,0)) plan_sum_3,
+            sum(if(op_risk_lvl_cd = '2007004',1,0)) plan_sum_4,
+            sum(if(op_risk_lvl_cd = '2007005',1,0)) plan_sum_5
+
+        from
+            ads_cst_hywzqlc_pdmworkplan_df
+        where  submit_org_nm = #{submitOrgNm}
+        and date_format(plan_start_wk_tm,'%Y%m%d') &gt;= #{startDate}
+        and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}
+        GROUP BY submit_org_nm,const_org_nm
+
+    </select>
+
+
     <select id="selectWorkPlanStatistics" resultType="com.ruoyi.powerdistribution.domain.vo.WorkPlanStatistics">
         select proj_id,
                sum(if(volt_lvl_cd = '2001008' and ((op_content like '%新建%' and op_content like '%电缆%') or (op_content like '%更换%' and op_content like '%电缆%')or (op_content like '%拆除%' and op_content like '%电缆%')),1,0)) line_cable_new_accu_qt_work,