1

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

@@ -1584,9 +1584,13 @@ public class ZxtdReportServiceImpl implements ZxtdReportService {
         if (!lastProfitDataList.isEmpty()){
             for (Map lastProfitData : lastProfitDataList) {
                 Map formData = (Map) lastProfitData.get("formData");
-                //净利润
-                cash.setLastAmt1(NumberUtil.add(cash.getLastAmt1(), formData.get("numberField_lqqhf8yn").toString()).setScale(2,RoundingMode.HALF_UP).toString());
-            }
+                String type = formData.get("textField_lqvp89bt").toString();
+                if (type.equals("收入")){
+                    //净利润
+                    cash.setLastAmt1(NumberUtil.add(cash.getLastAmt1(), formData.get("numberField_lqqhf8yn").toString()).setScale(2,RoundingMode.HALF_UP).toString());
+                }else {
+                    cash.setLastAmt1(NumberUtil.sub(cash.getLastAmt1(), formData.get("numberField_lqqhf8yn").toString()).setScale(2,RoundingMode.HALF_UP).toString());
+                }}
         }
         String month = year2.substring(6);
         if (month.substring(0,1).equals("0")){
@@ -2527,7 +2531,7 @@ public class ZxtdReportServiceImpl implements ZxtdReportService {
                             amt = NumberUtil.sub(Objects.isNull(detail.get("numberField_lqyx5k0q")) ? "0.00" : detail.get("numberField_lqyx5k0q").toString()
                                             , Objects.isNull(detail.get("numberField_lqyx5k0o")) ? "0.00" : detail.get("numberField_lqyx5k0o").toString())
                                     .setScale(2, RoundingMode.HALF_UP).toString();
-                            cash.setLastAmt7(NumberUtil.add(cash.getAmt7(), amt).setScale(2,RoundingMode.HALF_UP).toString());
+                            cash.setLastAmt7(NumberUtil.add(cash.getLastAmt7(), amt).setScale(2,RoundingMode.HALF_UP).toString());
                             break;
                         case "2":
                             amt = NumberUtil.sub(Objects.isNull(detail.get("numberField_lqyx5k0r")) ? "0.00" : detail.get("numberField_lqyx5k0r").toString()
@@ -2893,7 +2897,7 @@ public class ZxtdReportServiceImpl implements ZxtdReportService {
 
         //获取资产负债表 去年同期货币资金
         String initialAmt2 = "3061971.92";
-        if (DateUtil.year(new Date()) == 2024){
+        if (year.substring(4).equals("2024")){
             initialAmt2 = "0.00";
         }
         String monthAmt2 = "0.00";
@@ -2925,12 +2929,12 @@ public class ZxtdReportServiceImpl implements ZxtdReportService {
                 if (Objects.nonNull(formData.get("textField_lxl8322m"))){
                     if (formData.get("selectField_lxl8322i").equals("收入")){
                         initialAmt2 = NumberUtil.add(initialAmt2,getBigDecimalStringAmt(formData.get("numberField_lxl8322n"))).toString();
-                        if (formData.get("textField_lxl8322m").toString().equals(year2)){
+                        if (formData.get("textField_lxl8322m").toString().equals(lastYear2)){
                             monthAmt2 = NumberUtil.add(monthAmt2,getBigDecimalStringAmt(formData.get("numberField_lxl8322n"))).toString();
                         }
                     }else {
                         initialAmt2 = NumberUtil.sub(initialAmt2,getBigDecimalStringAmt(formData.get("numberField_lxl8322n"))).toString();
-                        if (formData.get("textField_lxl8322m").toString().equals(year2)){
+                        if (formData.get("textField_lxl8322m").toString().equals(lastYear2)){
                             monthAmt2 = NumberUtil.sub(monthAmt2,getBigDecimalStringAmt(formData.get("numberField_lxl8322n"))).toString();
                         }
                     }