From 5ec8d62c24fc5844d1b88a91398178856ec76b12 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期四, 08 五月 2025 15:46:17 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev

---
 aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsWorkCalendarController.java |   51 ++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 44 insertions(+), 7 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..07371ca 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
@@ -43,7 +43,7 @@
     /**
      * 瀵煎嚭鏃ュ巻绠＄悊鍒楄〃
      */
-    @RequiresPermissions("core:calendar:export")
+    @RequiresPermissions("aps:calendar:export")
     @Log(title = "鏃ュ巻绠＄悊", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, ApsWorkCalendar apsWorkCalendar)
@@ -56,7 +56,7 @@
     /**
      * 鑾峰彇鏃ュ巻绠＄悊璇︾粏淇℃伅
      */
-    @RequiresPermissions("core:calendar:query")
+    @RequiresPermissions("aps:calendar:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -66,33 +66,70 @@
     /**
      * 鏂板鏃ュ巻绠＄悊
      */
-    @RequiresPermissions("core:calendar:add")
+    @RequiresPermissions("aps:calendar:add")
     @Log(title = "鏃ュ巻绠＄悊", businessType = BusinessType.INSERT)
     @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));
+        }
     }
 
     /**
      * 淇敼鏃ュ巻绠＄悊
      */
-    @RequiresPermissions("core:calendar:edit")
+    @RequiresPermissions("aps:calendar:edit")
     @Log(title = "鏃ュ巻绠＄悊", businessType = BusinessType.UPDATE)
     @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));
+        }
     }
 
     /**
      * 鍒犻櫎鏃ュ巻绠＄悊
      */
-    @RequiresPermissions("core:calendar:remove")
+    @RequiresPermissions("aps:calendar:remove")
     @Log(title = "鏃ュ巻绠＄悊", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         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)
+    @RequiresPermissions("aps:calendar:selectCalendarView")
+    @PostMapping("/selectCalendarView")
+    public AjaxResult selectCalendarView(@RequestBody ApsWorkCalendar apsWorkCalendar)
+    {
+        return AjaxResult.success(apsWorkCalendarService.selectCalendarView(apsWorkCalendar));
+    }
 }

--
Gitblit v1.9.3