yangys
2024-09-28 fb07898570fe9739faec88e37624400e9362eff5
去掉生产日历查询错误
已修改1个文件
4 ■■■ 文件已修改
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/ShiftOffDayServiceImpl.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/ShiftOffDayServiceImpl.java
@@ -66,9 +66,7 @@
        LocalDate endOffDay = vo.getEndOffDay();
        LambdaQueryWrapper<ShiftOffDay> wrapper = Wrappers.lambdaQuery();
        Integer year = vo.getYear();
        wrapper.eq(Func.isNotEmpty(year), (v0) -> {
            return v0.getYear();
        }, year);
        wrapper.eq(Func.isNotEmpty(year), ShiftOffDay::getYear, year);
        if (!Func.isNull(startOffDay) && !Func.isNull(endOffDay)) {
            wrapper.nested(c -> c.ge(ShiftOffDay::getStartOffDay, startOffDay).le(ShiftOffDay::getEndOffDay, endOffDay)); 
            /*