From d463d7e59286f5cac971b548266e8c025f246576 Mon Sep 17 00:00:00 2001 From: hshansha Date: Mon, 14 Jul 2025 18:01:37 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B1=87=E6=80=BB=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=80=BB=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kaohe/controller/KhGatherController.java | 104 ++++++++++++------ 1 file changed, 70 insertions(+), 34 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 5b41527..f2de2bd 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 @@ -59,6 +59,7 @@ public class KhGatherController extends BaseController { // 将String转换为JSONObject JSONObject jsonObject = new JSONObject(json); String hz_name = jsonObject.getString("title"); + String pyhz_name = PinYinUtil.getPinyinInitials(hz_name); JSONArray datas = jsonObject.getJSONArray("data"); //拼接表头数据 JSONArray header = new JSONArray();//存放表头的最终数据 @@ -75,7 +76,7 @@ public class KhGatherController extends BaseController { newChildren.put(oldchild); } JSONObject zongfen = new JSONObject(); - zongfen.put("name",PinYinUtil.getPinyinInitials(hz_name)+"_zf"); + zongfen.put("name", pyhz_name +"_df"); zongfen.put("label","总分"); newChildren.put(zongfen); head.put("children", newChildren); @@ -83,15 +84,24 @@ public class KhGatherController extends BaseController { //获取并整合数据 JSONArray tabledata = new JSONArray((JSONArray) nodes.get("alldatas")); - JSONArray erjiTtitle_df = new JSONArray((JSONArray) nodes.get("title_df")); - tabledata.putAll(erjiTtitle_df); + JSONArray hz_df = new JSONArray((JSONArray) nodes.get("hz_df")); + for (Object zf : hz_df) { + JSONObject chulizf = (JSONObject) zf; + BigDecimal yijidf = chulizf.getBigDecimal(pyhz_name + "_df"); + JSONObject newDf = new JSONObject(); + newDf.put(pyhz_name + "_df", yijidf); + chulizf.put(pyhz_name,newDf); + chulizf.remove(pyhz_name+"_df"); + zf=chulizf; + } + tabledata.putAll(hz_df); //根据被考核对象名分组数据到map中 得到表格内容的最终数据 JSONArray endTableData = JsonDeepMerge.mergeByKey(tabledata, "khdx"); KhGather gather = new KhGather(); gather.setHzName(hz_name); - gather.setTableHeader(header.toString(2)); - gather.setTableData(endTableData.toString(2)); + gather.setTableHeader(header.toString()); + gather.setTableData(endTableData.toString()); khGatherService.insertKhGather(gather); return AjaxResult.success(); } @@ -107,7 +117,7 @@ public class KhGatherController extends BaseController { private Map parseJson(JSONArray datas, String titleP, BigDecimal z_zb) throws JsonProcessingException { Map result = new HashMap<>(); - JSONArray endtTitle_df = new JSONArray();//存储标题占比时的得分 + JSONArray hz_df = new JSONArray();//存储标题占比时的得分 JSONArray title_df = new JSONArray();//处理标题占比时的得分 String pyTitle = PinYinUtil.getPinyinInitials(titleP);//父级表头 JSONObject btKhdx = new JSONObject(true); //表头考核对象存储 @@ -129,7 +139,7 @@ public class KhGatherController extends BaseController { if (jobj.has("zb")) { zb = jobj.getBigDecimal("zb"); } - //如果有子集就遍历 + //如果是标题-------------------------------------------------------------- if (type.equals("0")) { JSONArray data2 = jobj.getJSONArray("data"); //递归获取下一级数据 @@ -152,7 +162,7 @@ public class KhGatherController extends BaseController { JSONArray alldatas1 = (JSONArray) childmap.get("alldatas"); JSONArray title_df1 = (JSONArray) childmap.get("title_df"); - /*if(title_df1==null){//代表它下面还是标题，没有数据 多级标题的 + if(title_df1==null){//代表它下面还是标题，没有数据 多级标题的 BigDecimal erjidf = BigDecimal.ZERO; JSONObject outsideTitle = new JSONObject(); JSONObject newDf = new JSONObject(); @@ -163,25 +173,43 @@ public class KhGatherController extends BaseController { newDf.put(erjiPyTitle + "_zsfs", erjizsfs); } outsideTitle.put(pyTitle,newDf); - title_df.put(outsideTitle); - }else{*/ - JSONArray title_df_cl = new JSONArray(JsonDeepMerge.jsonGroupSum(title_df1, "khdx", erjiPyTitle + "_df")); - //循环处理后的标题得分 加上层级及 占比、折算分数 - for (Object df : title_df_cl) { - JSONObject dfobj = (JSONObject) df; - BigDecimal erjidf = dfobj.getBigDecimal(erjiPyTitle + "_df"); - JSONObject newDf = new JSONObject(); - newDf.put(erjiPyTitle + "_df", erjidf); - if (zb != null) { //如果传递过来的标题占比不为null - BigDecimal erjizsfs = zb.multiply(erjidf); - newDf.put(erjiPyTitle + "_zb", zb); - newDf.put(erjiPyTitle + "_zsfs", erjizsfs); + title_df1.put(outsideTitle); + }else { + //循环处理后的标题得分 加上层级及 占比、折算分数 + for (Object df : title_df1) { + JSONObject dfobj = (JSONObject) df; + BigDecimal erjidf = dfobj.getBigDecimal(erjiPyTitle + "_df"); + JSONObject newDf = new JSONObject(); + newDf.put(erjiPyTitle + "_df", erjidf); + BigDecimal erjizsfs = BigDecimal.ZERO; + if (zb != null) { //如果标题占比不为null + erjizsfs= zb.multiply(erjidf); + newDf.put(erjiPyTitle + "_zb", zb); + newDf.put(erjiPyTitle + "_zsfs", erjizsfs); + } + + //存储最外层需要的得分数据 + if(z_zb==null){ //只有最外层标题没有占比 + JSONObject hzdf = new JSONObject(); + hzdf.put("khdx",dfobj.get("khdx")); + if(zb != null){ + hzdf.put(pyTitle + "_df", erjizsfs); + }else{ + hzdf.put(pyTitle + "_df", erjidf); + } + title_df.put(hzdf); + } + + + dfobj.remove(erjiPyTitle + "_df");//删除原来的数据项 + dfobj.put(pyTitle, newDf);//删除原来的数据项 + df = dfobj; } - dfobj.remove(erjiPyTitle + "_df");//删除原来的数据项 - dfobj.put(pyTitle, newDf);//删除原来的数据项 - df = dfobj; + + alldatas.putAll(title_df1); } - title_df=title_df_cl; + + //循环改变内部层级关系 for (Object tabledatum : alldatas1) { @@ -206,7 +234,9 @@ public class KhGatherController extends BaseController { if (khrw != null && khrw.size() > 0) { //----------组合表头数据--------- JSONArray tableHeader = new JSONArray(khrw.get(0).getTableHeader()); - btKhdx = tableHeader.getJSONObject(0);//下标0 单位/姓名 + if(z_zb==null){ //最外层总站比为null + btKhdx = tableHeader.getJSONObject(0);//下标0 单位/姓名 + } JSONObject head1 = tableHeader.getJSONObject(1); //整体数据 JSONObject head2 = tableHeader.getJSONObject(2);//得分 btchildren.put(head1); @@ -234,20 +264,19 @@ public class KhGatherController extends BaseController { BigDecimal zsfs = zb.multiply((BigDecimal) obj.get(pinyinKhrw + "_df")); erji.put(pinyinKhrw + "_zb", zb); erji.put(pinyinKhrw + "_zsfs", zsfs); - if (z_zb != null) {//代表上一级标题有占比 + + //获取上一级标题得分数组 JSONObject khdx = new JSONObject(); khdx.put("khdx", obj.get("khdx"));//存储当前考核对象名称 khdx.put(pyTitle + "_df", zsfs);//存储当前考核对象最后折算分数 title_df.put(khdx); - } - } else { - if (z_zb != null) {//代表上一级标题有占比 - title_df.put(obj.getJSONObject("khdx"));// + + } else { //当前考核任务无占比 上面只存储了得分 + //获取上一级标题得分数组 JSONObject khdx = new JSONObject(); khdx.put("khdx", obj.get("khdx"));//存储当前考核对象名称 - khdx.put(pyTitle + "_df", obj.get(pinyinKhrw + "_df"));///存储当前考核对象最后折算分数 + khdx.put(pyTitle + "_df", obj.get(pinyinKhrw + "_df"));///存储当前考核对象最后得分 title_df.put(khdx); - } } obj.remove(pinyinKhrw);//删除原来的数据项 obj.remove(pinyinKhrw + "_df");//删除原来的得分 @@ -259,13 +288,20 @@ public class KhGatherController extends BaseController { } } + title_df = new JSONArray(JsonDeepMerge.jsonGroupSum(title_df, "khdx", pyTitle + "_df")); + if(z_zb==null){ + hz_df.putAll(title_df); + } + + // title_df.putAll(title_df); btTitle.put("children", btchildren); result.put("head", btTitle); result.put("data", bd); result.put("alldatas", alldatas); - result.put("btKhdx", btKhdx); result.put("title_df", title_df); + result.put("btKhdx", btKhdx); + result.put("hz_df", hz_df); return result; } From 8ce8bc668fcab60968ebff37470fea83649e6ace Mon Sep 17 00:00:00 2001 From: hshansha Date: Tue, 15 Jul 2025 09:37:45 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A4=9A=E7=BA=A7=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E5=B5=8C=E5=A5=97=E6=95=B0=E6=8D=AE=E7=BA=A0=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kaohe/controller/KhGatherController.java | 76 ++++++++----------- 1 file changed, 32 insertions(+), 44 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 f2de2bd..20060cb 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 @@ -76,23 +76,23 @@ public class KhGatherController extends BaseController { newChildren.put(oldchild); } JSONObject zongfen = new JSONObject(); - zongfen.put("name", pyhz_name +"_df"); - zongfen.put("label","总分"); + zongfen.put("name", pyhz_name + "_df"); + zongfen.put("label", "总分"); newChildren.put(zongfen); head.put("children", newChildren); header.put(head); //获取并整合数据 JSONArray tabledata = new JSONArray((JSONArray) nodes.get("alldatas")); - JSONArray hz_df = new JSONArray((JSONArray) nodes.get("hz_df")); + JSONArray hz_df = new JSONArray((JSONArray) nodes.get("title_df")); for (Object zf : hz_df) { JSONObject chulizf = (JSONObject) zf; BigDecimal yijidf = chulizf.getBigDecimal(pyhz_name + "_df"); JSONObject newDf = new JSONObject(); newDf.put(pyhz_name + "_df", yijidf); - chulizf.put(pyhz_name,newDf); - chulizf.remove(pyhz_name+"_df"); - zf=chulizf; + chulizf.put(pyhz_name, newDf); + chulizf.remove(pyhz_name + "_df"); + zf = chulizf; } tabledata.putAll(hz_df); //根据被考核对象名分组数据到map中 得到表格内容的最终数据 @@ -139,7 +139,7 @@ public class KhGatherController extends BaseController { if (jobj.has("zb")) { zb = jobj.getBigDecimal("zb"); } - //如果是标题-------------------------------------------------------------- + //标题-------------------------------------------------------------- if (type.equals("0")) { JSONArray data2 = jobj.getJSONArray("data"); //递归获取下一级数据 @@ -162,19 +162,20 @@ public class KhGatherController extends BaseController { JSONArray alldatas1 = (JSONArray) childmap.get("alldatas"); JSONArray title_df1 = (JSONArray) childmap.get("title_df"); - if(title_df1==null){//代表它下面还是标题，没有数据 多级标题的 + btKhdx = (JSONObject) childmap.get("btKhdx"); + if (title_df1 == null) {//代表它下面还是标题，没有数据 多级标题的 BigDecimal erjidf = BigDecimal.ZERO; JSONObject outsideTitle = new JSONObject(); JSONObject newDf = new JSONObject(); - newDf.put(erjiPyTitle+"_df", erjidf); + newDf.put(erjiPyTitle + "_df", erjidf); if (z_zb != null) { //如果传递过来的标题占比不为null BigDecimal erjizsfs = z_zb.multiply(erjidf); newDf.put(erjiPyTitle + "_zb", z_zb); newDf.put(erjiPyTitle + "_zsfs", erjizsfs); } - outsideTitle.put(pyTitle,newDf); + outsideTitle.put(pyTitle, newDf); title_df1.put(outsideTitle); - }else { + } else { //循环处理后的标题得分 加上层级及 占比、折算分数 for (Object df : title_df1) { JSONObject dfobj = (JSONObject) df; @@ -183,34 +184,30 @@ public class KhGatherController extends BaseController { newDf.put(erjiPyTitle + "_df", erjidf); BigDecimal erjizsfs = BigDecimal.ZERO; if (zb != null) { //如果标题占比不为null - erjizsfs= zb.multiply(erjidf); + erjizsfs = zb.multiply(erjidf); newDf.put(erjiPyTitle + "_zb", zb); newDf.put(erjiPyTitle + "_zsfs", erjizsfs); } - //存储最外层需要的得分数据 - if(z_zb==null){ //只有最外层标题没有占比 - JSONObject hzdf = new JSONObject(); - hzdf.put("khdx",dfobj.get("khdx")); - if(zb != null){ - hzdf.put(pyTitle + "_df", erjizsfs); - }else{ - hzdf.put(pyTitle + "_df", erjidf); - } - title_df.put(hzdf); + //标题递归来得分数据按格式 //{"khdx":"",pyTitle _df:defen}存储到title_df中 + JSONObject hzdf = new JSONObject(); + hzdf.put("khdx", dfobj.get("khdx")); + if (zb != null) { + hzdf.put(pyTitle + "_df", erjizsfs); + } else { + hzdf.put(pyTitle + "_df", erjidf); } + title_df.put(hzdf); dfobj.remove(erjiPyTitle + "_df");//删除原来的数据项 dfobj.put(pyTitle, newDf);//删除原来的数据项 - df = dfobj; + df = dfobj;//更改df结构，添加外层主题嵌套 如：{"khdx":"",pyTitle:{erjiPyTitle_df:defen}} } - alldatas.putAll(title_df1); } - //循环改变内部层级关系 for (Object tabledatum : alldatas1) { JSONObject obj = (JSONObject) tabledatum; @@ -234,9 +231,7 @@ public class KhGatherController extends BaseController { if (khrw != null && khrw.size() > 0) { //----------组合表头数据--------- JSONArray tableHeader = new JSONArray(khrw.get(0).getTableHeader()); - if(z_zb==null){ //最外层总站比为null - btKhdx = tableHeader.getJSONObject(0);//下标0 单位/姓名 - } + btKhdx = tableHeader.getJSONObject(0);//下标0 单位/姓名 JSONObject head1 = tableHeader.getJSONObject(1); //整体数据 JSONObject head2 = tableHeader.getJSONObject(2);//得分 btchildren.put(head1); @@ -266,17 +261,17 @@ public class KhGatherController extends BaseController { erji.put(pinyinKhrw + "_zsfs", zsfs); //获取上一级标题得分数组 - JSONObject khdx = new JSONObject(); - khdx.put("khdx", obj.get("khdx"));//存储当前考核对象名称 - khdx.put(pyTitle + "_df", zsfs);//存储当前考核对象最后折算分数 - title_df.put(khdx); + JSONObject khdx = new JSONObject(); + khdx.put("khdx", obj.get("khdx"));//存储当前考核对象名称 + khdx.put(pyTitle + "_df", zsfs);//存储当前考核对象最后折算分数 + title_df.put(khdx); //{"khdx":"",pyTitle _df:defen} } else { //当前考核任务无占比 上面只存储了得分 - //获取上一级标题得分数组 - JSONObject khdx = new JSONObject(); - khdx.put("khdx", obj.get("khdx"));//存储当前考核对象名称 - khdx.put(pyTitle + "_df", obj.get(pinyinKhrw + "_df"));///存储当前考核对象最后得分 - title_df.put(khdx); + //获取上一级标题得分数组 + JSONObject khdx = new JSONObject(); + khdx.put("khdx", obj.get("khdx"));//存储当前考核对象名称 + khdx.put(pyTitle + "_df", obj.get(pinyinKhrw + "_df"));///存储当前考核对象最后得分 + title_df.put(khdx); //{"khdx":"",pyTitle _df:defen} } obj.remove(pinyinKhrw);//删除原来的数据项 obj.remove(pinyinKhrw + "_df");//删除原来的得分 @@ -287,21 +282,14 @@ public class KhGatherController extends BaseController { } } } - title_df = new JSONArray(JsonDeepMerge.jsonGroupSum(title_df, "khdx", pyTitle + "_df")); - if(z_zb==null){ - hz_df.putAll(title_df); - } - - // title_df.putAll(title_df); btTitle.put("children", btchildren); result.put("head", btTitle); result.put("data", bd); result.put("alldatas", alldatas); result.put("title_df", title_df); result.put("btKhdx", btKhdx); - result.put("hz_df", hz_df); return result; } From cb1b43963da2a463aa44ca1bb5d603d9bb946608 Mon Sep 17 00:00:00 2001 From: hshansha Date: Tue, 15 Jul 2025 10:47:57 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=83=E6=A0=B8=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/kaohe/util/JsonDeepMerge.java | 2 +- .../java/com/ruoyi/quartz/task/RyTask.java | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/util/JsonDeepMerge.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/util/JsonDeepMerge.java index 829506d..b486dd4 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/util/JsonDeepMerge.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/util/JsonDeepMerge.java @@ -64,7 +64,7 @@ public class JsonDeepMerge { public static String jsonGroupSum(JSONArray jsonInput,String groupKey,String sumKey) throws JsonProcessingException { ObjectMapper mapper = new ObjectMapper(); // 解析JSON数组为List - List> inputList = mapper.readValue(jsonInput.toString(2), List.class); + List> inputList = mapper.readValue(jsonInput.toString(), List.class); // 使用Map按khdx分组并累加值 Map sumMap = new HashMap<>(); diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java index 9749c3d..2517922 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java @@ -1,6 +1,8 @@ package com.ruoyi.quartz.task; +import com.ruoyi.kaohe.domain.KhPingce; import com.ruoyi.kaohe.domain.KhVote; +import com.ruoyi.kaohe.service.IKhPingceService; import com.ruoyi.kaohe.service.IKhVoteService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -19,11 +21,14 @@ public class RyTask { @Autowired private IKhVoteService khVoteService; + @Autowired + private IKhPingceService khPingceService; public void performTask() { System.out.println("进入定时任务-------------------------------------------------------------"); //获取所有未完成的评分任务 List list = khVoteService.selectUnfinishedVote(); + //根据时间自动修改评分任务状态 for (KhVote vote : list) { Date sTime = vote.getsTime(); Date eTime = vote.geteTime(); @@ -42,6 +47,27 @@ public class RyTask System.out.println("执行定时任务: " + System.currentTimeMillis() + " 修改评分任务： " + vote.getVoteTitle() + " 状态为已完成"); } } + + //修改考核任务状态，当考核任务下的所有评分任务状态为已完成时 考核任务状态进行中修改为已完成 + KhPingce param = new KhPingce(); + param.setState("1"); + List khPingces = khPingceService.selectKhPingceList(param); + for (KhPingce khPingce : khPingces) { + KhVote vote = new KhVote(); + vote.setPingceId(khPingce.getId()); + List khVotes = khVoteService.selectKhVoteList(vote); + boolean finished = true; + for (KhVote khVote : khVotes) { + if( khVote.getState().equals("0")|| khVote.getState().equals("1")){ + finished=false; + break; + } + } + if(finished){ + khPingce.setState("2"); + } + } + } public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) From 47a06da2f1acad510b0b74267fbcb946049eeab8 Mon Sep 17 00:00:00 2001 From: hshansha Date: Tue, 15 Jul 2025 11:01:47 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=82=A8=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java index eec1faf..1ba10cd 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java @@ -92,7 +92,7 @@ public abstract class AbstractQuartzJob implements Job } // 写入数据库当中 - SpringUtils.getBean(ISysJobLogService.class).addJobLog(sysJobLog); + // SpringUtils.getBean(ISysJobLogService.class).addJobLog(sysJobLog); } /** From c4771b193a9e44ce841a714e499abf640eb30089 Mon Sep 17 00:00:00 2001 From: hshansha Date: Tue, 15 Jul 2025 11:27:44 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=80=83=E6=A0=B8=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=B8=8E=E7=94=9F=E6=88=90=E6=B1=87=E6=80=BB=E5=80=92=E5=BA=8F?= =?UTF-8?q?=E6=8E=92=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-kaohe/src/main/resources/mapper/kaohe/KhGatherMapper.xml | 1 + ruoyi-kaohe/src/main/resources/mapper/kaohe/KhPingceMapper.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhGatherMapper.xml b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhGatherMapper.xml index 568c451..590bc19 100644 --- a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhGatherMapper.xml +++ b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhGatherMapper.xml @@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and table_header = #{tableHeader} and table_data = #{tableData} + ORDER BY id DESC - /*select p.*, emp_id,emp_name,dept_id,dept_name from kh_pingce p left join kh_pc_emp pe on p.id=pe.pc_id*/ and pc_title = #{pcTitle} and pc_description = #{pcDescription} @@ -49,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and pc_result_id = #{pcResultId} and state = #{state} + ORDER BY id DESC