diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhGatherController.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhGatherController.java index 0734c35..751db6b 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhGatherController.java +++ b/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); - endData=jsonData; + jsonData.put(pyhz_name, hzData); + 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); } /** diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhVoteController.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhVoteController.java index 2942db3..86e7159 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhVoteController.java +++ b/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(); diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhGather.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhGather.java index 4a90bbd..14eb533 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhGather.java +++ b/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) - .append("id", getId()) - .append("hzName", getHzName()) - .append("tableHeader", getTableHeader()) - .append("tableData", getTableData()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("hzName", getHzName()) + .append("tableHeader", getTableHeader()) + .append("tableData", getTableData()) + .append("titleStr", getTitleStr()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); } } diff --git a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhGatherMapper.xml b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhGatherMapper.xml index 590bc19..d133917 100644 --- a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhGatherMapper.xml +++ b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhGatherMapper.xml @@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -17,15 +18,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 @@ -41,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" hz_name, table_header, table_data, + title_str, create_by, create_time, update_by, @@ -51,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{hzName}, #{tableHeader}, #{tableData}, + #{titleStr}, #{createBy}, #{createTime}, #{updateBy}, @@ -65,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" hz_name = #{hzName}, table_header = #{tableHeader}, table_data = #{tableData}, + title_str = #{titleStr}, create_by = #{createBy}, create_time = #{createTime}, update_by = #{updateBy}, diff --git a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml index 1162c46..cac924d 100644 --- a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml +++ b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml @@ -51,7 +51,6 @@ and state = #{state} and same_percent = #{samePercent} - ORDER BY id DESC