学习资料关联培训记录id

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcResource.java

@@ -22,6 +22,12 @@ public class CmcResource extends BaseEntity
     /** 资料id */
     private Integer resourceId;
 
+    /** 培训名称 */
+    private Integer trainId;
+    private CmcTrain train;
+    @Excel(name = "培训名称")
+    private String name;
+
     /** 上传人 */
     private Long uploader;
     @Excel(name = "上传人")
@@ -181,6 +187,25 @@ public class CmcResource extends BaseEntity
     {
         return resourceField;
     }
+    public void setTrainId(Integer trainId)
+    {
+        this.trainId = trainId;
+    }
+
+    public Integer getTrainId()
+    {
+        return trainId;
+    }
+    public void setTrain(CmcTrain train)
+    {
+        this.train = train;
+        this.name = train == null ? "" : train.getName();
+    }
+
+    public CmcTrain getTrain()
+    {
+        return train;
+    }
 
     @Override
     public String toString() {

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcResourceMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="CmcResource" id="CmcResourceResult">
         <result property="resourceId"    column="resource_id"    />
+        <result property="trainId"    column="train_id"    />
         <result property="uploader"    column="uploader"    />
         <result property="uploadDept"    column="upload_dept"    />
         <result property="title"    column="title"    />
@@ -17,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <association property="uploadUser"    javaType="SysUser"         resultMap="UploadUserResult" />
         <association property="dept"    javaType="SysDept"         resultMap="SysDeptResult" />
         <association property="resourceField"    javaType="CmcResourceField"         resultMap="CmcResourceFieldResult" />
+        <association property="train"    javaType="CmcTrain"         resultMap="CmcTrainResult" />
     </resultMap>
 
     <resultMap type="SysUser" id="UploadUserResult">
@@ -34,16 +36,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="field"    column="field"    />
     </resultMap>
 
+    <resultMap type="CmcTrain" id="CmcTrainResult">
+        <result property="trainId"    column="train_id"    />
+        <result property="name"    column="name"    />
+    </resultMap>
+
     <sql id="selectCmcResourceVo">
-        select r.resource_id, r.uploader, r.upload_dept, r.title, r.source_path, r.type, r.field_id, rf.field, r.upload_time, r.hours from cmc_resource as r
+        select r.resource_id, r.train_id, r.uploader, r.upload_dept, r.title, r.source_path, r.type, r.field_id, rf.field, r.upload_time, r.hours, t.name from cmc_resource as r
         left join sys_user as u on u.user_id = r.uploader
         left join sys_dept as d on d.dept_id = r.upload_dept
         left join cmc_resource_field as rf on rf.field_id = r.field_id
+        left join cmc_train as t on t.train_id = r.train_id
     </sql>
 
     <select id="selectCmcResourceList" parameterType="CmcResource" resultMap="CmcResourceResult">
         <include refid="selectCmcResourceVo"/>
         <where>  
+            <if test="trainId != null "> and r.train_id = #{trainId}</if>
             <if test="uploader != null "> and r.uploader = #{uploader}</if>
             <if test="uploadDept != null "> and r.upload_dept = #{uploadDept}</if>
             <if test="title != null  and title != ''"> and r.title like concat('%', #{title}, '%')</if>
@@ -97,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fieldId != null">field_id,</if>
             <if test="uploadTime != null">upload_time,</if>
             <if test="hours != null">hours,</if>
+            <if test="trainId != null">train_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="uploader != null">#{uploader},</if>
@@ -107,6 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fieldId != null">#{fieldId},</if>
             <if test="uploadTime != null">#{uploadTime},</if>
             <if test="hours != null">#{hours},</if>
+            <if test="trainId != null">#{trainId},</if>
          </trim>
     </insert>
 
@@ -121,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fieldId != null">field_id = #{fieldId},</if>
             <if test="uploadTime != null">upload_time = #{uploadTime},</if>
             <if test="hours != null">hours = #{hours},</if>
+            <if test="trainId != null">train_id = #{trainId},</if>
         </trim>
         where resource_id = #{resourceId}
     </update>