From d096e4f9fd6d63f40d0ec27f767be59848197f5b Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 22 五月 2025 18:13:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsWorkCalendarController.java |   72 ++++++++++++++++++++++++-----------
 1 files changed, 49 insertions(+), 23 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 0e84a40..70da1b4 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,52 +66,77 @@
     /**
      * 鏂板鏃ュ巻绠＄悊
      */
-    @RequiresPermissions("core:calendar:add")
+    @RequiresPermissions("aps:calendar:add")
     @Log(title = "鏃ュ巻绠＄悊", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ApsWorkCalendar 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));
+        try {
+            ApsWorkCalendar tempCheck = new ApsWorkCalendar();
+            tempCheck.setEffectiveDate(apsWorkCalendar.getEffectiveDate());
+            tempCheck.setExpiringDate(apsWorkCalendar.getExpiringDate());
+            tempCheck.setApplicableFactory(apsWorkCalendar.getApplicableFactory());
+            tempCheck.setType(apsWorkCalendar.getType());
+            List<ApsWorkCalendar> list = apsWorkCalendarService.selectApsWorkCalendarList(tempCheck);
+            if(!list.isEmpty()){
+                return AjaxResult.error("璇ユ椂闂存鏃ュ巻宸插瓨鍦�",  list);
+            }else{
+                apsWorkCalendarService.insertApsWorkCalendar(apsWorkCalendar);
+                return success();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return error();
         }
     }
 
     /**
      * 淇敼鏃ュ巻绠＄悊
      */
-    @RequiresPermissions("core:calendar:edit")
+//    @RequiresPermissions("aps:calendar:edit")
     @Log(title = "鏃ュ巻绠＄悊", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody ApsWorkCalendar 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));
+        try {
+//            ApsWorkCalendar tempCheck = new ApsWorkCalendar();
+//            tempCheck.setEffectiveDate(apsWorkCalendar.getEffectiveDate());
+//            tempCheck.setExpiringDate(apsWorkCalendar.getExpiringDate());
+//            tempCheck.setApplicableFactory(apsWorkCalendar.getApplicableFactory());
+//            tempCheck.setType(apsWorkCalendar.getType());
+//            List<ApsWorkCalendar> list = apsWorkCalendarService.selectApsWorkCalendarList(tempCheck);
+//            if(!list.isEmpty()){
+//                return AjaxResult.error("璇ユ椂闂存鏃ュ巻宸插瓨鍦�",  list);
+//            }else{
+            apsWorkCalendarService.updateApsWorkCalendar(apsWorkCalendar);
+            return success();
+//            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return error();
         }
     }
 
     /**
      * 鍒犻櫎鏃ュ巻绠＄悊
      */
-    @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:delete")
+    @Log(title = "鍒犻櫎鏃ュ巻绠＄悊", businessType = BusinessType.DELETE)
+    @PostMapping("/deleteApsWorkCalendar")
+    public AjaxResult deleteApsWorkCalendar(@RequestBody ApsWorkCalendar apsWorkCalendar)
+    {
+        return toAjax(apsWorkCalendarService.deleteApsWorkCalendar(apsWorkCalendar));
     }
 
     /**
@@ -126,6 +151,7 @@
     }
 
     @Log(title = "鏌ヨ鏃ュ巻瑙嗗浘鏁版嵁", businessType = BusinessType.INSERT)
+    @RequiresPermissions("aps:calendar:selectCalendarView")
     @PostMapping("/selectCalendarView")
     public AjaxResult selectCalendarView(@RequestBody ApsWorkCalendar apsWorkCalendar)
     {

--
Gitblit v1.9.3