监区产线列表显示监区名称

ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiPrisonLine.java

@@ -19,9 +19,12 @@ public class BusiPrisonLine extends TreeEntity
     private Long id;
 
     /** 所属监区 */
-    @Excel(name = "所属监区")
     private Long pid;
 
+    /** 所属监区名称 */
+    @Excel(name = "所属监区")
+    private String pname;
+
     /** 名称 */
     @Excel(name = "名称")
     private String disname;
@@ -106,11 +109,20 @@ public class BusiPrisonLine extends TreeEntity
         return classify;
     }
 
+    public String getPname() {
+        return pname;
+    }
+
+    public void setPname(String pname) {
+        this.pname = pname;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
             .append("pid", getPid())
+            .append("pname", getPname())
             .append("disname", getDisname())
             .append("leader", getLeader())
             .append("personNumber", getPersonNumber())

ruoyi-admin/src/main/resources/mapper/busi/BusiPrisonLineMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="BusiPrisonLine" id="BusiPrisonLineResult">
         <result property="id"    column="id"    />
         <result property="pid"    column="pid"    />
+        <result property="pname"    column="pname"    />
         <result property="disname"    column="disname"    />
         <result property="leader"    column="leader"    />
         <result property="personNumber"    column="person_number"    />
@@ -20,15 +21,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectBusiPrisonLineVo">
-        select id, pid, disname, leader, person_number, status, classify, create_by, create_time, update_by, update_time from busi_prison_line
+        select A.id, A.pid,b.disname as pname, A.disname, A.leader, A.person_number, A.status, A.classify, A.create_by, A.create_time, A.update_by, A.update_time from busi_prison_line A
+         LEFT JOIN busi_prison_line B on a.pid = b.id
     </sql>
 
     <select id="selectBusiPrisonLineList" parameterType="BusiPrisonLine" resultMap="BusiPrisonLineResult">
         <include refid="selectBusiPrisonLineVo"/>
         <where>  
-            <if test="disname != null  and disname != ''"> and disname like concat('%', #{disname}, '%')</if>
+            <if test="disname != null  and disname != ''"> and A.disname like concat('%', #{disname}, '%')</if>
-            <if test="leader != null  and leader != ''"> and leader like concat('%', #{leader}, '%')</if>
+            <if test="leader != null  and leader != ''"> and A.leader like concat('%', #{leader}, '%')</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="status != null  and status != ''"> and A.status = #{status}</if>
         </where>
         order by pid
     </select>

ruoyi-admin/src/main/resources/templates/busi/prisonLine/prisonLine.html

@@ -76,7 +76,7 @@
                     radio: true
                 },
                 {
-                    field: 'pid',
+                    field: 'pname',
                     title: '所属监区',
                     align: 'left'
                 },