From 3a6f6d86d14284a665dc016914b39a1a6a82b29b Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 05 十月 2024 23:19:09 +0800
Subject: [PATCH] 导出数据点ok
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarServiceImpl.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarServiceImpl.java
index 6533d83..197b3c7 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarServiceImpl.java
@@ -134,7 +134,7 @@
public ProductionCalendar updateCalendar(CalendarUpdateVO calendarUpdateVO) {
this.calendarDayService.deleteByCalendarId(calendarUpdateVO.getId());
this.calendarDaytimeService.deleteByCalendarId(calendarUpdateVO.getId());
- ProductionCalendar calendar = (ProductionCalendar) getById(calendarUpdateVO.getId());
+ ProductionCalendar calendar = getById(calendarUpdateVO.getId());
updateCalendarDayTime(calendarUpdateVO.getDateDTOList(), calendar);
return calendar;
}
@@ -267,14 +267,7 @@
.eq(ProductionCalendarDaytime::getCalendarId, calendarId)
.orderByAsc(ProductionCalendarDaytime::getStartTime));
- /*
- List<ProductionCalendarDaytime> todayDateTimeList = this.calendarDaytimeService.list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) new QueryWrapper().lambda().eq((v0) -> {
- return v0.getCalendarDate();
- }, LocalDate.now())).eq((v0) -> {
- return v0.getCalendarId();
- }, calendarId)).orderByAsc((v0) -> {
- return v0.getStartTime();
- }));*/
+
List<ProductionCalendarDaytime> curProductionCalendarDayTimeList = new ArrayList<>();
LocalDate lastDayOfYear = LocalDateTimeUtils.getLastDayOfYear(LocalDate.now());
long difference = year.intValue() == LocalDate.now().getYear() ? LocalDateTimeUtils.getDifference(LocalDate.now(), lastDayOfYear).intValue() : LocalDateTimeUtils.getDayOfYear(year).intValue() - 1;
@@ -1283,10 +1276,13 @@
}
@Override
+ @Transactional
public Boolean associateWorkstation(CalendarAssociateWorkstationVO calendarAssociateWorkstationVO) {
- return this.workstationService.update(Wrappers.<Workstation>lambdaUpdate()
+ boolean result = this.workstationService.update(Wrappers.<Workstation>lambdaUpdate()
.set(Workstation::getCalendarCodeWaiting, calendarAssociateWorkstationVO.getCalendarCode())
.in(Workstation::getId, calendarAssociateWorkstationVO.getWorkstationIdList()));
+
+ return result;
/*
return Boolean.valueOf(this.workstationService.update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().set((v0) -> {
return v0.getCalendarCodeWaiting();
@@ -1295,6 +1291,7 @@
}, calendarAssociateWorkstationVO.getWorkstationIdList())));*/
}
+
@Override
public List<ShiftIndexNameDTO> queryShiftIndexName(String calendarCode, Integer year, String day) {
Integer maxShiftIndex;
--
Gitblit v1.9.3