From 094a9290c836827bc1f45fd3549e7cd2ea1e1e45 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 07 十一月 2023 09:45:36 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentOvertimeController.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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 15326dc..c50dffd 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,7 @@
package org.jeecg.modules.mdc.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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;
@@ -11,7 +11,6 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.entity.MdcEquipmentOvertime;
import org.jeecg.modules.mdc.service.IMdcEquipmentOvertimeService;
@@ -21,7 +20,9 @@
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: 璁惧鍔犵彮绠＄悊
@@ -71,7 +72,18 @@
@ApiOperation(value = "璁惧鍔犵彮绠＄悊-娣诲姞", notes = "璁惧鍔犵彮绠＄悊-娣诲姞")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody MdcEquipmentOvertime mdcEquipmentOvertime) {
- mdcEquipmentOvertimeService.save(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);
+ }
+ mdcEquipmentOvertimeService.saveBatch(equipmentOvertimeList);
return Result.OK("娣诲姞鎴愬姛锛�");
}
--
Gitblit v1.9.3