From 05d511e5769c829ad0e9e305e89d527424891200 Mon Sep 17 00:00:00 2001 From: hshansha Date: Tue, 28 Oct 2025 17:26:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E6=A0=B8=E5=BE=97=E5=88=86=E5=8F=8A?= =?UTF-8?q?=E6=B1=87=E6=80=BB=E5=BE=97=E5=88=86=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E8=80=83=E6=A0=B8=E4=BB=BB=E5=8A=A1=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E5=90=8D=E7=A7=B0=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/kaohe/controller/KhGatherController.java | 10 ++++++---- .../java/com/ruoyi/kaohe/domain/KhKhrwResult.java | 13 +++++++++++++ .../kaohe/service/impl/KhKhrwResultServiceImpl.java | 8 +++++--- .../resources/mapper/kaohe/KhKhrwResultMapper.xml | 7 ++++++- 4 files changed, 30 insertions(+), 8 deletions(-) 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 751db6b..2769933 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 @@ -235,14 +235,14 @@ public class KhGatherController extends BaseController { } else { //引用考核任务 Long pcId = jobj.getLong("id"); - - String khrwName = jobj.getString("title"); - String pykhrwName = PinYinUtil.getPinyinInitials(khrwName); + //根据pcId获取考核任务结果 KhKhrwResult khrwResult = new KhKhrwResult(); khrwResult.setPcId(pcId); - //获取考核任务结果 List khrw = khKhrwResultService.selectKhKhrwResultList(khrwResult); + String khrwName = jobj.getString("title"); + String pykhrwName = PinYinUtil.getPinyinInitials(khrwName); if (khrw != null && khrw.size() > 0) { + khrwName=khrw.get(0).getTemName();//从这把考核任务名改为对应模板名称 //----------组合表头数据--------- JSONArray tableHeader = new JSONArray(khrw.get(0).getTableHeader()); btKhdx = tableHeader.getJSONObject(0);//下标0 单位/姓名 @@ -267,7 +267,9 @@ public class KhGatherController extends BaseController { for (Object tabledatum : tabledata) { JSONObject obj = (JSONObject) tabledatum; JSONObject erji = new JSONObject(true); + //------------------------------------ erji.put(pinyinKhrw, obj.get(pinyinKhrw)); + //------------------------------------ erji.put(pinyinKhrw + "_df", obj.get(pinyinKhrw + "_df")); if (zb != null) { //代表当前引用考核任务有占比 BigDecimal zsfs = zb.multiply((BigDecimal) obj.get(pinyinKhrw + "_df")); diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhKhrwResult.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhKhrwResult.java index d118fdd..5a29696 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhKhrwResult.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhKhrwResult.java @@ -26,6 +26,10 @@ public class KhKhrwResult extends BaseEntity @Excel(name = "考核名称") private String pcName; + /** 模板名称 */ + @Excel(name = "模板名称") + private String temName; + /** 表头 */ @Excel(name = "表头") private String tableHeader; @@ -34,6 +38,14 @@ public class KhKhrwResult extends BaseEntity @Excel(name = "表数据") private String tableData; + public String getTemName() { + return temName; + } + + public void setTemName(String temName) { + this.temName = temName; + } + public void setId(Long id) { this.id = id; @@ -90,6 +102,7 @@ public class KhKhrwResult extends BaseEntity .append("id", getId()) .append("pcId", getPcId()) .append("pcName", getPcName()) + .append("temName", getTemName()) .append("tableHeader", getTableHeader()) .append("tableData", getTableData()) .append("createBy", getCreateBy()) diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhKhrwResultServiceImpl.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhKhrwResultServiceImpl.java index fc5e2c0..0ab5ebc 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhKhrwResultServiceImpl.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhKhrwResultServiceImpl.java @@ -122,10 +122,11 @@ public class KhKhrwResultServiceImpl implements IKhKhrwResultService children.add(tableColumn); JSONObject tableColumn2 = new JSONObject(); - String pyPCtitle = PinYinUtil.getPinyinInitials(pc.getPcTitle()); + //String pyPCtitle = PinYinUtil.getPinyinInitials(pc.getPcTitle()); + String pyPCtitle = PinYinUtil.getPinyinInitials(pc.getTemplateName()); //表格表头lable改为使用模板名称 tableColumn2.put("name", pyPCtitle); - tableColumn2.put("label", pc.getPcTitle()); - + //tableColumn2.put("label", pc.getPcTitle()); + tableColumn2.put("label", pc.getTemplateName()); //----------------------------------------------------------------------------------------- JSONArray endData = new JSONArray(); //存放表格数据 @@ -250,6 +251,7 @@ public class KhKhrwResultServiceImpl implements IKhKhrwResultService KhKhrwResult pcResult = new KhKhrwResult(); pcResult.setPcId(pc.getId()); pcResult.setPcName(pc.getPcTitle()); + pcResult.setTemName(pc.getTemplateName()); pcResult.setTableHeader(children.toJSONString()); pcResult.setTableData(endData.toJSONString()); if(isUpdate){ diff --git a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhKhrwResultMapper.xml b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhKhrwResultMapper.xml index 93cfb80..690f75a 100644 --- a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhKhrwResultMapper.xml +++ b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhKhrwResultMapper.xml @@ -8,6 +8,7 @@ + @@ -18,7 +19,7 @@ - select id, pc_id, pc_name, table_header, table_data, create_by, create_time, update_by, update_time, remark from kh_khrw_result + select id, pc_id, pc_name,tem_name, table_header, table_data, create_by, create_time, update_by, update_time, remark from kh_khrw_result