diff --git a/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java b/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java index 7bb599a..f4f4806 100644 --- a/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java +++ b/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java @@ -1926,4 +1926,24 @@ public interface BaseMapper { * @version 1.0 */ void deleteLabelSerialInfo(LabelContentSerialInfoData inData); + + + /** + * @author: sxm + * @description: 保存新班次 + * @param [data] + * @return: void + * @date: 2023/1/13 17:13 + */ + void saveCalendarExceptionShift(CalendarExceptionData data); + + /** + * @author: sxm + * @description: 删除班次 + * @param [data] + * @return: void + * @date: 2023/1/13 17:15 + */ + + void deleteCalendarExceptionShift(CalendarExceptionData data); } diff --git a/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java b/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java index fb1b003..a26c827 100644 --- a/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java +++ b/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java @@ -1839,8 +1839,13 @@ public class BaseServiceImpl implements BaseService { } @Override + @Transactional public void updateWorkingCalendar(CalendarExceptionData data) { baseMapper.updateWorkingCalendar(data); + // 删除班次 + baseMapper.deleteCalendarExceptionShift(data); + // 获取新班次并保存 + baseMapper.saveCalendarExceptionShift(data); } @Override diff --git a/src/main/resources/mapper/base/BaseMapper.xml b/src/main/resources/mapper/base/BaseMapper.xml index ea03cb5..5eef75d 100644 --- a/src/main/resources/mapper/base/BaseMapper.xml +++ b/src/main/resources/mapper/base/BaseMapper.xml @@ -1933,6 +1933,7 @@ VALUES(#{labelNo}, #{userId}, '', #{ipAddress}, #{printerName}) + UPDATE ReportFileList_UserPrinter SET IPAddress = #{ipAddress}, NewPrinterName = #{printerName} @@ -2107,4 +2108,18 @@ AND ReportID = #{labelNo} AND ItemNo = #{itemNo} AND KeyInfo = #{keyInfo} + + + + INSERT INTO Calendar_Exception_Shift(Site, CalendarID, ShiftNo, ScheduleDate, ShiftDesc, StartExactTime, EndExactTime, StartTime, EndTime) + SELECT site,#{calendarId},ShiftNo,#{scheduledate} , ShiftDesc, StartExactTime, EndExactTime, StartTime, EndTime FROM Calendar_DateType_Shift + WHERE DateType = #{datetype} AND site = #{site} + + + + DELETE Calendar_Exception_Shift + WHERE site = #{site} + AND CalendarID = #{calendarId} + AND scheduledate = #{scheduledate} + \ No newline at end of file