1

mjava-zhixingtongde/src/main/java/com/malk/zhixingtongde/service/impl/ZxtdReportServiceImpl.java

@@ -842,10 +842,14 @@ public class ZxtdReportServiceImpl implements ZxtdReportService {
         //月末时货币资金金额
         String monthAmt1 = initialAmt1;
 
-        //获取当前月份
-        int month1 = DateUtil.month(new Date());
+        //若为当年则获取当前月份
+        int month1 = 13;
+        if(DateUtil.year(new Date()) == Integer.parseInt(year)){
+            month1 = DateUtil.month(new Date()) + 2;
+        }
+
 
-        for (int i = 1; i < month1 + 2; i++) {
+        for (int i = 1; i < month1; i++) {
             monthAmt1 = NumberUtil.add(monthAmt1,ReflectUtil.invoke(accounts1,"getAmt"+i)).setScale(2,BigDecimal.ROUND_HALF_UP).toString();
             ReflectUtil.invoke(accounts1, "setAmt"+i, monthAmt1);
         }
@@ -1022,7 +1026,7 @@ public class ZxtdReportServiceImpl implements ZxtdReportService {
         accounts15.setInitialAmt("4567803.2");
         String monthAmt15 = "4567803.2";
         if (Objects.nonNull(remainNetMap)){
-            for (int i = 1; i < month1 + 2; i++) {
+            for (int i = 1; i < month1; i++) {
                 monthAmt15 = NumberUtil.add(monthAmt15, String.valueOf(remainNetMap.get("remainNet" + i))).toString();
                 ReflectUtil.invoke(accounts15, "setAmt"+i, monthAmt15);
             }
@@ -1269,7 +1273,7 @@ public class ZxtdReportServiceImpl implements ZxtdReportService {
                     cash.setLastAmt2(NumberUtil.add(cash.getLastAmt2(),formData.get("numberField_lp8278sd").toString()).setScale(2,RoundingMode.HALF_UP).toString());
                 }
                 //收到其他与经营活动有关的现金
-                if (ArrayUtil.contains(new String[]{"存款利息","代付工资款"}, subject)){
+                if (ArrayUtil.contains(new String[]{"代付工资款"}, subject)){
                     cash.setLastAmt3(NumberUtil.add(cash.getLastAmt3(),formData.get("numberField_lp8278sd").toString()).setScale(2,RoundingMode.HALF_UP).toString());
                 }
                 //吸收投资收到的现金
@@ -1447,7 +1451,7 @@ public class ZxtdReportServiceImpl implements ZxtdReportService {
                     cash.setLastAmt2(NumberUtil.add(cash.getLastAmt2(),amt).setScale(2,RoundingMode.HALF_UP).toString());
                 }
                 //收到其他与经营活动有关的现金
-                if (ArrayUtil.contains(new String[]{"存款利息","代付工资款"}, subject)){
+                if (ArrayUtil.contains(new String[]{"代付工资款"}, subject)){
                     cash.setLastAmt3(NumberUtil.add(cash.getLastAmt3(),amt).setScale(2,RoundingMode.HALF_UP).toString());
                 }
                 //吸收投资收到的现金