From 393d296e43f0e5f11e524cab5446bcd3eee94e89 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 12 Jun 2021 17:47:38 +0800
Subject: [PATCH] 新增赠送项目是否计算消耗控制
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysBedInfoServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysBedInfoServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysBedInfoServiceImpl.java
index 69335e7..9eb0183 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysBedInfoServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysBedInfoServiceImpl.java
@@ -6,7 +6,7 @@
import com.matrix.system.hive.bean.SysBedInfo;
import com.matrix.system.hive.bean.SysProjServices;
import com.matrix.system.hive.dao.SysBedInfoDao;
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
import com.matrix.system.hive.service.SysBedInfoService;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
@@ -85,14 +85,14 @@
@Override
public int findFreeBedCount(SysProjServices sysProjServices) {
- sysProjServices.setEndTime(DateUtils.getNextNMinute(sysProjServices.getStartTime(), sysProjServices.getTotalTime()));
+ sysProjServices.setEndTime(DateUtil.getNextNMinute(sysProjServices.getStartTime(), sysProjServices.getTotalTime()));
return sysBedInfoDao.findFreeBedCount(sysProjServices);
}
//查询空闲的床位
@Override
public List<SysBedInfo> findFreeBed(SysProjServices sysProjServices) {
- sysProjServices.setEndTime(DateUtils.getNextNMinute(sysProjServices.getStartTime(), sysProjServices.getTotalTime()));
+ sysProjServices.setEndTime(DateUtil.getNextNMinute(sysProjServices.getStartTime(), sysProjServices.getTotalTime()));
return sysBedInfoDao.findFreeBed(sysProjServices);
}
--
Gitblit v1.9.1