微调
This commit is contained in:
@@ -12,14 +12,12 @@ import com.njcn.advance.mapper.assess.AssessUserMapper;
|
|||||||
import com.njcn.advance.pojo.param.assess.AssessUserQuery;
|
import com.njcn.advance.pojo.param.assess.AssessUserQuery;
|
||||||
import com.njcn.advance.pojo.po.assess.AssessUser;
|
import com.njcn.advance.pojo.po.assess.AssessUser;
|
||||||
import com.njcn.advance.service.assess.IAssessUserService;
|
import com.njcn.advance.service.assess.IAssessUserService;
|
||||||
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
|
import com.njcn.user.api.DeptFeignClient;
|
||||||
import com.njcn.common.utils.HttpResultUtil;
|
|
||||||
import com.njcn.web.factory.PageFactory;
|
import com.njcn.web.factory.PageFactory;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <p>
|
* <p>
|
||||||
@@ -30,12 +28,15 @@ import java.util.List;
|
|||||||
* @since 2025-06-06
|
* @since 2025-06-06
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
public class AssessUserServiceImpl extends ServiceImpl<AssessUserMapper, AssessUser> implements IAssessUserService {
|
public class AssessUserServiceImpl extends ServiceImpl<AssessUserMapper, AssessUser> implements IAssessUserService {
|
||||||
|
|
||||||
|
private final DeptFeignClient deptFeignClient;
|
||||||
@Override
|
@Override
|
||||||
public Page<AssessUser> page(AssessUserQuery assessUserQuery) {
|
public Page<AssessUser> page(AssessUserQuery assessUserQuery) {
|
||||||
Page<AssessUser> pageParam = new Page<>(PageFactory.getPageNum(assessUserQuery), PageFactory.getPageSize(assessUserQuery));
|
Page<AssessUser> pageParam = new Page<>(PageFactory.getPageNum(assessUserQuery), PageFactory.getPageSize(assessUserQuery));
|
||||||
LambdaQueryWrapper<AssessUser> wrapper = Wrappers.<AssessUser>lambdaQuery()
|
LambdaQueryWrapper<AssessUser> wrapper = Wrappers.<AssessUser>lambdaQuery()
|
||||||
|
.in(AssessUser::getDeptId,deptFeignClient.getDepSonIdtByDeptId(assessUserQuery.getDeptId()).getData())
|
||||||
.eq(StrUtil.isNotBlank(assessUserQuery.getDeptName()), AssessUser::getDeptName, assessUserQuery.getDeptName())
|
.eq(StrUtil.isNotBlank(assessUserQuery.getDeptName()), AssessUser::getDeptName, assessUserQuery.getDeptName())
|
||||||
.in(CollUtil.isNotEmpty(assessUserQuery.getBusScaleList()),AssessUser::getBusId,assessUserQuery.getBusScaleList())
|
.in(CollUtil.isNotEmpty(assessUserQuery.getBusScaleList()),AssessUser::getBusId,assessUserQuery.getBusScaleList())
|
||||||
.in(CollUtil.isNotEmpty(assessUserQuery.getPowerstationScaleList()),AssessUser::getPowerstationScale,assessUserQuery.getPowerstationScaleList())
|
.in(CollUtil.isNotEmpty(assessUserQuery.getPowerstationScaleList()),AssessUser::getPowerstationScale,assessUserQuery.getPowerstationScaleList())
|
||||||
|
|||||||
Reference in New Issue
Block a user