光纤配置三层架构+辅助工时的审核与批准逻辑修改

zss

2024-05-30 b8045b11ca8af95cb5aeba464bff589e0b9f53b8

 performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java

@@ -96,8 +96,7 @@
            } else {
                map.put("body", auxiliaryWorkingHoursDayMapper.selectAuxiliaryWorkingHoursDay(page, QueryWrappers.queryWrappers(auxiliaryWorkingHoursDayDto).ge("date_time", split[0]).le("date_time", split[1] + " 23:59:59"), ids));
            }
        }
        else {
        } else {
            map.put("body", auxiliaryWorkingHoursDayMapper.selectAuxiliaryWorkingHoursDay(page, QueryWrappers.queryWrappers(auxiliaryWorkingHoursDayDto), ids));
        }
        return map;
@@ -127,18 +126,17 @@

    //审核/批准
    @Override
    public int checkOrApprove(Integer id, String state) {
        AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay = auxiliaryWorkingHoursDayMapper.selectById(id);
        auxiliaryWorkingHoursDay.setState(state);
    public int checkOrApprove(AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay) {
        if (auxiliaryWorkingHoursDay.getState().equals("已审核")) {
            Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
            auxiliaryWorkingHoursDay.setReviewer(userMapper.selectById(userId).getName());
        }
        return auxiliaryWorkingHoursDayMapper.updateById(auxiliaryWorkingHoursDay);
    }

    //编辑
    @Override
    public int updateAuxiliaryWorkingHoursDay(AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay) {
        if (!auxiliaryWorkingHoursDay.getState().equals("已提交")) {
            throw new RuntimeException("该数据已经批准或已审核,无法进行编辑!");
        }
        Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
        auxiliaryWorkingHoursDay.setNameUser(userId);//姓名id
        return auxiliaryWorkingHoursDayMapper.updateById(auxiliaryWorkingHoursDay);