智能地磅的模糊查询

This commit is contained in:
Administrator 2023-03-30 10:31:26 +08:00
parent 93465924e0
commit 166a4c1cb3
4 changed files with 216 additions and 201 deletions

View File

@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.weight.controller;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -14,6 +15,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ExportParams;
@ -66,9 +68,11 @@ public class GoodsNameController {
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
Result<IPage<GoodsName>> result = new Result<IPage<GoodsName>>(); Result<IPage<GoodsName>> result = new Result<IPage<GoodsName>>();
QueryWrapper<GoodsName> queryWrapper = QueryGenerator.initQueryWrapper(goodsName, req.getParameterMap()); LambdaQueryWrapper<GoodsName> lambdaQueryWrapper = new LambdaQueryWrapper<GoodsName>()
.eq(StringUtils.isNotBlank(goodsName.getProjectSn()),GoodsName::getProjectSn,goodsName.getProjectSn())
.like(StringUtils.isNotBlank(goodsName.getGoodsName()),GoodsName::getGoodsName,goodsName.getGoodsName());
Page<GoodsName> page = new Page<GoodsName>(pageNo, pageSize); Page<GoodsName> page = new Page<GoodsName>(pageNo, pageSize);
IPage<GoodsName> pageList = goodsNameService.page(page, queryWrapper); IPage<GoodsName> pageList = goodsNameService.page(page, lambdaQueryWrapper);
result.setSuccess(true); result.setSuccess(true);
result.setResult(pageList); result.setResult(pageList);
return result; return result;

View File

@ -2,7 +2,7 @@ package com.zhgd.xmgl.modules.weight.controller;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -15,6 +15,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ExportParams;
@ -67,9 +68,12 @@ public class ReceivingForwardingUnitController {
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
Result<IPage<ReceivingForwardingUnit>> result = new Result<IPage<ReceivingForwardingUnit>>(); Result<IPage<ReceivingForwardingUnit>> result = new Result<IPage<ReceivingForwardingUnit>>();
QueryWrapper<ReceivingForwardingUnit> queryWrapper = QueryGenerator.initQueryWrapper(receivingForwardingUnit, req.getParameterMap()); LambdaQueryWrapper<ReceivingForwardingUnit> lambdaQueryWrapper = new LambdaQueryWrapper<ReceivingForwardingUnit>()
.eq(StringUtils.isNotBlank(receivingForwardingUnit.getProjectSn()), ReceivingForwardingUnit::getProjectSn, receivingForwardingUnit.getProjectSn())
.eq(receivingForwardingUnit.getType() != null, ReceivingForwardingUnit::getType, receivingForwardingUnit.getType())
.like(StringUtils.isNotBlank(receivingForwardingUnit.getUnitName()), ReceivingForwardingUnit::getUnitName, receivingForwardingUnit.getUnitName());
Page<ReceivingForwardingUnit> page = new Page<ReceivingForwardingUnit>(pageNo, pageSize); Page<ReceivingForwardingUnit> page = new Page<ReceivingForwardingUnit>(pageNo, pageSize);
IPage<ReceivingForwardingUnit> pageList = receivingForwardingUnitService.page(page, queryWrapper); IPage<ReceivingForwardingUnit> pageList = receivingForwardingUnitService.page(page, lambdaQueryWrapper);
result.setSuccess(true); result.setSuccess(true);
result.setResult(pageList); result.setResult(pageList);
return result; return result;

View File

@ -4,6 +4,7 @@ import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -69,10 +70,14 @@ public class WeighBookVehicleInfoController {
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<IPage<WeighBookVehicleInfo>> queryPageList(WeighBookVehicleInfo weighBookVehicleInfo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, String lastAdddatetime, HttpServletRequest req) { public Result<IPage<WeighBookVehicleInfo>> queryPageList(WeighBookVehicleInfo weighBookVehicleInfo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, String lastAdddatetime, HttpServletRequest req) {
Result<IPage<WeighBookVehicleInfo>> result = new Result<IPage<WeighBookVehicleInfo>>(); Result<IPage<WeighBookVehicleInfo>> result = new Result<IPage<WeighBookVehicleInfo>>();
QueryWrapper<WeighBookVehicleInfo> queryWrapper = QueryGenerator.initQueryWrapper(weighBookVehicleInfo, req.getParameterMap()); LambdaQueryWrapper<WeighBookVehicleInfo> queryWrapper = new LambdaQueryWrapper<WeighBookVehicleInfo>()
.eq(StringUtils.isNotBlank(weighBookVehicleInfo.getProjectSn()),WeighBookVehicleInfo::getProjectSn,weighBookVehicleInfo.getProjectSn())
.like(StringUtils.isNotBlank(weighBookVehicleInfo.getSpecifications()),WeighBookVehicleInfo::getSpecifications,weighBookVehicleInfo.getSpecifications())
.like(StringUtils.isNotBlank(weighBookVehicleInfo.getGoodsName()),WeighBookVehicleInfo::getGoodsName,weighBookVehicleInfo.getGoodsName())
.like(StringUtils.isNotBlank(weighBookVehicleInfo.getLicensePlate()),WeighBookVehicleInfo::getLicensePlate,weighBookVehicleInfo.getLicensePlate());
if (StringUtils.isNotBlank(lastAdddatetime)) { if (StringUtils.isNotBlank(lastAdddatetime)) {
DateTime dateTime = DateUtil.parse(lastAdddatetime); DateTime dateTime = DateUtil.parse(lastAdddatetime);
queryWrapper.lambda().ge(WeighBookVehicleInfo::getAddDateTime, dateTime); queryWrapper.ge(WeighBookVehicleInfo::getAddDateTime, dateTime);
} }
Page<WeighBookVehicleInfo> page = new Page<WeighBookVehicleInfo>(pageNo, pageSize); Page<WeighBookVehicleInfo> page = new Page<WeighBookVehicleInfo>(pageNo, pageSize);
IPage<WeighBookVehicleInfo> pageList = weighBookVehicleInfoService.page(page, queryWrapper); IPage<WeighBookVehicleInfo> pageList = weighBookVehicleInfoService.page(page, queryWrapper);

View File

@ -6,12 +6,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.xmgl.modules.weight.entity.WeighInfo; import com.zhgd.xmgl.modules.weight.entity.WeighInfo;
import com.zhgd.xmgl.modules.weight.entity.WeighPic; import com.zhgd.xmgl.modules.weight.entity.WeighPic;
import com.zhgd.xmgl.modules.weight.mapper.WeighInfoMapper; import com.zhgd.xmgl.modules.weight.mapper.WeighInfoMapper;
import com.zhgd.xmgl.modules.weight.mapper.WeighPicMapper; import com.zhgd.xmgl.modules.weight.mapper.WeighPicMapper;
import com.zhgd.xmgl.modules.weight.service.IWeighInfoService; import com.zhgd.xmgl.modules.weight.service.IWeighInfoService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
@ -37,7 +37,9 @@ public class WeighInfoServiceImpl extends ServiceImpl<WeighInfoMapper, WeighInfo
@Override @Override
public Result<IPage<WeighInfo>> queryPageList(WeighInfo weighInfo, Integer pageNo, Integer pageSize, HttpServletRequest req) { public Result<IPage<WeighInfo>> queryPageList(WeighInfo weighInfo, Integer pageNo, Integer pageSize, HttpServletRequest req) {
Result<IPage<WeighInfo>> result = new Result<>(); Result<IPage<WeighInfo>> result = new Result<>();
QueryWrapper<WeighInfo> queryWrapper = QueryGenerator.initQueryWrapper(weighInfo, req.getParameterMap()); LambdaQueryWrapper<WeighInfo> queryWrapper = new QueryWrapper<WeighInfo>().lambda()
.like(StringUtils.isNotBlank(weighInfo.getLicensePlate()), WeighInfo::getLicensePlate, weighInfo.getLicensePlate())
.eq(StringUtils.isNotBlank(weighInfo.getProjectSn()), WeighInfo::getProjectSn, weighInfo.getProjectSn());
Page<WeighInfo> page = new Page<WeighInfo>(pageNo, pageSize); Page<WeighInfo> page = new Page<WeighInfo>(pageNo, pageSize);
IPage<WeighInfo> pageList = page(page, queryWrapper); IPage<WeighInfo> pageList = page(page, queryWrapper);
if (!CollectionUtils.isEmpty(pageList.getRecords())) { if (!CollectionUtils.isEmpty(pageList.getRecords())) {