From bec1e27df1cce02f0a4b9aa19a2fc50f4551fb64 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期日, 27 四月 2025 15:00:28 +0800
Subject: [PATCH] 【UPDATE】1.新增或修改日历数据时验证有效日期和失效日期是否重叠 2.增加日历视图页面接口

---
 aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java
index dbcc902..7f3de63 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java
@@ -132,9 +132,9 @@
     @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:confirmData")
     @PostMapping("/confirmData")
     public AjaxResult confirmData(@RequestBody ApsResourceGroupTemp temp) {
-//        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-//        LocalDateTime localDateTime = LocalDateTime.parse(temp.getParams().get("requestDate").toString(), formatter);
-        apsResourceGroupService.confirmData(temp.getBatchNumber(),temp.getRequestDate());
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime localDateTime = LocalDateTime.parse(temp.getParams().get("requestDate").toString(), formatter);
+        apsResourceGroupService.confirmData(temp.getBatchNumber(),localDateTime);
         return AjaxResult.success("纭鎴愬姛锛�");
     }
 }

--
Gitblit v1.9.3