年度预算旧数据显示与高亮对比数据不一致问题

src/main/java/com/liang/controller/PrjAnnualbudgetController.java

@@ -354,6 +354,44 @@ public class PrjAnnualbudgetController extends BaseController {
         }
         return res;
     }
+    /**
+     * 获取项目修改预算列表
+     *
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/list_xg/{nys}", method = RequestMethod.POST)
+    public Object xglist(@PathVariable Integer nys) {
+        List<PrjAnnualbudgetdetail> list = prjAnnualbudgetdetailService.getSptgZt(nys);
+        //获取已执行情况
+        List<PrjAnnualbudgetYzxqkVo> yzxqkVos = prjAnnualbudgetdetailDao.getYzxqk(nys);
+        //获取所有的年度预算
+        List<PrjAnnualbudgetdetail> allBudgetDetails = prjAnnualbudgetdetailService.listAllBudgetDetail(nys);
+        String res = "";
+        try {
+            List<Map<String, Object>> readValue = JsonTool.getObjectMapper().readValue(JsonTool.toJsonString(list), List.class);
+            if (!Tools.isEmpty(yzxqkVos)) {
+                yzxqkVos.forEach(yzxItem -> {
+                    readValue.stream().filter(item -> item.get("fymc").equals(yzxItem.getFymc())).forEach(item -> item.put("yzxqk" + yzxItem.getNf(), yzxItem.getBzje()));
+                });
+
+                Set<String> nf = yzxqkVos.stream().map(PrjAnnualbudgetYzxqkVo::getNf).collect(Collectors.toSet());
+                //后端对已执行情况的父级求和
+                sumYzxqk(readValue, nf, yzxqkVos.get(0).getXmlx());
+                nf.forEach(nfItem -> {
+                    readValue.stream().forEach(item -> {
+                        Double ysje = allBudgetDetails.stream().filter(allBudgetDetailItem -> allBudgetDetailItem.getFymc().equals(item.get("fymc")) && nfItem.equals(String.valueOf(allBudgetDetailItem.getNf()))).collect(Collectors.toList()).get(0).getYsje();
+
+                        item.put("yzxqk" + nfItem, (ysje == null ? 0 : ysje) + "(" + (item.get("yzxqk" + nfItem) == null ? 0 : item.get("yzxqk" + nfItem)) + ")");
+                    });
+                });
+            }
+            res = JsonTool.toJsonString(readValue);
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+        return res;
+    }
 
     public static void main(String[] args) {
         System.out.println(Math.floor(3.6799999999));

src/main/resources/templates/annualbudget/xgview_record.html

@@ -63,7 +63,7 @@
         //经费预算
         var dataBudget1 = new Array();
         $.ajax({
-            url: AjaxUtil.ctx + 'prjAnnualbudget/list/' + ysId,
+            url: AjaxUtil.ctx + 'prjAnnualbudget/list_xg/' + ysId,
             type: "post",
             async: false,
             dataType: "json",