From 09e22d89710364548fa896917506a372795a7bd3 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 26 一月 2024 09:37:36 +0800
Subject: [PATCH] 加班管理功能调整
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentOvertimeController.java | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentOvertimeController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentOvertimeController.java
index c50dffd..b69c725 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentOvertimeController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentOvertimeController.java
@@ -1,7 +1,6 @@
package org.jeecg.modules.mdc.controller;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
@@ -20,9 +19,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.List;
/**
* @Description: 璁惧鍔犵彮绠＄悊
@@ -72,18 +69,13 @@
@ApiOperation(value = "璁惧鍔犵彮绠＄悊-娣诲姞", notes = "璁惧鍔犵彮绠＄悊-娣诲姞")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody MdcEquipmentOvertime mdcEquipmentOvertime) {
- String[] calendarIdList = mdcEquipmentOvertime.getCalendarId().split(",");
- List<MdcEquipmentOvertime> equipmentOvertimeList = new ArrayList<>();
- mdcEquipmentOvertimeService.remove(new LambdaQueryWrapper<MdcEquipmentOvertime>().in(MdcEquipmentOvertime::getCalendarId, Arrays.asList(calendarIdList)));
- for (String calendarId : calendarIdList) {
- MdcEquipmentOvertime equipmentOvertime = new MdcEquipmentOvertime();
- equipmentOvertime.setCalendarId(calendarId);
- equipmentOvertime.setStartTime(mdcEquipmentOvertime.getStartTime());
- equipmentOvertime.setEndTime(mdcEquipmentOvertime.getEndTime());
- equipmentOvertime.setRemark(mdcEquipmentOvertime.getRemark());
- equipmentOvertimeList.add(equipmentOvertime);
+ if (org.apache.commons.lang3.StringUtils.isBlank(mdcEquipmentOvertime.getEquipmentId())) {
+ return Result.error("鏈�夋嫨璁惧锛岃鎺掓煡锛�");
}
- mdcEquipmentOvertimeService.saveBatch(equipmentOvertimeList);
+ boolean result = mdcEquipmentOvertimeService.addOvertime(mdcEquipmentOvertime);
+ if (!result) {
+ return Result.error("娣诲姞澶辫触锛�");
+ }
return Result.OK("娣诲姞鎴愬姛锛�");
}
--
Gitblit v1.9.3