From 2e7d9e3e849bda0dae16c1f0c9623df7113b9d0b Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 02 Dec 2020 00:04:08 +0800
Subject: [PATCH] 数据分析人头1
---
zq-erp/src/main/java/com/matrix/system/hive/action/BeautiWorkFormController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/BeautiWorkFormController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/BeautiWorkFormController.java
index b0cb55e..be97221 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/BeautiWorkFormController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/BeautiWorkFormController.java
@@ -9,7 +9,7 @@
import com.matrix.system.hive.bean.SysBeauticianState;
import com.matrix.system.hive.bean.SysWorkBeatuistaff;
import com.matrix.system.hive.bean.SysWorktime;
-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;
@@ -54,7 +54,7 @@
if (strDate == null || strDate.equals("")) {
date = new Date();
} else {
- date = DateUtils.stringToDate(strDate.toString(), "yyyy-MM-dd");
+ date = DateUtil.stringToDate(strDate.toString(), "yyyy-MM-dd");
}
result.putInMap("dateTime", date);
@@ -110,7 +110,7 @@
if (strDate == null || strDate.equals("")) {
date = new Date();
} else {
- date = DateUtils.stringToDate(strDate, "yyyy-MM-dd");
+ date = DateUtil.stringToDate(strDate, "yyyy-MM-dd");
}
WebUtil.getRequest().setAttribute("dateTime", date);
@@ -168,7 +168,7 @@
int dateForm = Integer.parseInt(strDate);
- int curTime = Integer.parseInt(DateUtils.dateToString(new Date(), "yyyyMMdd"));
+ int curTime = Integer.parseInt(DateUtil.dateToString(new Date(), "yyyyMMdd"));
if (curTime > dateForm) {
return new AjaxResult(AjaxResult.STATUS_FAIL, "请选择大于当前时间下排班!");
@@ -188,7 +188,7 @@
int dateForm = Integer.parseInt(strDate);
- int curTime = Integer.parseInt(DateUtils.dateToString(new Date(), "yyyyMMdd"));
+ int curTime = Integer.parseInt(DateUtil.dateToString(new Date(), "yyyyMMdd"));
if (curTime > dateForm) {
return new AjaxResult(AjaxResult.STATUS_FAIL, "请选择大于当前时间下排班!");
@@ -204,7 +204,7 @@
AjaxResult getCurrentWorks() {
return new AjaxResult(AjaxResult.STATUS_SUCCESS,
sysWorkBeatuistaffService.findByDateStr(
- DateUtils.dateToString(new Date(), "yyyyMMdd"), getMe().getShopId()), 0);
+ DateUtil.dateToString(new Date(), "yyyyMMdd"), getMe().getShopId()), 0);
}
@@ -234,7 +234,7 @@
public @ResponseBody
AjaxResult getPaiBanBeauticianList(@RequestBody SysBeauticianState sysBeauticianState) {
// 根据时间获取一段排班码
- String panBanCodes = DateUtils.dateToString(sysBeauticianState.getBeginTime(),DateUtils.DATE_FORMAT_NO_SPLITE_DD);
+ String panBanCodes = DateUtil.dateToString(sysBeauticianState.getBeginTime(),DateUtil.DATE_FORMAT_NO_SPLITE_DD);
// 获取登陆的用户
SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
List<SysUsers> staffs=new ArrayList<>();
--
Gitblit v1.9.1