模板关联查询typeid、type

ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhTemplateController.java

@@ -115,6 +115,8 @@ public class KhTemplateController extends BaseController
                 temItem.setTemId(khTemplate.getId());
                 temItem.setItemName(item.getItemName());
                 temItem.setKhitemId(item.getId());
+                temItem.setType(item.getType());
+                temItem.setTypeId(item.getTypeId());
                 temItemService.insertKhTemItem(temItem);
             }
         }

ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhItems.java

@@ -23,7 +23,7 @@ public class KhItems extends BaseEntity
     private String itemName;
 
     /** 考核类型id */
-    @Excel(name = "考核类型id")
+   // @Excel(name = "考核类型id")
     private Long typeId;
 
     /** 考核类型 */

ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhTemItem.java

@@ -34,6 +34,30 @@ public class KhTemItem extends BaseEntity
     @Excel(name = "模板id")
     private Long temId;
 
+    /** 考核类型id */
+    // @Excel(name = "考核类型id")
+    private Long typeId;
+
+    /** 考核类型 */
+    @Excel(name = "考核类型")
+    private String type;
+
+    public Long getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(Long typeId) {
+        this.typeId = typeId;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
     public void setId(Long id)
     {
         this.id = id;

ruoyi-kaohe/src/main/resources/mapper/kaohe/KhTemItemMapper.xml

@@ -10,10 +10,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="khitemId"    column="khitem_id"    />
         <result property="itemName"    column="item_name"    />
         <result property="temId"    column="tem_id"    />
+        <result property="typeId"    column="type_id"    />
+        <result property="type"    column="type"    />
     </resultMap>
 
     <sql id="selectKhTemItemVo">
-        select id, tem_name, khitem_id, item_name, tem_id from kh_tem_item
+        select id, tem_name, khitem_id, item_name, tem_id, type_id, type from kh_tem_item
     </sql>
 
     <select id="selectKhTemItemList" parameterType="KhTemItem" resultMap="KhTemItemResult">
@@ -23,6 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="khitemId != null "> and khitem_id = #{khitemId}</if>
             <if test="itemName != null  and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
             <if test="temId != null "> and tem_id = #{temId}</if>
+            <if test="typeId != null "> and type_id = #{typeId}</if>
+            <if test="type != null  and type != ''"> and type = #{type}</if>
         </where>
     </select>
     
@@ -38,12 +42,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="khitemId != null">khitem_id,</if>
             <if test="itemName != null and itemName != ''">item_name,</if>
             <if test="temId != null">tem_id,</if>
+            <if test="typeId != null">type_id,</if>
+            <if test="type != null">type,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="temName != null and temName != ''">#{temName},</if>
             <if test="khitemId != null">#{khitemId},</if>
             <if test="itemName != null and itemName != ''">#{itemName},</if>
             <if test="temId != null">#{temId},</if>
+            <if test="typeId != null">#{typeId},</if>
+            <if test="type != null">#{type},</if>
          </trim>
     </insert>
 
@@ -54,6 +62,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="khitemId != null">khitem_id = #{khitemId},</if>
             <if test="itemName != null and itemName != ''">item_name = #{itemName},</if>
             <if test="temId != null">tem_id = #{temId},</if>
+            <if test="typeId != null">type_id = #{typeId},</if>
+            <if test="type != null">type = #{type},</if>
         </trim>
         where id = #{id}
     </update>

ruoyi-kaohe/src/main/resources/mapper/kaohe/KhTemplateMapper.xml

@@ -1,36 +1,40 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.kaohe.mapper.KhTemplateMapper">
 
     <resultMap type="KhTemplate" id="KhTemplateResult">
-        <result property="id"    column="id"    />
+        <result property="id" column="id"/>
-        <result property="temName"    column="tem_name"    />
+        <result property="temName" column="tem_name"/>
-        <collection  property="items" ofType="KhItems " javaType="ArrayList" select="getItems" column="id"/>
+        <collection property="items" ofType="KhItems " javaType="ArrayList" select="getItems" column="id"/>
     </resultMap>
 
     <resultMap id="KhItemsResult" type="KhItems">
-        <result property="id"    column="itemId"    />
+        <result property="id" column="itemId"/>
-        <result property="itemName"    column="khitemName"  />
+        <result property="itemName" column="khitemName"/>
+        <result property="type" column="type"/>
+        <result property="typeId" column="type_id"/>
     </resultMap>
 
     <sql id="selectKhTemplateVo">
-        select id, tem_name, khitem_id, item_name from kh_template
+        select id, tem_name, khitem_id, item_name
+        from kh_template
     </sql>
 
     <select id="selectKhTemplateList" parameterType="KhTemplate" resultMap="KhTemplateResult">
-        /*select t.*,ti.khitem_id itemId ,ti.item_name khitemName from kh_template t left join kh_tem_item ti on t.id=ti.tem_id*/
+        /*select t.*,ti.khitem_id itemId ,ti.item_name khitemName from kh_template t left join kh_tem_item ti on
+        t.id=ti.tem_id*/
         <include refid="selectKhTemplateVo"/>
         <where>
-            <if test="temName != null  and temName != ''"> and tem_name like concat('%', #{temName}, '%')</if>
+            <if test="temName != null  and temName != ''">and tem_name like concat('%', #{temName}, '%')</if>
         </where>
     </select>
 
-    <select id="getItems"  resultMap="KhItemsResult">
+    <select id="getItems" resultMap="KhItemsResult">
-    select ti.khitem_id itemId ,ti.item_name khitemName  from kh_tem_item ti
+        select ti.khitem_id itemId ,ti.item_name khitemName ,type,type_id from kh_tem_item ti
         <where>
-             <if test="id != null ">  ti.tem_id = #{id}</if>
+            <if test="id != null ">ti.tem_id = #{id}</if>
         </where>
     </select>
 
@@ -45,12 +49,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="temName != null and temName != ''">tem_name,</if>
             <if test="khitemId != null">khitem_id,</if>
             <if test="itemName != null and itemName != ''">item_name,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="temName != null and temName != ''">#{temName},</if>
             <if test="khitemId != null">#{khitemId},</if>
             <if test="itemName != null and itemName != ''">#{itemName},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateKhTemplate" parameterType="KhTemplate">
@@ -64,7 +68,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteKhTemplateById" parameterType="Long">
-        delete from kh_template where id = #{id}
+        delete
+        from kh_template
+        where id = #{id}
     </delete>
 
     <delete id="deleteKhTemplateByIds" parameterType="String">