知行同德v3.0

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

@@ -480,8 +480,6 @@ public class ZxtdReportServiceImpl implements ZxtdReportService {
 
         String dateParam = getYearParam(year);
 
-        String lastYear = NumberUtil.sub(year.substring(0, 4), "1").toString();
-
         //今年之前所有收入
         List<Map> lastIncomeJsonString = new ArrayList<>();
         lastIncomeJsonString.add(UtilMap.map("key, value, type, operator, componentName", "textField_lqvp25z0",year,"TEXT","lt","TextField"));
@@ -500,51 +498,12 @@ public class ZxtdReportServiceImpl implements ZxtdReportService {
 
         String initialAmt1 = "3061971.92";
 
-        String initialAmt2 = "0.00";
-        String initialAmt3 = "2910791.18";
-        String initialAmt4 = "135407.11";
-        String initialAmt5 = "15185.31";
-        String initialAmt6 = "247.13";
-        String initialAmt7 = "107.55";
-        String initialAmt8 = "183.46";
-        String initialAmt9 = "50.18";
-
         if (!lastIncomeList.isEmpty()){
             for (Map lastIncome : lastIncomeList) {
                 Map formData = (Map) lastIncome.get("formData");
                 if (Objects.nonNull(formData.get("textField_lqvp25z0"))){
                     initialAmt1 = NumberUtil.add(initialAmt1,getBigDecimalStringAmt(formData.get("numberField_lp8278sd"))).toString();
                 }
-                if (Objects.nonNull(formData.get("selectField_lqga7tw0"))){
-                    switch(formData.get("selectField_lqga7tw0").toString()){
-                        case "对公现金（知行信息）":
-                            initialAmt2 = NumberUtil.add(initialAmt2, getBigDecimalStringAmt(formData.get("numberField_lp8278sd"))).toString();
-                            break;
-                        case "北京知行工商银行（基本户）":
-                            initialAmt3 = NumberUtil.add(initialAmt3, getBigDecimalStringAmt(formData.get("numberField_lp8278sd"))).toString();
-                            break;
-                        case "北京云享工商银行（基本户）":
-                            initialAmt4 = NumberUtil.add(initialAmt4, getBigDecimalStringAmt(formData.get("numberField_lp8278sd"))).toString();
-                            break;
-                        case "北京鹏程建设银行（基本户）":
-                            initialAmt5 = NumberUtil.add(initialAmt5, getBigDecimalStringAmt(formData.get("numberField_lp8278sd"))).toString();
-                            break;
-                        case "上海丽棱上海农商银行（基本户）":
-                            initialAmt6 = NumberUtil.add(initialAmt6, getBigDecimalStringAmt(formData.get("numberField_lp8278sd"))).toString();
-                            break;
-                        case "个人户（丽）":
-                            initialAmt7 = NumberUtil.add(initialAmt7, getBigDecimalStringAmt(formData.get("numberField_lp8278sd"))).toString();
-                            break;
-                        case "北京知行平安银行（一般户）":
-                            initialAmt8 = NumberUtil.add(initialAmt8, getBigDecimalStringAmt(formData.get("numberField_lp8278sd"))).toString();
-                            break;
-                        case "北京知行招商银行（一般户）":
-                            initialAmt9 = NumberUtil.add(initialAmt9, getBigDecimalStringAmt(formData.get("numberField_lp8278sd"))).toString();
-                            break;
-                        default:
-                            break;
-                    }
-                }
             }
         }
 
@@ -560,53 +519,9 @@ public class ZxtdReportServiceImpl implements ZxtdReportService {
                     if (Objects.nonNull(accounts) && !accounts.isEmpty()){
                         account = accounts.get(0);
                     }
-                    switch(account) {
-                        case "对公现金（知行信息）":
-                            initialAmt2 = NumberUtil.sub(initialAmt2, getBigDecimalStringAmt(formData.get("numberField_lp8278sd"))).toString();
-                            break;
-                        case "北京知行工商银行（基本户）":
-                            initialAmt3 = NumberUtil.sub(initialAmt3, getBigDecimalStringAmt(formData.get("numberField_lp8278sd"))).toString();
-                            break;
-                        case "北京云享工商银行（基本户）":
-                            initialAmt4 = NumberUtil.sub(initialAmt4, getBigDecimalStringAmt(formData.get("numberField_lp8278sd"))).toString();
-                            break;
-                        case "北京鹏程建设银行（基本户）":
-                            initialAmt5 = NumberUtil.sub(initialAmt5, getBigDecimalStringAmt(formData.get("numberField_lp8278sd"))).toString();
-                            break;
-                        case "上海丽棱上海农商银行（基本户）":
-                            initialAmt6 = NumberUtil.sub(initialAmt6, getBigDecimalStringAmt(formData.get("numberField_lp8278sd"))).toString();
-                            break;
-                        case "个人户（丽）":
-                            initialAmt7 = NumberUtil.sub(initialAmt7, getBigDecimalStringAmt(formData.get("numberField_lp8278sd"))).toString();
-                            break;
-                        case "北京知行平安银行（一般户）":
-                            initialAmt8 = NumberUtil.sub(initialAmt8, getBigDecimalStringAmt(formData.get("numberField_lp8278sd"))).toString();
-                            break;
-                        case "北京知行招商银行（一般户）":
-                            initialAmt9 = NumberUtil.sub(initialAmt9, getBigDecimalStringAmt(formData.get("numberField_lp8278sd"))).toString();
-                            break;
-                        default:
-                            break;
-                    }
                 }
             }
         }
-        //对公现金（知行信息）
-        Accounts accounts2 = new Accounts(initialAmt2);
-        //工商银行（知行信息基本户）
-        Accounts accounts3 = new Accounts(initialAmt3);
-        //工商银行（云享互安基本户）
-        Accounts accounts4 = new Accounts(initialAmt4);
-        //建设银行（北京鹏程基本户）
-        Accounts accounts5 = new Accounts(initialAmt5);
-        //上海农商（丽棱基本户）
-        Accounts accounts6 = new Accounts(initialAmt6);
-        //招商银行（丽棱王丽）
-        Accounts accounts7 = new Accounts(initialAmt7);
-        //平安银行（知行信息一般户）
-        Accounts accounts8 = new Accounts(initialAmt8);
-        //招商银行（知行信息一般户）
-        Accounts accounts9 = new Accounts(initialAmt9);
 
         //查询收入明细表
         List<Map> incomeJsonString = new ArrayList<>();
@@ -651,34 +566,6 @@ public class ZxtdReportServiceImpl implements ZxtdReportService {
                     String month = formData.get("textField_lqvp25z0").toString().substring(5);
                     String amt = getBigDecimalStringAmt(formData.get("numberField_lp8278sd"));
                     ReflectUtil.invoke(accounts1, "setAmt"+month, NumberUtil.add(amt,ReflectUtil.invoke(accounts1,"getAmt"+month)).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
-                    switch(formData.get("selectField_lqga7tw0").toString()){
-                        case "对公现金（知行信息）":
-                            ReflectUtil.invoke(accounts2, "setAmt"+month, NumberUtil.add(amt,ReflectUtil.invoke(accounts2,"getAmt"+month)).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
-                            break;
-                        case "北京知行工商银行（基本户）":
-                            ReflectUtil.invoke(accounts3, "setAmt"+month, NumberUtil.add(amt,ReflectUtil.invoke(accounts3,"getAmt"+month)).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
-                            break;
-                        case "北京云享工商银行（基本户）":
-                            ReflectUtil.invoke(accounts4, "setAmt"+month, NumberUtil.add(amt,ReflectUtil.invoke(accounts4,"getAmt"+month)).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
-                            break;
-                        case "北京鹏程建设银行（基本户）":
-                            ReflectUtil.invoke(accounts5, "setAmt"+month, NumberUtil.add(amt,ReflectUtil.invoke(accounts5,"getAmt"+month)).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
-                            break;
-                        case "上海丽棱上海农商银行（基本户）":
-                            ReflectUtil.invoke(accounts6, "setAmt"+month, NumberUtil.add(amt,ReflectUtil.invoke(accounts6,"getAmt"+month)).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
-                            break;
-                        case "个人户（丽）":
-                            ReflectUtil.invoke(accounts7, "setAmt"+month, NumberUtil.add(amt,ReflectUtil.invoke(accounts7,"getAmt"+month)).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
-                            break;
-                        case "北京知行平安银行（一般户）":
-                            ReflectUtil.invoke(accounts8, "setAmt"+month, NumberUtil.add(amt,ReflectUtil.invoke(accounts8,"getAmt"+month)).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
-                            break;
-                        case "北京知行招商银行（一般户）":
-                            ReflectUtil.invoke(accounts9, "setAmt"+month, NumberUtil.add(amt,ReflectUtil.invoke(accounts9,"getAmt"+month)).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
-                            break;
-                        default:
-                            break;
-                    }
                 }
             }
         }
@@ -695,34 +582,6 @@ public class ZxtdReportServiceImpl implements ZxtdReportService {
                     if (Objects.nonNull(accounts) && !accounts.isEmpty()){
                         account = accounts.get(0);
                     }
-                    switch(account){
-                        case "对公现金（知行信息）":
-                            ReflectUtil.invoke(accounts2, "setAmt"+month, NumberUtil.sub(ReflectUtil.invoke(accounts2,"getAmt"+month),amt).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
-                            break;
-                        case "北京知行工商银行（基本户）":
-                            ReflectUtil.invoke(accounts3, "setAmt"+month, NumberUtil.sub(ReflectUtil.invoke(accounts3,"getAmt"+month),amt).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
-                            break;
-                        case "北京云享工商银行（基本户）":
-                            ReflectUtil.invoke(accounts4, "setAmt"+month,NumberUtil.sub(ReflectUtil.invoke(accounts4, "getAmt"+month),amt).setScale(2, BigDecimal.ROUND_HALF_UP).toString());
-                            break;
-                        case "北京鹏程建设银行（基本户）":
-                            ReflectUtil.invoke(accounts5, "setAmt"+month, NumberUtil.sub(ReflectUtil.invoke(accounts5,"getAmt"+month),amt).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
-                            break;
-                        case "上海丽棱上海农商银行（基本户）":
-                            ReflectUtil.invoke(accounts6, "setAmt"+month, NumberUtil.sub(ReflectUtil.invoke(accounts6,"getAmt"+month),amt).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
-                            break;
-                        case "个人户（丽）":
-                            ReflectUtil.invoke(accounts7, "setAmt"+month, NumberUtil.sub(ReflectUtil.invoke(accounts7,"getAmt"+month),amt).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
-                            break;
-                        case "北京知行平安银行（一般户）":
-                            ReflectUtil.invoke(accounts8, "setAmt"+month, NumberUtil.sub(ReflectUtil.invoke(accounts8,"getAmt"+month),amt).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
-                            break;
-                        case "北京知行招商银行（一般户）":
-                            ReflectUtil.invoke(accounts9, "setAmt"+month, NumberUtil.sub(ReflectUtil.invoke(accounts9,"getAmt"+month),amt).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
-                            break;
-                        default:
-                            break;
-                    }
                 }
             }
         }
@@ -730,39 +589,18 @@ public class ZxtdReportServiceImpl implements ZxtdReportService {
 
         //月末时货币资金金额
         String monthAmt1 = initialAmt1;
-        String monthAmt2 = initialAmt2;
-        String monthAmt3 = initialAmt3;
-        String monthAmt4 = initialAmt4;
-        String monthAmt5 = initialAmt5;
-        String monthAmt6 = initialAmt6;
-        String monthAmt7 = initialAmt7;
-        String monthAmt8 = initialAmt8;
-        String monthAmt9 = initialAmt9;
-        for (int i = 1; i < 13; i++) {
-            monthAmt1 = NumberUtil.add(monthAmt1,ReflectUtil.invoke(accounts1,"getAmt"+i)).setScale(2,BigDecimal.ROUND_HALF_UP).toString();
-            monthAmt2 = NumberUtil.add(monthAmt2,ReflectUtil.invoke(accounts2,"getAmt"+i)).setScale(2,BigDecimal.ROUND_HALF_UP).toString();
-            monthAmt3 = NumberUtil.add(monthAmt3,ReflectUtil.invoke(accounts3,"getAmt"+i)).setScale(2,BigDecimal.ROUND_HALF_UP).toString();
-            monthAmt4 = NumberUtil.add(monthAmt4,ReflectUtil.invoke(accounts4,"getAmt"+i)).setScale(2,BigDecimal.ROUND_HALF_UP).toString();
-            monthAmt5 = NumberUtil.add(monthAmt5,ReflectUtil.invoke(accounts5,"getAmt"+i)).setScale(2,BigDecimal.ROUND_HALF_UP).toString();
-            monthAmt6 = NumberUtil.add(monthAmt6,ReflectUtil.invoke(accounts6,"getAmt"+i)).setScale(2,BigDecimal.ROUND_HALF_UP).toString();
-            monthAmt7 = NumberUtil.add(monthAmt7,ReflectUtil.invoke(accounts7,"getAmt"+i)).setScale(2,BigDecimal.ROUND_HALF_UP).toString();
-            monthAmt8 = NumberUtil.add(monthAmt8,ReflectUtil.invoke(accounts8,"getAmt"+i)).setScale(2,BigDecimal.ROUND_HALF_UP).toString();
-            monthAmt9 = NumberUtil.add(monthAmt9,ReflectUtil.invoke(accounts9,"getAmt"+i)).setScale(2,BigDecimal.ROUND_HALF_UP).toString();
 
+        //获取当前月份
+        int month1 = DateUtil.month(new Date());
+
+        for (int i = 1; i < month1 + 2; i++) {
+            monthAmt1 = NumberUtil.add(monthAmt1,ReflectUtil.invoke(accounts1,"getAmt"+i)).setScale(2,BigDecimal.ROUND_HALF_UP).toString();
             ReflectUtil.invoke(accounts1, "setAmt"+i, monthAmt1);
-            ReflectUtil.invoke(accounts2, "setAmt"+i, monthAmt2);
-            ReflectUtil.invoke(accounts3, "setAmt"+i, monthAmt3);
-            ReflectUtil.invoke(accounts4, "setAmt"+i, monthAmt4);
-            ReflectUtil.invoke(accounts5, "setAmt"+i, monthAmt5);
-            ReflectUtil.invoke(accounts6, "setAmt"+i, monthAmt6);
-            ReflectUtil.invoke(accounts7, "setAmt"+i, monthAmt7);
-            ReflectUtil.invoke(accounts8, "setAmt"+i, monthAmt8);
-            ReflectUtil.invoke(accounts9, "setAmt"+i, monthAmt9);
-        }
+       }
 
 
         //应收账款
-        Accounts accounts11 = new Accounts();
+        Accounts accounts3 = new Accounts();
 
         if (!receivableList.isEmpty()){
             for (Map receivable : receivableList) {
@@ -785,14 +623,14 @@ public class ZxtdReportServiceImpl implements ZxtdReportService {
                         accounts.setAmt11(getBigDecimalStringAmt(receivableDetail.get("numberField_lqyx5k10")));
                         accounts.setAmt12(getBigDecimalStringAmt(receivableDetail.get("numberField_lqyx5k11")));
 
-                        accounts11.add(accounts);
+                        accounts3.add(accounts);
                     }
                 }
             }
         }
 
         //其他应收款
-        Accounts accounts10 = new Accounts();
+        Accounts accounts2 = new Accounts();
 
         if (!otherReceivableList.isEmpty()){
             for (Map otherReceivable : otherReceivableList) {
@@ -815,14 +653,14 @@ public class ZxtdReportServiceImpl implements ZxtdReportService {
                         accounts.setAmt11(getBigDecimalStringAmt(otherReceivableDetail.get("numberField_lqyx5k10")));
                         accounts.setAmt12(getBigDecimalStringAmt(otherReceivableDetail.get("numberField_lqyx5k11")));
 
-                        accounts10.add(accounts);
+                        accounts2.add(accounts);
                     }
                 }
             }
         }
 
         //应付账款
-        Accounts accounts20 = new Accounts();
+        Accounts accounts12 = new Accounts();
 
         if (!payableList.isEmpty()){
             for (Map payable : payableList) {
@@ -845,14 +683,14 @@ public class ZxtdReportServiceImpl implements ZxtdReportService {
                         accounts.setAmt11(getBigDecimalStringAmt(payableDetail.get("numberField_lqyx5k10")));
                         accounts.setAmt12(getBigDecimalStringAmt(payableDetail.get("numberField_lqyx5k11")));
 
-                        accounts20.add(accounts);
+                        accounts12.add(accounts);
                     }
                 }
             }
         }
 
         //其他应付款
-        Accounts accounts18 = new Accounts();
+        Accounts accounts10 = new Accounts();
 
         if (!otherPayableList.isEmpty()){
             for (Map otherPayable : otherPayableList) {
@@ -875,39 +713,31 @@ public class ZxtdReportServiceImpl implements ZxtdReportService {
                         accounts.setAmt11(getBigDecimalStringAmt(otherPayableDetail.get("numberField_lqyx5k10")));
                         accounts.setAmt12(getBigDecimalStringAmt(otherPayableDetail.get("numberField_lqyx5k11")));
 
-                        accounts18.add(accounts);
+                        accounts10.add(accounts);
                     }
                 }
             }
         }
 
         //未分配利润
-        Accounts accounts23 = new Accounts();
+        Accounts accounts15 = new Accounts();
         for (Map profit : profitList) {
             Map formData = (Map) profit.get("formData");
             if (Objects.nonNull(formData.get("textField_lqvp89br"))){
                 String month = formData.get("textField_lqvp89br").toString().substring(6);
                 String amt = getBigDecimalStringAmt(formData.get("numberField_lqqhf8yn"));
-                ReflectUtil.invoke(accounts23, "setAmt"+month, NumberUtil.add(amt,ReflectUtil.invoke(accounts23,"getAmt"+month)).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
+                ReflectUtil.invoke(accounts15, "setAmt"+month, NumberUtil.add(amt,ReflectUtil.invoke(accounts15,"getAmt"+month)).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
             }
         }
 
-        for (int i = 1; i <= 25; i++) {
+        for (int i = 1; i <= 15; i++) {
             switch (i){
                 case 1:dataList.add(accounts1);break;
                 case 2:dataList.add(accounts2);break;
                 case 3:dataList.add(accounts3);break;
-                case 4:dataList.add(accounts4);break;
-                case 5:dataList.add(accounts5);break;
-                case 6:dataList.add(accounts6);break;
-                case 7:dataList.add(accounts7);break;
-                case 8:dataList.add(accounts8);break;
-                case 9:dataList.add(accounts9);break;
                 case 10:dataList.add(accounts10);break;
-                case 11:dataList.add(accounts11);break;
-                case 18:dataList.add(accounts18);break;
-                case 20:dataList.add(accounts20);break;
-                case 23:dataList.add(accounts23);break;
+                case 12:dataList.add(accounts12);break;
+                case 15:dataList.add(accounts15);break;
                 default:dataList.add(new Accounts());break;
             }
         }
@@ -1686,7 +1516,7 @@ public class ZxtdReportServiceImpl implements ZxtdReportService {
             // 数据累加
             if(dataMap.containsKey(classify)){
                 Map<String,Profit> classifyMap=dataMap.get(classify);
-                if(classifyMap.containsKey(subject) && !"社保及公积金".equals(subject)){
+                if(classifyMap.containsKey(subject)){
                     Profit profit=classifyMap.get(subject);
                     // 获取已有数据
                     String amtTemp=ReflectUtil.invoke(profit,"getAmt"+month);
@@ -1694,16 +1524,16 @@ public class ZxtdReportServiceImpl implements ZxtdReportService {
                     dataMap.get(classify).put(subject, profit);
                 }else{
                     Profit profit=new Profit(subject);
-                    if (!"社保及公积金".equals(subject)){
-                        ReflectUtil.invoke(profit, "setAmt"+month, new BigDecimal(amt).setScale(2,RoundingMode.HALF_UP).toString());
-                    }
+
+                    ReflectUtil.invoke(profit, "setAmt"+month, new BigDecimal(amt).setScale(2,RoundingMode.HALF_UP).toString());
+
                     dataMap.get(classify).put(subject,profit);
                 }
             }else{
                 Profit profit=new Profit(subject);
-                if (!"社保及公积金".equals(subject)){
-                    ReflectUtil.invoke(profit, "setAmt"+month, new BigDecimal(amt).setScale(2,RoundingMode.HALF_UP).toString());
-                }
+
+                ReflectUtil.invoke(profit, "setAmt"+month, new BigDecimal(amt).setScale(2,RoundingMode.HALF_UP).toString());
+
                 Map<String,Profit> classifyMap=new HashMap<>();
                 classifyMap.put(subject,profit);
                 dataMap.put(classify,classifyMap);