From a9f950c0d11a687a7a940443b8c765f6d87ae4f1 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 00:26:22 +0800
Subject: [PATCH] 合并新的修改
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorkBeatuistaffServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorkBeatuistaffServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorkBeatuistaffServiceImpl.java
index e8df494..72ee3f1 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorkBeatuistaffServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorkBeatuistaffServiceImpl.java
@@ -10,7 +10,7 @@
import com.matrix.system.hive.bean.SysWorkBeatuistaff;
import com.matrix.system.hive.bean.SysWorktime;
import com.matrix.system.hive.dao.SysWorkBeatuistaffDao;
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
import com.matrix.system.hive.pojo.BeautiWorkForm;
import com.matrix.system.hive.service.SysWorkBeatuistaffService;
import com.matrix.system.hive.service.SysWorktimeService;
@@ -153,7 +153,7 @@
// 根据分页获取未来7天的日期
- List<Date> dates = DateUtils.getFutureDay(date, 0 * page, 7 * page);
+ List<Date> dates = DateUtil.getFutureDay(date, 0 * page, 7 * page);
SysUsers users = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
List<SysWorktime> worktimes = sysWorkTimeService.findWorkTimeByshopId(users.getShopId());
@@ -164,7 +164,7 @@
List<List<SysWorkBeatuistaff>> staffs = new ArrayList<List<SysWorkBeatuistaff>>();
for (SysWorktime sysWorktime : worktimes) {
staffs.add(sysWorkBeatuistaffDao
- .selectByCode(DateUtils.dateToString(dtime, "yyyyMMdd") , sysWorktime.getId()));
+ .selectByCode(DateUtil.dateToString(dtime, "yyyyMMdd") , sysWorktime.getId()));
}
beautiWorkForm.setQueryListWorks(staffs);
workForms.add(beautiWorkForm);
--
Gitblit v1.9.1