Merge remote-tracking branch 'origin/main'

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

@@ -105,10 +105,10 @@ public class KhGatherController extends BaseController {
             JSONObject jsonData = (JSONObject) endData;
             String khdx = jsonData.getString("khdx");
             JSONObject hzData = jsonData.getJSONObject(pyhz_name);
-            hzData.put("khdx",khdx);
+            hzData.put("khdx", khdx);
             jsonData.remove("khdx");
-            jsonData.put(pyhz_name,hzData);
+            jsonData.put(pyhz_name, hzData);
-            endData=jsonData;
+            endData = jsonData;
         }
 
         KhGather gather = new KhGather();
@@ -116,6 +116,7 @@ public class KhGatherController extends BaseController {
         gather.setTableHeader(header.toString());
         gather.setTableData(endTableData.toString());
         gather.setCreateBy(getUsername());
+        gather.setTitleStr(json);
         khGatherService.insertKhGather(gather);
         return AjaxResult.success();
     }
@@ -341,7 +342,7 @@ public class KhGatherController extends BaseController {
         KhGather gather = khGatherService.selectKhGatherById(id);
         String tableHeader = gather.getTableHeader();
         String tableData = gather.getTableData();
-        EnhancedJsonExporter.exportWithMergedHeader(tableHeader,tableData,response);
+        EnhancedJsonExporter.exportWithMergedHeader(tableHeader, tableData, response);
     }
 
     /**

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

@@ -148,6 +148,7 @@ public class KhVoteController extends BaseController {
     @Transactional
     public AjaxResult add(@RequestBody KhVote khVote) {
         khVoteService.insertKhVote(khVote);
+        //评分占比是否一致，0一致   1不一致
         if(khVote.getSamePercent()==null||khVote.getSamePercent().equals("0")){
             //根据评测id查询职工评测关联 职工
             KhPcEmp query = new KhPcEmp();

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

@@ -7,81 +7,94 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 生成汇总对象 kh_gather
- * 
+ *
  * @author hs
  * @date 2025-07-10
  */
-public class KhGather extends BaseEntity
+public class KhGather extends BaseEntity {
-{
     private static final long serialVersionUID = 1L;
 
-    /** 主键 */
+    /**
+     * 主键
+     */
     private Long id;
 
-    /** 一级标题 */
+    /**
+     * 一级标题
+     */
     @Excel(name = "一级标题")
     private String hzName;
 
-    /** 表头 */
+    /**
+     * 表头
+     */
     @Excel(name = "表头")
     private String tableHeader;
 
-    /** 表数据 */
+    /**
+     * 表数据
+     */
     @Excel(name = "表数据")
     private String tableData;
+    /**
+     * 标题json
+     */
+    @Excel(name = "标题json")
+    private String titleStr;
 
-    public void setId(Long id) 
+    public String getTitleStr() {
-    {
+        return titleStr;
+    }
+
+    public void setTitleStr(String titleStr) {
+        this.titleStr = titleStr;
+    }
+
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId() {
-    {
         return id;
     }
 
-    public void setHzName(String hzName) 
+    public void setHzName(String hzName) {
-    {
         this.hzName = hzName;
     }
 
-    public String getHzName() 
+    public String getHzName() {
-    {
         return hzName;
     }
 
-    public void setTableHeader(String tableHeader) 
+    public void setTableHeader(String tableHeader) {
-    {
         this.tableHeader = tableHeader;
     }
 
-    public String getTableHeader() 
+    public String getTableHeader() {
-    {
         return tableHeader;
     }
 
-    public void setTableData(String tableData) 
+    public void setTableData(String tableData) {
-    {
         this.tableData = tableData;
     }
 
-    public String getTableData() 
+    public String getTableData() {
-    {
         return tableData;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
+                .append("id", getId())
-            .append("hzName", getHzName())
+                .append("hzName", getHzName())
-            .append("tableHeader", getTableHeader())
+                .append("tableHeader", getTableHeader())
-            .append("tableData", getTableData())
+                .append("tableData", getTableData())
-            .append("createBy", getCreateBy())
+                .append("titleStr", getTitleStr())
-            .append("createTime", getCreateTime())
+                .append("createBy", getCreateBy())
-            .append("updateBy", getUpdateBy())
+                .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
+                .append("updateBy", getUpdateBy())
-            .append("remark", getRemark())
+                .append("updateTime", getUpdateTime())
-            .toString();
+                .append("remark", getRemark())
+                .toString();
     }
 }

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

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="hzName"    column="hz_name"    />
         <result property="tableHeader"    column="table_header"    />
         <result property="tableData"    column="table_data"    />
+        <result property="titleStr"    column="title_str"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -17,15 +18,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectKhGatherVo">
-        select id, hz_name, table_header, table_data, create_by, create_time, update_by, update_time, remark from kh_gather
+        select id, hz_name, table_header, table_data,title_str, create_by, create_time, update_by, update_time, remark from kh_gather
     </sql>
 
     <select id="selectKhGatherList" parameterType="KhGather" resultMap="KhGatherResult">
         <include refid="selectKhGatherVo"/>
         <where>  
             <if test="hzName != null  and hzName != ''"> and hz_name like concat('%', #{hzName}, '%')</if>
-            <if test="tableHeader != null  and tableHeader != ''"> and table_header = #{tableHeader}</if>
+            <!--<if test="tableHeader != null  and tableHeader != ''"> and table_header = #{tableHeader}</if>
-            <if test="tableData != null  and tableData != ''"> and table_data = #{tableData}</if>
+            <if test="tableData != null  and tableData != ''"> and table_data = #{tableData}</if>-->
+            <if test="titleStr != null  and titleStr != ''"> and title_str = #{titleStr}</if>
         </where>
         ORDER BY id DESC
     </select>
@@ -41,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="hzName != null">hz_name,</if>
             <if test="tableHeader != null">table_header,</if>
             <if test="tableData != null">table_data,</if>
+            <if test="titleStr != null">title_str,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -51,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="hzName != null">#{hzName},</if>
             <if test="tableHeader != null">#{tableHeader},</if>
             <if test="tableData != null">#{tableData},</if>
+            <if test="titleStr != null">#{titleStr},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -65,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="hzName != null">hz_name = #{hzName},</if>
             <if test="tableHeader != null">table_header = #{tableHeader},</if>
             <if test="tableData != null">table_data = #{tableData},</if>
+            <if test="titleStr != null">title_str = #{titleStr},</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>

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

@@ -51,7 +51,6 @@
             <if test="state != null  and state != ''"> and state = #{state}</if>
             <if test="samePercent != null  and samePercent != ''"> and same_percent = #{samePercent}</if>
         </where>
-        ORDER BY id DESC
     </select>
 
     <select id="getListByPcIdAndItemIds" parameterType="KhVote" resultMap="KhVoteResult">