Преглед на файлове

首页作业统计查询提交

zx преди 3 месеца
родител
ревизия
08a8065c8a

+ 10 - 3
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/controller/PdmWorkPlanController.java

@@ -5,14 +5,12 @@ 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.WorkRiskStatistics;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -133,4 +131,13 @@ public class PdmWorkPlanController extends BaseController
         List<PdmWorkPlan> list = pdmWorkPlanService.selectWorkPlanByVchicleNo(pdmWorkPlan);
         return getDataTable(list);
     }
+
+    /**
+     * 首页查询作业统计
+     */
+    @ApiOperation(value = "首页查询作业统计")
+    @GetMapping("/getWorkNumStatisticsHome")
+    public List<WorkNumStatisticsHome> getWorkNumStatisticsHome(WorkNumStatisticsHome workNumStatisticsHome) {
+        return pdmWorkPlanService.getWorkNumStatisticsHome(workNumStatisticsHome);
+    }
 }

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

@@ -0,0 +1,62 @@
+package com.ruoyi.powerdistribution.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 首页作业数量统计
+ */
+@Data
+public class WorkNumStatisticsHome {
+
+    /**
+     * 作业单位
+     */
+    private String company;
+
+    /**
+     * 作业数量
+     */
+    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;
+
+ }

+ 10 - 1
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/mapper/PdmWorkPlanMapper.java

@@ -4,6 +4,7 @@ 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.WorkRiskStatistics;
 
 /**
@@ -78,10 +79,18 @@ public interface PdmWorkPlanMapper
 
     /**
      * 查询车辆作业信息
-     * @param vchicleNo
+     * @param pdmWorkPlan
      * @return
      */
     List<PdmWorkPlan> selectWorkPlanByVchicleNo(PdmWorkPlanDTO pdmWorkPlan);
 
 
+    /**
+     * 首页查询作业数量统计
+     * @param workNumStatisticsHome
+     * @return
+     */
+    List<WorkNumStatisticsHome> getWorkNumStatisticsHome(WorkNumStatisticsHome workNumStatisticsHome);
+
+
 }

+ 8 - 0
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/IPdmWorkPlanService.java

@@ -4,6 +4,7 @@ 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.WorkRiskStatistics;
 
 /**
@@ -87,4 +88,11 @@ public interface IPdmWorkPlanService
      * @return
      */
     List<PdmWorkPlan> selectWorkPlanByVchicleNo(PdmWorkPlanDTO pdmWorkPlan);
+
+    /**
+     * 首页查询作业数量统计
+     * @param workNumStatisticsHome
+     * @return
+     */
+    List<WorkNumStatisticsHome> getWorkNumStatisticsHome(WorkNumStatisticsHome workNumStatisticsHome);
 }

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

@@ -10,6 +10,7 @@ import com.ruoyi.common.utils.DateUtils;
 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.WorkRiskStatistics;
 import com.ruoyi.powerdistribution.service.IPdmRiskRoleService;
 import lombok.extern.slf4j.Slf4j;
@@ -161,6 +162,11 @@ public class PdmWorkPlanServiceImpl implements IPdmWorkPlanService
         return pdmWorkPlanMapper.selectWorkPlanByVchicleNo(pdmWorkPlan);
     }
 
+    @Override
+    public List<WorkNumStatisticsHome> getWorkNumStatisticsHome(WorkNumStatisticsHome workNumStatisticsHome) {
+        return pdmWorkPlanMapper.getWorkNumStatisticsHome(workNumStatisticsHome);
+    }
+
     /**
      * 校验是否高风险
      * @param plan

+ 31 - 0
ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmWorkPlanMapper.xml

@@ -622,4 +622,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             )
         </where>
     </select>
+
+    <select id="getWorkNumStatisticsHome" resultType="com.ruoyi.powerdistribution.domain.vo.WorkNumStatisticsHome">
+        select
+        t1.organ_abbr company,
+        IFNULL(t2.plan_sum,0) plan_sum,
+        IFNULL(t2.cancel_sum,0) cancel_sum,
+        IFNULL(t2.execute_ratio,'0%') execute_ratio,
+        IFNULL(t2.risk_sum,0) risk_sum,
+        IFNULL(t2.plan_sum_3,0) plan_sum_3,
+        IFNULL(t2.plan_sum_4,0) plan_sum_4,
+        IFNULL(t2.plan_sum_5,0) plan_sum_5
+        from pdm_work_organ t1
+        LEFT JOIN
+        (
+        SELECT
+        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,
+        submit_org_nm
+        from
+        pdm_work_plan
+        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
+        ) t2 on t1.organ_name = t2.submit_org_nm
+
+    </select>
 </mapper>