From 2a64b537e8e3bce9ce030585a3da17d48379c0ad Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期一, 26 五月 2025 15:04:45 +0800
Subject: [PATCH] 修改json类型转换错误
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsWorkCalendarController.java | 63 ++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 19 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 07371ca..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
@@ -71,35 +71,49 @@
@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("aps: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();
}
}
@@ -115,6 +129,17 @@
}
/**
+ * 鍒犻櫎鏃ュ巻绠＄悊
+ */
+ @RequiresPermissions("aps:calendar:delete")
+ @Log(title = "鍒犻櫎鏃ュ巻绠＄悊", businessType = BusinessType.DELETE)
+ @PostMapping("/deleteApsWorkCalendar")
+ public AjaxResult deleteApsWorkCalendar(@RequestBody ApsWorkCalendar apsWorkCalendar)
+ {
+ return toAjax(apsWorkCalendarService.deleteApsWorkCalendar(apsWorkCalendar));
+ }
+
+ /**
* 鏌ヨ鏃ュ巻绠＄悊鍒楄〃
*/
@RequiresPermissions("aps:calendar:list")
--
Gitblit v1.9.3