modify

Helius

2020-12-27 8eda088db63ff198cbcd51bf0599531ed006cb84

 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();