diff --git a/src/main/java/com/mini/mybigscreen/Job/erpJobs.java b/src/main/java/com/mini/mybigscreen/Job/erpJobs.java index b14b6ce..4bd9f81 100644 --- a/src/main/java/com/mini/mybigscreen/Job/erpJobs.java +++ b/src/main/java/com/mini/mybigscreen/Job/erpJobs.java @@ -90,8 +90,8 @@ public class erpJobs { indexInfo.setValue(netProfit); } if (index.equals("ERP_006")) { - indexInfo.setModule(budgetStatusName); indexInfo.setValue(overBudgetAmount); + indexInfo.setTitle(budgetStatusName); } infoService.update(indexInfo, queryWrapper); } diff --git a/src/main/java/com/mini/mybigscreen/utils/DateUtils.java b/src/main/java/com/mini/mybigscreen/utils/DateUtils.java index 8d42811..fdfc2e4 100644 --- a/src/main/java/com/mini/mybigscreen/utils/DateUtils.java +++ b/src/main/java/com/mini/mybigscreen/utils/DateUtils.java @@ -9,6 +9,9 @@ public class DateUtils { private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMdd"); private static final DateTimeFormatter YEAR_MONTH_CN_FORMATTER = DateTimeFormatter.ofPattern("yyyy年MM月"); + private static final DateTimeFormatter SHORT_YEAR_MONTH_CN_FORMATTER = DateTimeFormatter.ofPattern("yy年MM月"); + + public static String dsValue() { LocalDate currentDate = LocalDate.now(); @@ -35,6 +38,11 @@ public class DateUtils { return currentDate.format(YEAR_MONTH_CN_FORMATTER); } + public static String getCurrentShortYearMonthCN() { + LocalDate currentDate = LocalDate.now(); + return currentDate.format(SHORT_YEAR_MONTH_CN_FORMATTER); + } + public static String getYear(LocalDate date) { return date.format(YEAR_FORMATTER); }