|
@@ -5,16 +5,22 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.fdkankan.manage.common.PageInfo;
|
|
|
import com.fdkankan.manage.entity.ServiceUpTip;
|
|
|
+import com.fdkankan.manage.entity.SysUser;
|
|
|
import com.fdkankan.manage.mapper.IServiceUpTipMapper;
|
|
|
import com.fdkankan.manage.service.IServiceUpTipService;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
+import com.fdkankan.manage.service.ISysUserService;
|
|
|
import com.fdkankan.manage.util.Dateutils;
|
|
|
import com.fdkankan.manage.vo.request.ServiceUPTipParam;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.util.Date;
|
|
|
+import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
+import java.util.Set;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* <p>
|
|
@@ -27,6 +33,9 @@ import java.util.List;
|
|
|
@Service
|
|
|
public class ServiceUpTipServiceImpl extends ServiceImpl<IServiceUpTipMapper, ServiceUpTip> implements IServiceUpTipService {
|
|
|
|
|
|
+ @Autowired
|
|
|
+ ISysUserService sysUserService;
|
|
|
+
|
|
|
@Override
|
|
|
public Object pageList(ServiceUPTipParam param) {
|
|
|
LambdaQueryWrapper<ServiceUpTip> wrapper = new LambdaQueryWrapper<>();
|
|
@@ -37,7 +46,17 @@ public class ServiceUpTipServiceImpl extends ServiceImpl<IServiceUpTipMapper, Se
|
|
|
wrapper.orderByAsc(ServiceUpTip::getBanStatus);
|
|
|
wrapper.orderByDesc(ServiceUpTip::getVersion);
|
|
|
Page<ServiceUpTip> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
|
|
|
+ Set<Long> sysUserIds = page.getRecords().stream().map(ServiceUpTip::getSysUserId).collect(Collectors.toSet());
|
|
|
+ HashMap<Long, SysUser> sysUserMap = sysUserService.getByIds(sysUserIds);
|
|
|
|
|
|
+ for (ServiceUpTip record : page.getRecords()) {
|
|
|
+ if(record.getSysUserId() != null){
|
|
|
+ SysUser sysUser = sysUserMap.get(record.getSysUserId());
|
|
|
+ if(sysUser !=null){
|
|
|
+ record.setCreateName(sysUser.getNickName());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
return PageInfo.PageInfo(page);
|
|
|
}
|
|
|
|