月份处理

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

@@ -149,7 +149,8 @@ public class ZxtdReportServiceImpl implements ZxtdReportService {
                 String subject = formData.get("selectField_lp9j90w8") == null ? "" : formData.get("selectField_lp9j90w8").toString();
                 if (Objects.nonNull(formData.get("textField_lqvpypje"))){
                     String year2 = formData.get("textField_lqvpypje").toString();
-                    String month = year2.substring(6);
+                    String month = year2.substring(6).replaceFirst("^0+(?!$)", "");
+
                     String amt = formData.get("numberField_lp82nads").toString();
 
                     if(subject.equals("FH")){
@@ -250,7 +251,8 @@ public class ZxtdReportServiceImpl implements ZxtdReportService {
                 String subject = formData.get("selectField_lp9j90w8") == null ? "" : formData.get("selectField_lp9j90w8").toString();
                 if (Objects.nonNull(formData.get("textField_lqvpypje"))){
                     String year2 = formData.get("textField_lqvpypje").toString();
-                    String month = year2.substring(6);
+                    String month = year2.substring(6).replaceFirst("^0+(?!$)", "");
+
                     Integer quarter = (Integer.parseInt(month)+2)/3;
                     String amt = formData.get("numberField_lp82nads").toString();
 
@@ -797,7 +799,8 @@ public class ZxtdReportServiceImpl implements ZxtdReportService {
             for (Map income : incomeList) {
                 Map formData = (Map) income.get("formData");
                 if (Objects.nonNull(formData.get("textField_lqvp25z0"))){
-                    String month = formData.get("textField_lqvp25z0").toString().substring(5);
+                    String month = formData.get("textField_lqvp25z0").toString().substring(4).replaceFirst("^0+(?!$)", "");
+
                     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());
                 }
@@ -808,10 +811,8 @@ public class ZxtdReportServiceImpl implements ZxtdReportService {
             for (Map pay : payList) {
                 Map formData = (Map) pay.get("formData");
                 if (Objects.nonNull(formData.get("textField_lqvpypje"))){
-                    String month = formData.get("textField_lqvpypje").toString().substring(5);
-                    if (month.substring(0,1).equals("0")){
-                        month = month.substring(1);
-                    }
+                    String month = formData.get("textField_lqvpypje").toString().substring(5).replaceFirst("^0+(?!$)", "");
+
                     String amt = getBigDecimalStringAmt(formData.get("numberField_lp82nads"));
                     ReflectUtil.invoke(accounts1, "setAmt"+month, NumberUtil.sub(ReflectUtil.invoke(accounts1,"getAmt"+month),amt).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
                 }
@@ -823,7 +824,9 @@ public class ZxtdReportServiceImpl implements ZxtdReportService {
                 Map formData = (Map) manual.get("formData");
 
                 String month = formData.get("textField_lxl8322m").toString().substring(6);
-
+                if (month.substring(0,1).equals("0")){
+                    month = month.substring(1);
+                }
                 String amt = getBigDecimalStringAmt(formData.get("numberField_lxl8322n"));
                 if (formData.get("selectField_lxl8322i").equals("收入")){
                     ReflectUtil.invoke(accounts1, "setAmt"+month, NumberUtil.add(ReflectUtil.invoke(accounts1,"getAmt"+month),amt).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
@@ -1580,6 +1583,9 @@ public class ZxtdReportServiceImpl implements ZxtdReportService {
             }
         }
         String month = year2.substring(6);
+        if (month.substring(0,1).equals("0")){
+            month = month.substring(1);
+        }
 
         //应收
         List<Map> receivableList = getYdFormDataList(_matchFormUuid("RECEIVABLE"), JSONObject.toJSONString(UtilMap.map("dateField_lqyx5k0n", dateParam)), YDConf.FORM_QUERY.retrieve_list_all);