fix some bugs

wzy

2020-12-14 b6471f2d1a2753e0a44aae480ffe733207c79c6a

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java

@@ -12,7 +12,7 @@
import com.matrix.system.constance.Dictionary;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.plugin.util.DateUtils;
import com.matrix.core.tools.DateUtil;
import com.matrix.system.hive.plugin.util.MoneyUtil;
import com.matrix.system.hive.pojo.MyBeauticianCount;
import com.matrix.system.hive.service.*;
@@ -324,13 +324,13 @@
        // 验证床位排班时间是否正确

        SysBedState sysBedState = projServices.getBedState();
        sysBedState.setEndTime(DateUtils.getNextNMinute(sysBedState.getStartTime(), projServices.getTotalTime()));
        sysBedState.setEndTime(DateUtil.getNextNMinute(sysBedState.getStartTime(), projServices.getTotalTime()));
        sysBedState.setBedId(projServices.getBedId());
        sysBedState.setServiceId((projServices.getId()));
        sysBedState.setBedState(Dictionary.BED_STATE_SYZ);

        for (SysBeauticianState beauticianState : projServices.getServiceItems()) {
            if (DateUtils.isAffterDate(beauticianState.getEndTime(), beauticianState.getBeginTime())) {
            if (DateUtil.isAffterDate(beauticianState.getEndTime(), beauticianState.getBeginTime())) {
                throw new GlobleException("美疗师的排班结束时间不能晚于美疗师排班的开始时间!");
            }
        }
@@ -709,7 +709,7 @@
            }
            checkprojServices.setEndTime(new Date());
            // 计算时差
            long minspace = DateUtils.getDifTimeMin(checkprojServices.getStartTime(), checkprojServices.getEndTime())
            long minspace = DateUtil.getDifTimeMin(checkprojServices.getStartTime(), checkprojServices.getEndTime())
                    - checkprojServices.getTotalTime();
            // 判断是服务超时还是服务提前结束，如果minspace大于0则是超时服务，小于0则是提前结束服务
            checkprojServices.setIsOverTime(minspace + "");