修改查询条件

This commit is contained in:
yangjun 2026-04-24 14:09:10 +08:00
parent 64d5b54ed0
commit eba12725e5
1 changed files with 11 additions and 11 deletions

View File

@ -461,24 +461,24 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl<NuBizSuppliersAp
BeanUtils.copyProperties(cgdMainEntityDto,nuInvoicingCgdMain);
Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
QueryWrapper<NuInvoicingCgdMain> queryWrapper = new QueryWrapper<>();
queryWrapper.apply(StringUtils.isNotBlank(cgdMainEntityDto.getCgdParamInfo()),"(cgd_no like '%"+cgdMainEntityDto.getCgdParamInfo()+"%' or gys_name like '%"+cgdMainEntityDto.getCgdParamInfo()+"%' or qg_by like '%"+cgdMainEntityDto.getCgdParamInfo()+"%' or gys_lxr like '%"+cgdMainEntityDto.getCgdParamInfo()+"%')");
queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getSuppliers()),"gys_id",cgdMainEntityDto.getSuppliers());
queryWrapper.eq(StringUtils.isNotBlank(cgdMainEntityDto.getCgBy()),"qg_by",cgdMainEntityDto.getCgBy());
queryWrapper.apply(StringUtils.isNotBlank(cgdMainEntityDto.getCgdParamInfo()),"(a.cgd_no like '%"+cgdMainEntityDto.getCgdParamInfo()+"%' or a.gys_name like '%"+cgdMainEntityDto.getCgdParamInfo()+"%' or a.qg_by like '%"+cgdMainEntityDto.getCgdParamInfo()+"%' or a.gys_lxr like '%"+cgdMainEntityDto.getCgdParamInfo()+"%')");
queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getGysId()),"a.gys_id",cgdMainEntityDto.getGysId());
queryWrapper.eq(StringUtils.isNotBlank(cgdMainEntityDto.getCgBy()),"a.qg_by",cgdMainEntityDto.getCgBy());
if(cgdMainEntityDto.getQgDate() != null){
queryWrapper.like("qg_date", DateUtils.formatDate(cgdMainEntityDto.getQgDate()));
queryWrapper.like("a.qg_date", DateUtils.formatDate(cgdMainEntityDto.getQgDate()));
}
queryWrapper.gt(StringUtils.isNotBlank(cgdMainEntityDto.getStartTime()),"qg_date",cgdMainEntityDto.getStartTime());
queryWrapper.lt(StringUtils.isNotBlank(cgdMainEntityDto.getEndTime()),"qg_date",cgdMainEntityDto.getEndTime());
queryWrapper.eq(StringUtils.isNotBlank(cgdMainEntityDto.getNuId()),"nu_id",cgdMainEntityDto.getNuId());
// queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getStatus()),"status",cgdMainEntityDto.getStatus());
queryWrapper.gt(StringUtils.isNotBlank(cgdMainEntityDto.getStartTime()),"a.qg_date",cgdMainEntityDto.getStartTime());
queryWrapper.lt(StringUtils.isNotBlank(cgdMainEntityDto.getEndTime()),"a.qg_date",cgdMainEntityDto.getEndTime());
queryWrapper.eq(StringUtils.isNotBlank(cgdMainEntityDto.getNuId()),"a.nu_id",cgdMainEntityDto.getNuId());
queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getStatus()),"a.status",cgdMainEntityDto.getStatus());
if(StringUtils.isNotBlank(cgdMainEntityDto.getCgdType())){
if (cgdMainEntityDto.getCgdType().indexOf(",")>-1){
queryWrapper.in("cgd_type",cgdMainEntityDto.getCgdType().split(","));
queryWrapper.in("a.cgd_type",cgdMainEntityDto.getCgdType().split(","));
}else if (cgdMainEntityDto.getCgdType().indexOf(",")==-1){
queryWrapper.eq("cgd_type",cgdMainEntityDto.getCgdType());
queryWrapper.eq("a.cgd_type",cgdMainEntityDto.getCgdType());
}
}
queryWrapper.orderByDesc("create_time");
queryWrapper.orderByDesc("a.create_time");
Page<NuInvoicingCgdMain> page = new Page<>(pageNo, pageSize);
List<NuInvoicingCgdMain> list = cgdMainMapper.selectList(page,queryWrapper);
IPage<CgdMainEntity> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());