blame | history | patch | commit | commitdiff | ignore whitespace
935090232@qq.com
2021-05-08 6924e965ea3da70823f50f7285b50efab7205415 
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java


@@ -879,6 +879,8 @@


        if (skipServiceOrderStep(Dictionary.SERVICE_OVER_BEGIN_END)) {


            projServices.setStartTime(new Date());


            projServices.setState(Dictionary.SERVICE_STATU_FWWC);


        } else {


            projServices.setState(Dictionary.SERVICE_STATU_PLWC);


        }


        // 释放床位资源


//        SysBedState checkBedState = sysBedStateDao.selectBySerIdAndBedId(projServices.getBedId(), projServices.getId());


@@ -1021,7 +1023,8 @@


    /**


     * 跳过服务单某步骤


     */


    private boolean skipServiceOrderStep(String step) {


    @Override


    public boolean skipServiceOrderStep(String step) {


        SysUsers users = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);


        ParameterSettings ps = new ParameterSettings();


        ps.setCompanyId(users.getCompanyId());