Administrator 2 роки тому
батько
коміт
73e3a64735

+ 12 - 0
ruoyi-system/src/main/java/com/ruoyi/system/domain/KaoqinConfig.java

@@ -23,6 +23,10 @@ public class KaoqinConfig extends BaseEntity
     /** 部门id */
     @Excel(name = "部门id")
     private Long deptId;
+    /**
+     * 部门名称
+     */
+    private String deptName;
 
     /**
      * 部门祖籍列表
@@ -78,6 +82,14 @@ public class KaoqinConfig extends BaseEntity
      */
     private String isPhoto;
 
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public String getIsPhoto() {
         return isPhoto;
     }

+ 5 - 1
ruoyi-system/src/main/resources/mapper/system/KaoqinConfigMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="KaoqinConfig" id="KaoqinConfigResult">
         <result property="kaoqinId"    column="kaoqin_id"    />
         <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
         <result property="kaAddress"    column="ka_address"    />
         <result property="kaLog"    column="ka_log"    />
         <result property="kaLat"    column="ka_lat"    />
@@ -26,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectKaoqinConfigVo">
-        select kaoqin_id, dept_id, ka_address, ka_log, ka_lat, ka_num, ka_radius, ka_sort, ka_time_am_in, ka_time_am_out, ka_time_pm_in, ka_time_pm_out,is_photo, create_by, create_time, update_by, update_time, remark from kaoqin_config
+        select kaoqin_id, dept_id,dept_name, ka_address, ka_log, ka_lat, ka_num, ka_radius, ka_sort, ka_time_am_in, ka_time_am_out, ka_time_pm_in, ka_time_pm_out,is_photo, create_by, create_time, update_by, update_time, remark from kaoqin_config
     </sql>
 
     <select id="selectKaoqinConfigList" parameterType="KaoqinConfig" resultMap="KaoqinConfigResult">
@@ -56,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into kaoqin_config
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="deptId != null">dept_id,</if>
+            <if test="deptName != null">dept_name,</if>
             <if test="kaAddress != null and kaAddress != ''">ka_address,</if>
             <if test="kaLog != null and kaLog != ''">ka_log,</if>
             <if test="kaLat != null and kaLat != ''">ka_lat,</if>
@@ -75,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deptId != null">#{deptId},</if>
+            <if test="deptName != null">#{deptName},</if>
             <if test="kaAddress != null and kaAddress != ''">#{kaAddress},</if>
             <if test="kaLog != null and kaLog != ''">#{kaLog},</if>
             <if test="kaLat != null and kaLat != ''">#{kaLat},</if>
@@ -98,6 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update kaoqin_config
         <trim prefix="SET" suffixOverrides=",">
             <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="deptName != null">dept_name = #{deptName},</if>
             <if test="kaAddress != null and kaAddress != ''">ka_address = #{kaAddress},</if>
             <if test="kaLog != null and kaLog != ''">ka_log = #{kaLog},</if>
             <if test="kaLat != null and kaLat != ''">ka_lat = #{kaLat},</if>