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/ApsWorkCalendarController.java | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsWorkCalendarController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsWorkCalendarController.java
index b679767..0e84a40 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsWorkCalendarController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsWorkCalendarController.java
@@ -71,7 +71,16 @@
@PostMapping
public AjaxResult add(@RequestBody ApsWorkCalendar apsWorkCalendar)
{
- return toAjax(apsWorkCalendarService.insertApsWorkCalendar(apsWorkCalendar));
+ ApsWorkCalendar tempCheck = new ApsWorkCalendar();
+ tempCheck.setEffectiveDate(apsWorkCalendar.getEffectiveDate());
+ tempCheck.setExpiringDate(apsWorkCalendar.getExpiringDate());
+ tempCheck.setApplicableFactory(apsWorkCalendar.getApplicableFactory());
+ List<ApsWorkCalendar> list = apsWorkCalendarService.selectApsWorkCalendarList(tempCheck);
+ if(!list.isEmpty()){
+ return AjaxResult.error("璇ユ椂闂存鏃ュ巻宸插瓨鍦�", list);
+ }else{
+ return toAjax(apsWorkCalendarService.insertApsWorkCalendar(apsWorkCalendar));
+ }
}
/**
@@ -82,7 +91,16 @@
@PutMapping
public AjaxResult edit(@RequestBody ApsWorkCalendar apsWorkCalendar)
{
- return toAjax(apsWorkCalendarService.updateApsWorkCalendar(apsWorkCalendar));
+ ApsWorkCalendar tempCheck = new ApsWorkCalendar();
+ tempCheck.setEffectiveDate(apsWorkCalendar.getEffectiveDate());
+ tempCheck.setExpiringDate(apsWorkCalendar.getExpiringDate());
+ tempCheck.setApplicableFactory(apsWorkCalendar.getApplicableFactory());
+ List<ApsWorkCalendar> list = apsWorkCalendarService.selectApsWorkCalendarList(tempCheck);
+ if(!list.isEmpty()){
+ return AjaxResult.error("璇ユ椂闂存鏃ュ巻宸插瓨鍦�", list);
+ }else{
+ return toAjax(apsWorkCalendarService.updateApsWorkCalendar(apsWorkCalendar));
+ }
}
/**
@@ -95,4 +113,22 @@
{
return toAjax(apsWorkCalendarService.deleteApsWorkCalendarByIds(ids));
}
+
+ /**
+ * 鏌ヨ鏃ュ巻绠＄悊鍒楄〃
+ */
+ @RequiresPermissions("aps:calendar:list")
+ @GetMapping("/listAll")
+ public AjaxResult listAll(ApsWorkCalendar apsWorkCalendar)
+ {
+ List<ApsWorkCalendar> list = apsWorkCalendarService.selectApsWorkCalendarList(apsWorkCalendar);
+ return AjaxResult.success(list);
+ }
+
+ @Log(title = "鏌ヨ鏃ュ巻瑙嗗浘鏁版嵁", businessType = BusinessType.INSERT)
+ @PostMapping("/selectCalendarView")
+ public AjaxResult selectCalendarView(@RequestBody ApsWorkCalendar apsWorkCalendar)
+ {
+ return AjaxResult.success(apsWorkCalendarService.selectCalendarView(apsWorkCalendar));
+ }
}
--
Gitblit v1.9.3