From dc199cb4d536e36098a806c96ab1fdd21d89ebeb Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期二, 29 四月 2025 09:00:20 +0800
Subject: [PATCH] 【UPDATE-BUGFIX】修改计算产能开始结束日期
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsWorkCalendarController.java | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 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 88f8355..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,29 +66,47 @@
/**
* 鏂板鏃ュ巻绠＄悊
*/
- @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)
@@ -106,4 +124,12 @@
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