异常作业查询代码提交

ruoyi-powerdistribution/pom.xml

@@ -34,7 +34,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
-            <version>3.3.4</version>
+            <version>2.2.10</version>
             <scope>compile</scope>
         </dependency>
 

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

@@ -3,6 +3,7 @@ package com.ruoyi.powerdistribution.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.powerdistribution.domain.dto.PdmWorkPlanDTO;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,7 +43,7 @@ public class PdmWorkPlanController extends BaseController
     @ApiOperation(value = "查询作业计划列表")
     @PreAuthorize("@ss.hasPermi('system:plan:list')")
     @GetMapping("/list")
-    public TableDataInfo list(PdmWorkPlan pdmWorkPlan)
+    public TableDataInfo list(PdmWorkPlanDTO pdmWorkPlan)
     {
         startPage();
         List<PdmWorkPlan> list = pdmWorkPlanService.selectPdmWorkPlanList(pdmWorkPlan);
@@ -55,7 +56,7 @@ public class PdmWorkPlanController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:plan:export')")
     @Log(title = "作业计划", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, PdmWorkPlan pdmWorkPlan)
+    public void export(HttpServletResponse response, PdmWorkPlanDTO pdmWorkPlan)
     {
         List<PdmWorkPlan> list = pdmWorkPlanService.selectPdmWorkPlanList(pdmWorkPlan);
         ExcelUtil<PdmWorkPlan> util = new ExcelUtil<PdmWorkPlan>(PdmWorkPlan.class);

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

@@ -7,6 +7,7 @@ import com.alibaba.excel.write.metadata.fill.FillConfig;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.powerdistribution.domain.*;
+import com.ruoyi.powerdistribution.domain.dto.PdmWorkPlanDTO;
 import com.ruoyi.powerdistribution.domain.vo.ReportDayVO;
 import com.ruoyi.powerdistribution.domain.vo.ReportDayWeek;
 import com.ruoyi.powerdistribution.service.*;
@@ -146,9 +147,10 @@ public class ReportController extends BaseController {
         PdmReportPlanNextWeek next = new PdmReportPlanNextWeek();
         next.setReportDate(DateUtils.getNextMonday(startDate,DateUtils.YYYYMMDD));
         List<PdmReportPlanNextWeek> nextList = pdmReportPlanNextWeekService.selectPdmReportPlanNextWeekList(next);
-        PdmWorkPlan workPlan = new PdmWorkPlan();
+        PdmWorkPlanDTO workPlan = new PdmWorkPlanDTO();
         workPlan.setStartDate(DateUtils.getNextMonday(startDate,DateUtils.YYYYMMDD));
         workPlan.setEndDate(DateUtils.getNextSunday(endDate,DateUtils.YYYYMMDD));
+        workPlan.setLevel3Flag("1");//三级及以上作业
         List<PdmWorkPlan> workList = pdmWorkPlanService.selectPdmWorkPlanList(workPlan);
 
         ReportDayWeek vo = new ReportDayWeek();
@@ -185,9 +187,10 @@ public class ReportController extends BaseController {
         PdmReportPlanNextWeek next = new PdmReportPlanNextWeek();
         next.setReportDate(DateUtils.getNextMonday(startDate,DateUtils.YYYYMMDD));
         List<PdmReportPlanNextWeek> nextList = pdmReportPlanNextWeekService.selectPdmReportPlanNextWeekList(next);
-        PdmWorkPlan workPlan = new PdmWorkPlan();
+        PdmWorkPlanDTO workPlan = new PdmWorkPlanDTO();
         workPlan.setStartDate(DateUtils.getNextMonday(startDate,DateUtils.YYYYMMDD));
         workPlan.setEndDate(DateUtils.getNextSunday(endDate,DateUtils.YYYYMMDD));
+        workPlan.setLevel3Flag("1");//三级及以上作业
         List<PdmWorkPlan> workList = pdmWorkPlanService.selectPdmWorkPlanList(workPlan);
 
         response.setContentType("application/vnd.ms-excel");

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

@@ -366,7 +366,7 @@ public class PdmWorkPlan extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date moreNewTm;
 
-    /** 计划类型代码  */
+    /** 计划类型代码 周计划:2028001 临时计划2028002  */
     @Excel(name = "计划类型代码 ")
     private String planTypCd;
 
@@ -414,15 +414,7 @@ public class PdmWorkPlan extends BaseEntity
     @Excel(name = "临时计划原因 ")
     private String planReason;
 
-    /**
-     * 查询条件-开始时间
-     */
-    private String startDate;
 
-    /**
-     * 查询条件-结束时间
-     */
-    private String endDate;
 
 
     public void setId(Long id)
@@ -1290,22 +1282,6 @@ public class PdmWorkPlan extends BaseEntity
         return planExecStDsc;
     }
 
-    public String getStartDate() {
-        return startDate;
-    }
-
-    public void setStartDate(String startDate) {
-        this.startDate = startDate;
-    }
-
-    public String getEndDate() {
-        return endDate;
-    }
-
-    public void setEndDate(String endDate) {
-        this.endDate = endDate;
-    }
-
     public String getCancelReason() {
         return cancelReason;
     }

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/dto/PdmWorkPlanDTO.java

@@ -0,0 +1,61 @@
+package com.ruoyi.powerdistribution.domain.dto;
+
+import com.ruoyi.powerdistribution.domain.PdmWorkPlan;
+
+/**
+ * 作业表DTO
+ */
+public class PdmWorkPlanDTO extends PdmWorkPlan {
+
+    /**
+     * 查询条件-开始时间
+     */
+    private String startDate;
+
+    /**
+     * 查询条件-结束时间
+     */
+    private String endDate;
+
+    /**
+     * 查询条件-是否三级以以上数据 1是
+     */
+    private String level3Flag;
+
+    /**
+     * 查询条件-是否异常数据 1是
+     */
+    private String dataFlag;
+
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getLevel3Flag() {
+        return level3Flag;
+    }
+
+    public void setLevel3Flag(String level3Flag) {
+        this.level3Flag = level3Flag;
+    }
+
+    public String getDataFlag() {
+        return dataFlag;
+    }
+
+    public void setDataFlag(String dataFlag) {
+        this.dataFlag = dataFlag;
+    }
+}

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

@@ -2,6 +2,7 @@ package com.ruoyi.powerdistribution.mapper;
 
 import java.util.List;
 import com.ruoyi.powerdistribution.domain.PdmWorkPlan;
+import com.ruoyi.powerdistribution.domain.dto.PdmWorkPlanDTO;
 
 /**
  * 作业计划Mapper接口
@@ -25,7 +26,7 @@ public interface PdmWorkPlanMapper
      * @param pdmWorkPlan 作业计划
      * @return 作业计划集合
      */
-    public List<PdmWorkPlan> selectPdmWorkPlanList(PdmWorkPlan pdmWorkPlan);
+    public List<PdmWorkPlan> selectPdmWorkPlanList(PdmWorkPlanDTO pdmWorkPlan);
 
     /**
      * 新增作业计划

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

@@ -2,6 +2,7 @@ package com.ruoyi.powerdistribution.service;
 
 import java.util.List;
 import com.ruoyi.powerdistribution.domain.PdmWorkPlan;
+import com.ruoyi.powerdistribution.domain.dto.PdmWorkPlanDTO;
 
 /**
  * 作业计划Service接口
@@ -25,7 +26,7 @@ public interface IPdmWorkPlanService
      * @param pdmWorkPlan 作业计划
      * @return 作业计划集合
      */
-    public List<PdmWorkPlan> selectPdmWorkPlanList(PdmWorkPlan pdmWorkPlan);
+    public List<PdmWorkPlan> selectPdmWorkPlanList(PdmWorkPlanDTO pdmWorkPlan);
 
     /**
      * 新增作业计划

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

@@ -2,6 +2,7 @@ package com.ruoyi.powerdistribution.service.impl;
 
 import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.powerdistribution.domain.dto.PdmWorkPlanDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.powerdistribution.mapper.PdmWorkPlanMapper;
@@ -39,7 +40,7 @@ public class PdmWorkPlanServiceImpl implements IPdmWorkPlanService
      * @return 作业计划
      */
     @Override
-    public List<PdmWorkPlan> selectPdmWorkPlanList(PdmWorkPlan pdmWorkPlan)
+    public List<PdmWorkPlan> selectPdmWorkPlanList(PdmWorkPlanDTO pdmWorkPlan)
     {
         return pdmWorkPlanMapper.selectPdmWorkPlanList(pdmWorkPlan);
     }

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

@@ -113,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, uuid, week_plan_no, week_plan_id, proj_nm, proj_id, src_id, plan_nm, submit_org_nm, submit_org_id, org_sort, mgmt_org_nm, mgmt_org_id, blg_op_maint_city_org_id, blg_const_city_org_id, ovhaul_const_org_nm, ovhaul_const_org_id, op_maint_org_nm, op_maint_org_id, subs_or_line_nm, subs_or_line_id, op_risk_lvl_cd, op_risk_lvl_dsc, elecgd_risk_lvl_cd, elecgd_risk_lvl_dsc, volt_lvl_cd, volt_lvl_dsc, major_typ_cd, major_typ_dsc, op_typ_cd, op_typ_dsc, workticket_typ_cd, workticket_typ_dsc, poweroff_typ_cd, poweroff_typ_dsc, is_energized_op_cd, is_energized_op_dsc, plan_start_wk_tm, plan_end_tm, op_content, chg_scheme_dsc, op_addr, city_adm_addr, county_adm_addr, detl_pos, landmark_archit, work_team_nm, work_team_id, main_busi_org_op_num, outsourcing_org_op_num, industry_org_op_num, work_princip_nm, work_princip_id, work_princip_contact_mode, major_mgmt_dept, build_mgmt_org_nm, const_org_nm, const_org_id, const_org_cate_cd, const_org_cate_dsc, scntrct_org_nm, scntrct_org_id, scntrct_org_nature_cd, scntrct_org_nature_dsc, inspect_org_nm, inspect_org_id, poweroff_range, supervises_check, scene_supervises, scene_guardianship, release_st_cd, release_st_dsc, release_tm, release_pes, release_person_id, is_release_intime_cd, plan_exec_st_cd, is_chg_more_cd, is_chg_more_dsc, del_mark_cd, del_mark_dsc, bind_qt, is_wear_safetyhat, work_src, create_tm, more_new_tm, plan_typ_cd, plan_typ_dsc, std_org_no, std_org_nm, std_city_org_nm, data_dt, etl_tm, par_mon, std_city_org_no, plan_exec_st_dsc, create_by, create_time, update_by, update_time from pdm_work_plan
     </sql>
 
-    <select id="selectPdmWorkPlanList" parameterType="PdmWorkPlan" resultMap="PdmWorkPlanResult">
+    <select id="selectPdmWorkPlanList" parameterType="com.ruoyi.powerdistribution.domain.dto.PdmWorkPlanDTO" resultMap="PdmWorkPlanResult">
         <include refid="selectPdmWorkPlanVo"/>
         <where>
             <if test="uuid != null  and uuid != ''"> and uuid = #{uuid}</if>
@@ -218,6 +218,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endDate != null and endDate != ''">
                 and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}
             </if>
+            <if test="level3Flag != null and level3Flag == '1'">
+                and op_risk_lvl_cd in ('2007001','2007002','2007003')
+            </if>
+            <if test="dataFlag != null and dataFlag == '1'">
+                and volt_lvl_cd not in ('2001008','2001009')
+                and not  (is_energized_op_cd = '2006001' and poweroff_typ_cd = '2005002' and workticket_typ_cd = '2008015')
+            </if>
 
         </where>
     </select>