Merge remote-tracking branch 'origin/new-exam' into new-exam

ruoyi-system/src/main/java/com/ruoyi/system/domain/TdTrain.java

@@ -98,6 +98,19 @@ public class TdTrain extends BaseEntity
     @Excel(name = "培训评价")
     private String TRAININFO;
 
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    /**
+     * 部门
+     */
+    private Long deptId;
+
     public void setID(Long ID) 
     {
         this.ID = ID;
@@ -302,6 +315,7 @@ public class TdTrain extends BaseEntity
             .append("trainTimeend", getTrainTimeend())
             .append("PART", getPART())
             .append("TRAININFO", getTRAININFO())
+            .append("deptId", getDeptId())
             .toString();
     }
 }

ruoyi-system/src/main/resources/mapper/system/TdTrainMapper.xml

@@ -25,10 +25,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="trainTimeend"    column="TRAIN_TIMEEND"    />
         <result property="PART"    column="PART"    />
         <result property="TRAININFO"    column="TRAININFO"    />
+        <result property="deptId" column="dept_id" jdbcType="INTEGER"/>
     </resultMap>
 
     <sql id="selectTdTrainVo">
-        select ID, USERNAME, DEPT_NAME, TRAIN_TYPE, TRAIN_SUBJECT, TRAIN_ADDRESS, TRAIN_DATE, CREATE_STAFFID, CREATE_DEPARTID, CREATE_DATE, UPDATE_DEPARTID, UPDATE_STAFFID, UPDATE_DATE, AREAID, FRAMEWORK, TRAIN_NAME, TRAIN_STATE, TRAIN_TIMEEND, PART, TRAININFO from td_train
+        select ID, USERNAME, DEPT_NAME, TRAIN_TYPE, TRAIN_SUBJECT, TRAIN_ADDRESS, TRAIN_DATE, CREATE_STAFFID, CREATE_DEPARTID, CREATE_DATE, UPDATE_DEPARTID, UPDATE_STAFFID, UPDATE_DATE, AREAID, FRAMEWORK, TRAIN_NAME, TRAIN_STATE, TRAIN_TIMEEND, PART, TRAININFO,dept_id from td_train
     </sql>
 
     <select id="selectTdTrainList" parameterType="TdTrain" resultMap="TdTrainResult">
@@ -53,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="trainTimeend != null "> and TRAIN_TIMEEND = #{trainTimeend}</if>
             <if test="PART != null  and PART != ''"> and PART = #{PART}</if>
             <if test="TRAININFO != null  and TRAININFO != ''"> and TRAININFO = #{TRAININFO}</if>
+            <if test="deptId != null  and deptId != ''"> and dept_id = #{deptId}</if>
         </where>
         order by CREATE_DATE desc
     </select>
@@ -84,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="trainTimeend != null">TRAIN_TIMEEND,</if>
             <if test="PART != null">PART,</if>
             <if test="TRAININFO != null">TRAININFO,</if>
+            <if test="deptId != null">dept_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="USERNAME != null">#{USERNAME},</if>
@@ -105,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="trainTimeend != null">#{trainTimeend},</if>
             <if test="PART != null">#{PART},</if>
             <if test="TRAININFO != null">#{TRAININFO},</if>
+            <if test="deptId != null">#{deptId},</if>
          </trim>
     </insert>
 
@@ -130,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="trainTimeend != null">TRAIN_TIMEEND = #{trainTimeend},</if>
             <if test="PART != null">PART = #{PART},</if>
             <if test="TRAININFO != null">TRAININFO = #{TRAININFO},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
         </trim>
         where ID = #{ID}
     </update>