From 7ef593e1e3c35aaeecf9318f0b3941230d3ed002 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 09 十月 2024 11:22:54 +0800
Subject: [PATCH] 增加在数据点计算规则后数据点名称加_n的适配
---
collect/src/main/java/com/qianwen/mdc/collect/service/WorkstationService.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/collect/src/main/java/com/qianwen/mdc/collect/service/WorkstationService.java b/collect/src/main/java/com/qianwen/mdc/collect/service/WorkstationService.java
index 5358533..c7eac55 100644
--- a/collect/src/main/java/com/qianwen/mdc/collect/service/WorkstationService.java
+++ b/collect/src/main/java/com/qianwen/mdc/collect/service/WorkstationService.java
@@ -13,9 +13,14 @@
import java.util.List;
import com.qianwen.core.mp.base.BaseServiceImpl;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.mdc.collect.constants.CommonConstant;
+import com.qianwen.mdc.collect.dto.CalendarShiftInfoDTO;
import com.qianwen.mdc.collect.entity.mgr.Workstation;
+import com.qianwen.mdc.collect.mapper.mgr.CalendarMapper;
import com.qianwen.mdc.collect.mapper.mgr.WorkstationMapper;
+import com.qianwen.mdc.collect.utils.LocalDateTimeUtils;
+import org.springframework.beans.factory.annotation.Autowired;
/*
import com.qianwen.posting.cache.WorkstationCache;
import com.qianwen.posting.constant.CommonConstant;
@@ -30,7 +35,8 @@
@Service
public class WorkstationService extends BaseServiceImpl<WorkstationMapper, Workstation>{
- //private final CalendarMapper calendarMapper;
+ @Autowired
+ private CalendarMapper calendarMapper;
//BaseEntity a;
/*
@@ -52,10 +58,10 @@
updateBatchById(workstationList);
WorkstationCache.clearWorkStationCache();
}
-
- @Override
+*/
+
public CalendarShiftInfoDTO getCalendarShiftInfoForWorkstation(Long workstationId, Date date) {
- Workstation workstationInfo = (Workstation) getById(workstationId);
+ Workstation workstationInfo = getById(workstationId);
CalendarShiftInfoDTO result = null;
if (Func.isNotEmpty(workstationInfo) && !"#default#".equals(workstationInfo.getCalendarCode())) {
List<CalendarShiftInfoDTO> calendarShiftInfoDTOList = this.calendarMapper.getCalendarShiftInfoToday(workstationInfo.getCalendarCode(), DateUtil.formatDate(date));
@@ -77,5 +83,5 @@
}
return result;
}
- */
+
}
--
Gitblit v1.9.3