ソースを参照

统计分析-- 项目数量分析、预算金额,月度 环比 同比计算

sunhh 2 年 前
コミット
e6000fc0f1

+ 22 - 0
purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -2905,15 +2905,37 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             if (!"0".equals(evaluationSumOld10)) {
                 yearonyearAmount10 = (evaluationSum1010.subtract(evaluationSumOld1010)).divide(evaluationSumOld44).multiply(new BigDecimal("100"));
             }
+            if (!"0".equals(evaluationSumOld11)) {
+                yearonyearAmount11 = (evaluationSum1111.subtract(evaluationSumOld1111)).divide(evaluationSumOld44).multiply(new BigDecimal("100"));
+            }
+            if (!"0".equals(evaluationSumOld12)) {
+                yearonyearAmount12 = (evaluationSum1212.subtract(evaluationSumOld1212)).divide(evaluationSumOld44).multiply(new BigDecimal("100"));
+            }
             map1.put("yearonyearAmount", yearonyearAmount1.toString());
             map2.put("yearonyearAmount", yearonyearAmount2.toString());
             map3.put("yearonyearAmount", yearonyearAmount3.toString());
             map4.put("yearonyearAmount", yearonyearAmount4.toString());
+            map5.put("yearonyearAmount", yearonyearAmount5.toString());
+            map6.put("yearonyearAmount", yearonyearAmount6.toString());
+            map7.put("yearonyearAmount", yearonyearAmount7.toString());
+            map8.put("yearonyearAmount", yearonyearAmount8.toString());
+            map9.put("yearonyearAmount", yearonyearAmount9.toString());
+            map10.put("yearonyearAmount", yearonyearAmount10.toString());
+            map11.put("yearonyearAmount", yearonyearAmount11.toString());
+            map12.put("yearonyearAmount", yearonyearAmount12.toString());
             // 存入集合
             mapReturn.add(map1);
             mapReturn.add(map2);
             mapReturn.add(map3);
             mapReturn.add(map4);
+            mapReturn.add(map5);
+            mapReturn.add(map6);
+            mapReturn.add(map7);
+            mapReturn.add(map8);
+            mapReturn.add(map9);
+            mapReturn.add(map10);
+            mapReturn.add(map11);
+            mapReturn.add(map12);
         }
         return mapReturn;
     }