多级标题嵌套数据纠正

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

@@ -84,7 +84,7 @@ public class KhGatherController extends BaseController {
 
         //获取并整合数据
         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");
@@ -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,6 +162,7 @@ public class KhGatherController extends BaseController {
 
                 JSONArray alldatas1 = (JSONArray) childmap.get("alldatas");
                 JSONArray title_df1 = (JSONArray) childmap.get("title_df");
+                btKhdx = (JSONObject) childmap.get("btKhdx");
                 if (title_df1 == null) {//代表它下面还是标题，没有数据   多级标题的
                     BigDecimal erjidf = BigDecimal.ZERO;
                     JSONObject outsideTitle = new JSONObject();
@@ -188,8 +189,7 @@ public class KhGatherController extends BaseController {
                             newDf.put(erjiPyTitle + "_zsfs", erjizsfs);
                         }
 
-                        //存储最外层需要的得分数据
-                        if(z_zb==null){   //只有最外层标题没有占比
+                        //标题递归来得分数据按格式 //{"khdx":"",pyTitle _df:defen}存储到title_df中
                         JSONObject hzdf = new JSONObject();
                         hzdf.put("khdx", dfobj.get("khdx"));
                         if (zb != null) {
@@ -198,19 +198,16 @@ public class KhGatherController extends BaseController {
                             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 单位/姓名
-                    }
                     JSONObject head1 = tableHeader.getJSONObject(1); //整体数据
                     JSONObject head2 = tableHeader.getJSONObject(2);//得分
                     btchildren.put(head1);
@@ -269,14 +264,14 @@ public class KhGatherController extends BaseController {
                             JSONObject khdx = new JSONObject();
                             khdx.put("khdx", obj.get("khdx"));//存储当前考核对象名称
                             khdx.put(pyTitle + "_df", zsfs);//存储当前考核对象最后折算分数
-                                title_df.put(khdx);
+                            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);
+                            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;
     }