1

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

@@ -3,6 +3,7 @@ package com.ruoyi.powerdistribution.domain;
 import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -14,6 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2024-12-24
  */
+@Data
 public class PdmBranchLine extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -224,6 +226,12 @@ public class PdmBranchLine extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "创建时间 ", width = 30, dateFormat = "yyyy-MM-dd")
     private Date createTm;
+    @Excel(name = "奖励金额 ", width = 30)
+    private BigDecimal rewardAmount;
+    @Excel(name = "无故障时间 ", width = 30)
+    private  String faultFreeDuration;
+    @Excel(name = "停电次数 ", width = 30)
+    private Long poweroffNum;
 
     /** 最新更新时间  */
     @JsonFormat(pattern = "yyyy-MM-dd")

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

@@ -57,10 +57,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="retrogresDt"    column="retrogres_dt"    />
         <result property="createTm"    column="create_tm"    />
         <result property="latestUpdTm"    column="latest_upd_tm"    />
+        <result property="rewardAmount"    column="reward_amount"    />
+        <result property="faultFreeDuration"    column="fault_free_duration"    />
+        <result property="poweroffNum"    column="poweroff_num"    />
     </resultMap>
 
     <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 from pdm_branch_line
+        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 pdm_stop_branch_records t1 where t1.branch_line_id=t.big_feeder_branch_line_id)poweroff_num
+        from pdm_branch_line t
     </sql>
 
     <select id="selectPdmBranchLineList" parameterType="PdmBranchLine" resultMap="PdmBranchLineResult">