modify

Helius

2020-12-23 c554c7ad5405bafa149dbb6429e8245f78b33ffc

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