diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhKhrwResultController.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhKhrwResultController.java index 2f344b5..2ec83db 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhKhrwResultController.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhKhrwResultController.java @@ -59,11 +59,11 @@ public class KhKhrwResultController extends BaseController { return AjaxResult.error("该考核任务已有生成结果!"); } - JSONArray header = new JSONArray();//存放表头及表格关联数据 + /* JSONArray header = new JSONArray();//存放表头及表格关联数据 JSONObject headerData = new JSONObject(); headerData.put("name", null); - headerData.put("label", pc.getPcTitle()); - List children = new ArrayList<>(); + headerData.put("label", pc.getPcTitle());*/ + JSONArray children = new JSONArray(); JSONObject tableColumn = new JSONObject(); tableColumn.put("name", "khdx"); if (pc.getBkhdxType().equals("0")) { @@ -92,8 +92,6 @@ public class KhKhrwResultController extends BaseController { khVoteEmp.setVoteId(vote.getId()); //查询该评分任务对应的所有被考核对象详情 List khVoteEmps = voteEmpService.selectKhVoteEmpList(khVoteEmp); - - // votesMap.put(vote.getVoteTitle(),khVoteEmps); lists.addAll(khVoteEmps); } //根据被考核对象名分组数据到map中 @@ -119,9 +117,7 @@ public class KhKhrwResultController extends BaseController { Integer index2 = 0; for (KhVoteEmp voteEmp : value) { index2++; - // String pyVoteTitle = PinYinUtil.getPinyinInitials(voteEmp.getVoteTitle()); JSONObject tabledata = new JSONObject(); - // tabledata.put("name", pyVoteTitle); tabledata.put("name", "khx"+index2); tabledata.put("label", voteEmp.getVoteTitle()); @@ -135,7 +131,6 @@ public class KhKhrwResultController extends BaseController { xxpf.setOptionD(voteEmp.getOptionD()); xxpf.setAvgScore(voteEmp.getAvgScore()); xxpf.setPercentage(voteEmp.getPercentage()); - // votesDatas.put(pyVoteTitle, xxpf); votesDatas.put("khx"+index2, xxpf); sumScore = sumScore.add(voteEmp.getEndScore()); if (index1 == 1) { @@ -168,15 +163,12 @@ public class KhKhrwResultController extends BaseController { children2.add(tabledata); } } else if (voteEmp.getKhitemTypeid().equals(2L)) {//评分占比 - //votesDatas.put(pyVoteTitle, voteEmp.getAvgScore()); votesDatas.put("khx"+index2, voteEmp.getAvgScore()); - // votesDatas.put(pyVoteTitle+"_zb", voteEmp.getPercentage()); votesDatas.put("khx"+index2+"_zb", voteEmp.getPercentage()); sumScore = sumScore.add(voteEmp.getEndScore()); if (index1 == 1) { JSONObject tabledata2 = new JSONObject(); - // tabledata2.put("name", pyVoteTitle + "_zb"); tabledata2.put("name", "khx"+index2 + "_zb"); tabledata2.put("label", "占比"); children2.add(tabledata); @@ -184,7 +176,6 @@ public class KhKhrwResultController extends BaseController { } } else {//单独评分 if (index1 == 1) { - // votesDatas.put(pyVoteTitle, voteEmp.getAvgScore()); votesDatas.put("khx"+index2, voteEmp.getAvgScore()); children2.add(tabledata); } @@ -205,14 +196,13 @@ public class KhKhrwResultController extends BaseController { tableColumn3.put("name", "df"); tableColumn3.put("label", "得分"); children.add(tableColumn3); - headerData.put("children", children); - header.add(headerData); - + //headerData.put("children", children); + //header.add(children); KhKhrwResult pcResult = new KhKhrwResult(); pcResult.setPcId(pc.getId()); pcResult.setPcName(pc.getPcTitle()); - pcResult.setTableHeader(header.toJSONString()); + pcResult.setTableHeader(children.toJSONString()); pcResult.setTableData(endData.toJSONString()); khKhrwResultService.insertKhKhrwResult(pcResult); return AjaxResult.success();