班组信息

qianhe-ydsj/src/main/java/com/qianhe/domain/SjBzxx.java

@@ -21,17 +21,19 @@ public class SjBzxx extends BaseEntity
     private Long id;
 
     /** 单位id */
-    @Excel(name = "单位id")
     private Long deptId;
 
-    /** 班组类型 */
-    @Excel(name = "班组类型")
-    private String bzlx;
+    @Excel(name = "单位名称")
+    private String deptName;
 
     /** 班组名称 */
     @Excel(name = "班组名称")
     private String bzmc;
 
+    /** 班组类型 */
+    @Excel(name = "班组类型")
+    private String bzlx;
+
     /** 人数 */
     @Excel(name = "人数")
     private String rs;
@@ -43,7 +45,7 @@ public class SjBzxx extends BaseEntity
 
 
     //查询出的结果
-    private String deptName;//单位名称
+
     private String bzzs;//班组总数
     private String zrs;//总人数
 

qianhe-ydsj/src/main/resources/mapper/SjBzxxMapper.xml

@@ -24,9 +24,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectSjBzxxVo">
         select a.id, a.dept_id, a.bzlx, a.bzmc, a.rs, a.zt, a.create_by, a.create_time, a.update_by, a.update_time,
                a.remark,
-               d.dept_name
+               CONCAT(p.dept_name,'/',d.dept_name) dept_name
           from sj_bzxx a
           left join sys_dept d on a.dept_id=d.dept_id
+          LEFT JOIN  sys_dept p on d.parent_id = p.dept_id
     </sql>
     <select id="selectSjBzxxList" parameterType="SjBzxx" resultMap="SjBzxxResult">
         <include refid="selectSjBzxxVo"/>