作业表新增异常类型

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

@@ -51,6 +51,10 @@ public class PdmScoreRankManager extends BaseEntity
     @Excel(name = "排序")
     private int rankNum;
 
+        /** 是否黑榜 1是0否 */
+    @Excel(name = "是否黑榜")
+    private String isBlack;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -132,6 +136,14 @@ public class PdmScoreRankManager extends BaseEntity
         this.rankNum = rankNum;
     }
 
+    public String getIsBlack() {
+        return isBlack;
+    }
+
+    public void setIsBlack(String isBlack) {
+        this.isBlack = isBlack;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -47,6 +47,10 @@ public class PdmScoreRankTeam extends BaseEntity
     @Excel(name = "排序")
     private int rankNum;
 
+    /** 是否黑榜 1是0否 */
+    @Excel(name = "是否黑榜")
+    private String isBlack;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -114,11 +118,18 @@ public class PdmScoreRankTeam extends BaseEntity
     public int getRankNum() {
         return rankNum;
     }
-
     public void setRankNum(int rankNum) {
         this.rankNum = rankNum;
     }
 
+    public String getIsBlack() {
+        return isBlack;
+    }
+
+    public void setIsBlack(String isBlack) {
+        this.isBlack = isBlack;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -417,6 +417,11 @@ public class PdmWorkPlan extends BaseEntity
     /** 风险类型  */
     private String riskType;
 
+    /**
+     * 异常类型
+     */
+    private String exceptionType;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -1306,6 +1311,14 @@ public class PdmWorkPlan extends BaseEntity
         this.riskType = riskType;
     }
 
+    public String getExceptionType() {
+        return exceptionType;
+    }
+
+    public void setExceptionType(String exceptionType) {
+        this.exceptionType = exceptionType;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -7,7 +7,7 @@ import com.ruoyi.powerdistribution.domain.PdmScoreRankTeam;
  * 队伍积分排名Mapper接口
  *
  * @author ruoyi
- * @date 2024-12-05
+ * @date 2024-12-09
  */
 public interface PdmScoreRankTeamMapper
 {

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

@@ -34,7 +34,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="managerName != null  and managerName != ''"> and manager_name like concat('%', #{managerName}, '%')</if>
             <if test="score != null "> and score = #{score}</if>
         </where>
-        order by score desc
+        <if test="isBlack == null  or isBlack == ''  ">
+            order by score desc
+        </if>
+        <if test="isBlack !=null  and isBlack == 1 ">
+            order by score asc
+        </if>
     </select>
 
     <select id="selectPdmScoreRankManagerById" parameterType="Long" resultMap="PdmScoreRankManagerResult">

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

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.PdmScoreRankTeamMapper">
-    
+<mapper namespace="com.ruoyi.powerdistribution.mapper.PdmScoreRankTeamMapper">
+
     <resultMap type="PdmScoreRankTeam" id="PdmScoreRankTeamResult">
         <result property="id"    column="id"    />
         <result property="reportYear"    column="report_year"    />
@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectPdmScoreRankTeamList" parameterType="PdmScoreRankTeam" resultMap="PdmScoreRankTeamResult">
         <include refid="selectPdmScoreRankTeamVo"/>
-        <where>  
+        <where>
             <if test="reportYear != null  and reportYear != ''"> and report_year = #{reportYear}</if>
             <if test="reportDate != null  and reportDate != ''"> and report_date = #{reportDate}</if>
             <if test="teamType != null  and teamType != ''"> and team_type = #{teamType}</if>
@@ -32,13 +32,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="teamName != null  and teamName != ''"> and team_name like concat('%', #{teamName}, '%')</if>
             <if test="score != null "> and score = #{score}</if>
         </where>
+            <if test="isBlack == null  or isBlack == ''  ">
+                order by score desc
+            </if>
+            <if test="isBlack !=null  and isBlack == 1 ">
+                order by score asc
+            </if>
+
+
     </select>
-    
+
     <select id="selectPdmScoreRankTeamById" parameterType="Long" resultMap="PdmScoreRankTeamResult">
         <include refid="selectPdmScoreRankTeamVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertPdmScoreRankTeam" parameterType="PdmScoreRankTeam" useGeneratedKeys="true" keyProperty="id">
         insert into pdm_score_rank_team
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -89,9 +97,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deletePdmScoreRankTeamByIds" parameterType="String">
-        delete from pdm_score_rank_team where id in 
+        delete from pdm_score_rank_team where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-</mapper>
+</mapper>

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

@@ -103,14 +103,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="planExecStDsc"    column="plan_exec_st_dsc"    />
         <result property="cancelReason"    column="cancel_reason"    />
         <result property="planReason"    column="plan_reason"    />
+        <result property="riskType"    column="risk_type"    />
+        <result property="exceptionType"    column="exception_type"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+
     </resultMap>
 
     <sql id="selectPdmWorkPlanVo">
-        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,plan_reason,cancel_reason,risk_type,create_by, create_time, update_by, update_time from pdm_work_plan
+        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,plan_reason,cancel_reason,risk_type,exception_type,create_by, create_time, update_by, update_time
+        from pdm_work_plan
     </sql>
 
     <select id="selectPdmWorkPlanList" parameterType="com.ruoyi.powerdistribution.domain.dto.PdmWorkPlanDTO" resultMap="PdmWorkPlanResult">
@@ -212,6 +216,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stdCityOrgNo != null  and stdCityOrgNo != ''"> and std_city_org_no = #{stdCityOrgNo}</if>
             <if test="planExecStDsc != null  and planExecStDsc != ''"> and plan_exec_st_dsc = #{planExecStDsc}</if>
             <if test="riskType != null  and riskType != ''"> and risk_type = #{riskType}</if>
+            <if test="exceptionType != null  and exceptionType != ''"> and exception_type = #{exceptionType}</if>
 
             <if test="startDate != null and startDate != ''">
              and date_format(plan_start_wk_tm,'%Y%m%d') &gt;= #{startDate}
@@ -223,8 +228,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 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')
+               and exception_type != '0'
             </if>
             <if test="riskFlag != null and riskFlag == 1 ">
                 and risk_type != '0'