1

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

@@ -30,4 +30,6 @@ public class PdmLineComplete extends PdmLine {
      */
     private String isRepeatPoweroff;
 
+    private String branchLineNm;
+
 }

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

@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </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, std_city_org_nm, std_county_org_no, 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 from pdm_branch_line
     </sql>
 
     <select id="selectPdmBranchLineList" parameterType="PdmBranchLine" resultMap="PdmBranchLineResult">
@@ -307,7 +307,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectBranchLineCompleteList" parameterType="com.ruoyi.powerdistribution.domain.vo.PdmBranchLineComplete" resultType="com.ruoyi.powerdistribution.domain.vo.PdmBranchLineComplete">
         <include refid="selectPdmBranchLineVo"/>
         <where>
-            <if test="lineNm != null  and lineNm != ''"> and line_nm = #{lineNm}</if>
+            <if test="lineNm != null  and lineNm != ''"> and line_nm like concat('%', #{lineNm}, '%')</if>
             <if test="eqpNo != null  and eqpNo != ''"> and eqp_no = #{eqpNo}</if>
             <if test="runNo != null  and runNo != ''"> and run_no = #{runNo}</if>
             <if test="blgBigFeederId != null  and blgBigFeederId != ''"> and blg_big_feeder_id = #{blgBigFeederId}</if>

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

@@ -196,6 +196,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="recId != null  and recId != ''"> and t1.rec_id = #{recId}</if>
             <if test="lineNm != null  and lineNm != ''"> and t1.line_nm like concat('%', #{lineNm}, '%')</if>
+            <if test="branchLineNm != null  and branchLineNm != ''"> and exists(select 1 from pdm_branch_line b where b.blg_big_feeder_id=t1.feeder_id and b.line_nm like concat('%', #{branchLineNm}, '%'))</if>
             <if test="isMaintOverdue!=null and 'true'.toString() == isMaintOverdue.toString()">
                 and (EXISTS(SELECT 1 from pdm_stop_records r where r.line_id=t1.rec_id and TIMESTAMPDIFF(YEAR,r.create_tm, SYSDATE())>3)
                 or (TIMESTAMPDIFF(YEAR,t1.ship_dt, SYSDATE())>3 and  not EXISTS(SELECT 1 from pdm_stop_records r where r.line_id=t1.rec_id)))