From c554c7ad5405bafa149dbb6429e8245f78b33ffc Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 23 Dec 2020 15:59:53 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/hive/action/OccupancyController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/OccupancyController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/OccupancyController.java
index 7962a93..1a3d742 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/OccupancyController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/OccupancyController.java
@@ -9,7 +9,7 @@
import com.matrix.system.hive.bean.SysWorkBeatuistaff;
import com.matrix.system.hive.dao.SysBeauticianStateDao;
import com.matrix.system.hive.plugin.util.CollectionUtils;
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
import com.matrix.system.hive.service.SysWorkBeatuistaffService;
import com.matrix.system.hive.service.SysWorktimeService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -52,10 +52,10 @@
public @ResponseBody
AjaxResult showCwzyList(String timeStr) {
if (timeStr == null || timeStr.equals("")) {
- timeStr = DateUtils.dateToString(new Date(), "yyyy-MM-dd");
+ timeStr = DateUtil.dateToString(new Date(), "yyyy-MM-dd");
}
// 查询上班下班的最大时间段
- Date currentDate = DateUtils.stringToDate(timeStr, DateUtils.DATE_FORMAT_DD);
+ Date currentDate = DateUtil.stringToDate(timeStr, DateUtil.DATE_FORMAT_DD);
// 把日期调整为当前查询日期
Long shopId = 16L; //getMe().getShopId();
--
Gitblit v1.9.1