DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决物流这块的导出表格问题

Browse Source
This commit is contained in:
Joshi
2025-07-30 16:15:56 +08:00
parent 73c1632f81
commit 68aa2b43c5
2 changed files with 59 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaExpressQuestionServiceImpl.java
View File

@@ -46,7 +46,7 @@ public class OaExpressQuestionServiceImpl implements IOaExpressQuestionService {
*/
@Override
public TableDataInfo<OaExpressQuestionVo> queryPageList(OaExpressQuestionBo bo, PageQuery pageQuery) {
QueryWrapper<OaExpressQuestion> lqw = buildQueryWrapper(bo);
QueryWrapper<OaExpressQuestion> lqw = buildQueryWrapperPlus(bo);
Page<OaExpressQuestionVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
@@ -56,11 +56,32 @@ public class OaExpressQuestionServiceImpl implements IOaExpressQuestionService {
*/
@Override
public List<OaExpressQuestionVo> queryList(OaExpressQuestionBo bo) {
QueryWrapper<OaExpressQuestion> lqw = buildQueryWrapper(bo);
LambdaQueryWrapper<OaExpressQuestion> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<OaExpressQuestion> buildQueryWrapper(OaExpressQuestionBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<OaExpressQuestion> lqw = new LambdaQueryWrapper<>();
private QueryWrapper<OaExpressQuestion> buildQueryWrapper(OaExpressQuestionBo bo) {
if (bo.getExpressId() != null) {
lqw.eq(OaExpressQuestion::getExpressId, bo.getExpressId());
}
if (StringUtils.isNotBlank(bo.getDescription())) {
lqw.eq(OaExpressQuestion::getDescription, bo.getDescription());
}
if (bo.getReportTime() != null) {
lqw.eq(OaExpressQuestion::getReportTime, bo.getReportTime());
}
if (StringUtils.isNotBlank(bo.getReportBy())) {
lqw.eq(OaExpressQuestion::getReportBy, bo.getReportBy());
}
if (bo.getStatus() != null) {
lqw.eq(OaExpressQuestion::getStatus, bo.getStatus());
}
return lqw;
}
private QueryWrapper<OaExpressQuestion> buildQueryWrapperPlus(OaExpressQuestionBo bo) {
Map<String, Object> params = bo.getParams();
QueryWrapper<OaExpressQuestion> qw = new QueryWrapper<>();
// 设置表别名

38
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaExpressServiceImpl.java
View File

@@ -49,7 +49,7 @@ public class OaExpressServiceImpl implements IOaExpressService {
*/
@Override
public TableDataInfo<OaExpressVo> queryPageList(OaExpressBo bo, PageQuery pageQuery) {
QueryWrapper<OaExpress> lqw = buildQueryWrapper(bo);
QueryWrapper<OaExpress> lqw = buildQueryWrapperPlus(bo);
Page<OaExpressVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
@@ -59,11 +59,43 @@ public class OaExpressServiceImpl implements IOaExpressService {
*/
@Override
public List<OaExpressVo> queryList(OaExpressBo bo) {
QueryWrapper<OaExpress> lqw = buildQueryWrapper(bo);
LambdaQueryWrapper<OaExpress> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<OaExpress> buildQueryWrapper(OaExpressBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<OaExpress> lqw = new LambdaQueryWrapper<>();
if (StringUtils.isNotBlank(bo.getExpressCode())) {
lqw.like(OaExpress::getExpressCode, bo.getExpressCode());
}
if (bo.getStatus() != null) {
lqw.eq(OaExpress::getStatus, bo.getStatus());
}
if (StringUtils.isNotBlank(bo.getSupplyName())) {
lqw.like(OaExpress::getSupplyName, bo.getSupplyName());
}
if (StringUtils.isNotBlank(bo.getSupplyPhone())) {
lqw.eq(OaExpress::getSupplyPhone, bo.getSupplyPhone());
}
if (bo.getOwnerId() != null) {
lqw.eq(OaExpress::getOwnerId, bo.getOwnerId());
}
if (StringUtils.isNotBlank(bo.getOwnerPhone())) {
lqw.eq(OaExpress::getOwnerPhone, bo.getOwnerPhone());
}
if (bo.getPlanDate() != null) {
lqw.eq(OaExpress::getPlanDate, bo.getPlanDate());
}
if (bo.getProjectId() != null) {
lqw.eq(OaExpress::getProjectId, bo.getProjectId());
}
if (StringUtils.isNotBlank(bo.getExpressType())) {
lqw.eq(OaExpress::getExpressType, bo.getExpressType());
}
return lqw;
}
private QueryWrapper<OaExpress> buildQueryWrapper(OaExpressBo bo) {
private QueryWrapper<OaExpress> buildQueryWrapperPlus(OaExpressBo bo) {
Map<String, Object> params = bo.getParams();
QueryWrapper<OaExpress> qw = new QueryWrapper<>();
// 设置表别名