blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
xiangpei
2024-03-13 10df3eebf12aa53fe2f66af2dc75fcd0ef12251c 
 ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java


@@ -5,6 +5,7 @@


import com.ycl.platform.mapper.YwPointMapper;


import com.ycl.platform.mapper.YwUnitMapper;


import com.ycl.platform.service.YwPointService;


import com.ycl.platform.service.YwUnitService;


import com.ycl.system.Result;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import com.ycl.platform.domain.form.YwPointForm;


@@ -12,8 +13,13 @@


import com.ycl.platform.domain.query.YwPointQuery;


import java.util.List;




import com.ycl.system.entity.SysDept;


import com.ycl.system.service.ISysDeptService;


import org.apache.commons.lang3.StringUtils;




import com.baomidou.mybatisplus.core.metadata.IPage;


import com.ycl.system.page.PageUtil;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Service;


import org.springframework.security.core.context.SecurityContextHolder;


import org.springframework.beans.BeanUtils;


@@ -37,6 +43,10 @@


public class YwPointServiceImpl extends ServiceImpl<YwPointMapper, YwPoint> implements YwPointService {




    private final YwPointMapper ywPointMapper;


    @Autowired


    private ISysDeptService deptService;


    @Autowired


    private YwUnitService unitService;


    private final YwUnitMapper ywUnitMapper;




    /**


@@ -125,14 +135,12 @@




        List<YwPointVO> vos = page.getRecords().stream()


                .map(


                        entity -> {


                            YwPointVO vo = YwPointVO.getVoByEntity(entity, null);


                            YwUnit unit = ywUnitMapper.selectById(vo.getUnitId());


                            vo.setUnitName(unit.getUnitName());


                            return vo;


                        }


                        entity -> YwPointVO.getVoByEntity(entity, null)


                                .setDeptName(deptService.selectDeptById(entity.getDeptId()).getDeptName())


                                .setUnitName(unitService.getById(entity.getUnitId()).getUnitName())


                )


                .collect(Collectors.toList());




        return Result.ok().data(vos).total(page.getTotal());


    }