zhuo
2025-03-26 d9a3f29203bf2cefeedb23766b79906d2b37abdc
performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryOriginalHoursServiceImpl.java
@@ -58,7 +58,7 @@
    @Override
    public IPage<AuxiliaryOriginalHoursDto> selectAuxiliaryOriginalHours(Page page, AuxiliaryOriginalHoursLookDto auxiliaryOriginalHoursLookDto) {
        List<Long> ids = new ArrayList<>();
        List<Integer> ids = new ArrayList<>();
        String departLims = auxiliaryOriginalHoursLookDto.getDepartLims();
        auxiliaryOriginalHoursLookDto.setDepartLims(null);
        String name = auxiliaryOriginalHoursLookDto.getName();
@@ -207,7 +207,7 @@
        if (StringUtils.isBlank(dto.getMonth())) {
            throw new BaseException("缺少月份");
        }
        List<Long> userIds = new ArrayList<>();
        List<Integer> userIds = new ArrayList<>();
        String name = dto.getName();
        if (ObjectUtils.isNotEmpty(name)) {
@@ -226,10 +226,10 @@
        DateTimeFormatter outputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
        String beginDate = previousMonth26th.atStartOfDay().format(outputFormatter);
        String endDate = currentMonth25th.atStartOfDay().format(outputFormatter);
//        dto.setBeginDate(beginDate + " 00:00:00");
//        dto.setEndDate(endDate + " 23:59:59");
        dto.setBeginDate(beginDate);
        dto.setEndDate(endDate);
        dto.setBeginDate(beginDate + " 00:00:00");
        dto.setEndDate(endDate + " 23:59:59");
        dto.setAssistBeginDate(beginDate);
        dto.setAssistEndDate(endDate);
        // 查询产量工时