Merge remote-tracking branch 'origin/main'

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

@@ -13,26 +13,35 @@ import java.util.List;
  * @author hs
  * @date 2025-06-17
  */
-public class KhTemplate extends BaseEntity
-{
+public class KhTemplate extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 主键ID */
+    /**
+     * 主键ID
+     */
     private Long id;
 
-    /** 模板名称 */
+    /**
+     * 模板名称
+     */
     @Excel(name = "模板名称")
     private String temName;
 
-    /** 考核项id */
+    /**
+     * 考核项id
+     */
     @Excel(name = "考核项id")
     private Long khitemId;
 
-    /** 考核项名称 */
+    /**
+     * 考核项名称
+     */
     @Excel(name = "考核项名称")
     private String itemName;
 
-    /** 考核项名称 */
+    /**
+     * 考核项名称
+     */
     @Excel(name = "考核项名称")
     private List<KhItems> items;
 
@@ -44,43 +53,35 @@ public class KhTemplate extends BaseEntity
         this.items = items;
     }
 
-    public void setId(Long id)
-    {
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getId() 
-    {
+    public Long getId() {
         return id;
     }
 
-    public void setTemName(String temName) 
-    {
+    public void setTemName(String temName) {
         this.temName = temName;
     }
 
-    public String getTemName() 
-    {
+    public String getTemName() {
         return temName;
     }
 
-    public void setKhitemId(Long khitemId)
-    {
+    public void setKhitemId(Long khitemId) {
         this.khitemId = khitemId;
     }
 
-    public Long getKhitemId() 
-    {
+    public Long getKhitemId() {
         return khitemId;
     }
 
-    public void setItemName(String itemName) 
-    {
+    public void setItemName(String itemName) {
         this.itemName = itemName;
     }
 
-    public String getItemName() 
-    {
+    public String getItemName() {
         return itemName;
     }
 
@@ -92,6 +93,11 @@ public class KhTemplate extends BaseEntity
                 .append("khitemId", getKhitemId())
                 .append("itemName", getItemName())
                 .append("items", getItems())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
                 .toString();
     }
 }

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

@@ -7,6 +7,11 @@
     <resultMap type="KhTemplate" id="KhTemplateResult">
         <result property="id" column="id"/>
         <result property="temName" column="tem_name"/>
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
         <collection property="items" ofType="KhItems " javaType="ArrayList" select="getItems" column="id"/>
     </resultMap>
 
@@ -18,8 +23,7 @@
     </resultMap>
 
     <sql id="selectKhTemplateVo">
-        select id, tem_name, khitem_id, item_name
-        from kh_template
+        select id, tem_name, khitem_id, item_name, create_by, create_time, update_by, update_time, remark from kh_template
     </sql>
 
     <select id="selectKhTemplateList" parameterType="KhTemplate" resultMap="KhTemplateResult">
@@ -49,11 +53,21 @@
             <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>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</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="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
         </trim>
     </insert>
 
@@ -63,6 +77,11 @@
             <if test="temName != null and temName != ''">tem_name = #{temName},</if>
             <if test="khitemId != null">khitem_id = #{khitemId},</if>
             <if test="itemName != null and itemName != ''">item_name = #{itemName},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
         </trim>
         where id = #{id}
     </update>