lims项目框架修改优化--后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
zouyu
21 小时以前 675af262e4e511c9a240d9c1fa3332d1dc8d0c42 
 performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java


@@ -68,7 +68,7 @@


        auxiliaryWorkingHoursDayDto.setDateTime(null);


        auxiliaryWorkingHoursDayDto.setWeek(null);


        Map<String, Object> map = new HashMap<>();


        List<Long> ids = new ArrayList<>();


        List<Integer> ids = new ArrayList<>();


        if (ids.size() == 0) {


            ids = null;


        }


@@ -104,7 +104,7 @@


        } else {


            IPage<AuxiliaryWorkingHoursDayDto> auxiliaryWorkingHoursDayDtoIPage = auxiliaryWorkingHoursDayMapper.selectAuxiliaryWorkingHoursDay(page, QueryWrappers.queryWrappers(auxiliaryWorkingHoursDayDto), ids);


            for (AuxiliaryWorkingHoursDayDto record : auxiliaryWorkingHoursDayDtoIPage.getRecords()) {


                record.setDateTime(record.getDateTime().substring(0, 10));


                record.setDateTime(ObjectUtils.isEmpty(record.getDateTime())? null : record.getDateTime().substring(0, 10));


            }


            return auxiliaryWorkingHoursDayDtoIPage;


        }


@@ -151,8 +151,8 @@


    //编辑


    @Override


    public int updateAuxiliaryWorkingHoursDay(AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay) {


        Integer userId = SecurityUtils.getUserId().intValue();


        auxiliaryWorkingHoursDay.setNameUser(userId);//姓名id


//        Integer userId = SecurityUtils.getUserId().intValue();


//        auxiliaryWorkingHoursDay.setNameUser(userId);//姓名id


        return auxiliaryWorkingHoursDayMapper.updateById(auxiliaryWorkingHoursDay);


    }




@@ -184,7 +184,7 @@


        String week = auxiliaryWorkingHoursDayDto.getWeek();


        auxiliaryWorkingHoursDayDto.setDateTime(null);


        auxiliaryWorkingHoursDayDto.setWeek(null);


        List<Long> ids = new ArrayList<>();


        List<Integer> ids = new ArrayList<>();


        String name = auxiliaryWorkingHoursDayDto.getName();


        if (ObjectUtils.isNotEmpty(name)) {


            ids.addAll(userMapper.selectList(Wrappers.<User>lambdaQuery().like(User::getName, name)).stream().map(User::getId).collect(Collectors.toList()));