diff --git a/src/main/java/com/mini/mybigscreen/Job/erpJobs.java b/src/main/java/com/mini/mybigscreen/Job/erpJobs.java index dce0085..b14b6ce 100644 --- a/src/main/java/com/mini/mybigscreen/Job/erpJobs.java +++ b/src/main/java/com/mini/mybigscreen/Job/erpJobs.java @@ -60,13 +60,14 @@ public class erpJobs { .setScale(2, RoundingMode.HALF_UP); boolean isOverBudget = expenseAmount.compareTo(BUDGET_AMOUNT) > 0; - String budgetStatusName = isOverBudget ? "超出" : "正常"; + String budgetStatusName = isOverBudget ? "超支" : "正常"; BigDecimal overBudgetAmount = isOverBudget ? expenseAmount.subtract(BUDGET_AMOUNT) : BigDecimal.ZERO; String[] indexList = { "ERP_001", "ERP_002", "ERP_003", "ERP_004", + "ERP_005", "ERP_006", }; for (String index : indexList) { @@ -85,6 +86,9 @@ public class erpJobs { if (index.equals("ERP_004")) { indexInfo.setValue(expenseIncomeRatio); } + if (index.equals("ERP_005")) { + indexInfo.setValue(netProfit); + } if (index.equals("ERP_006")) { indexInfo.setModule(budgetStatusName); indexInfo.setValue(overBudgetAmount); @@ -94,7 +98,5 @@ public class erpJobs { } catch (Exception e) { System.out.println(e.getMessage()); } - - } } diff --git a/src/main/java/com/mini/mybigscreen/utils/DateUtils.java b/src/main/java/com/mini/mybigscreen/utils/DateUtils.java index da74938..8d42811 100644 --- a/src/main/java/com/mini/mybigscreen/utils/DateUtils.java +++ b/src/main/java/com/mini/mybigscreen/utils/DateUtils.java @@ -4,10 +4,11 @@ import java.time.LocalDate; import java.time.format.DateTimeFormatter; public class DateUtils { - - private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMdd"); - private static final DateTimeFormatter YEAR_FORMATTER = DateTimeFormatter.ofPattern("yyyy"); private static final DateTimeFormatter MONTH_FORMATTER = DateTimeFormatter.ofPattern("MM"); + private static final DateTimeFormatter YEAR_FORMATTER = DateTimeFormatter.ofPattern("yyyy"); + private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMdd"); + private static final DateTimeFormatter YEAR_MONTH_CN_FORMATTER = DateTimeFormatter.ofPattern("yyyy年MM月"); + public static String dsValue() { LocalDate currentDate = LocalDate.now(); @@ -29,6 +30,11 @@ public class DateUtils { return currentDate.format(MONTH_FORMATTER); } + public static String getCurrentYearMonthCN() { + LocalDate currentDate = LocalDate.now(); + return currentDate.format(YEAR_MONTH_CN_FORMATTER); + } + public static String getYear(LocalDate date) { return date.format(YEAR_FORMATTER); }