智能地磅的模糊查询
This commit is contained in:
parent
93465924e0
commit
166a4c1cb3
@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.weight.controller;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
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.metadata.IPage;
|
||||
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.ApiOperation;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
||||
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
||||
import org.jeecgframework.poi.excel.entity.ExportParams;
|
||||
@ -66,9 +68,11 @@ public class GoodsNameController {
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
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);
|
||||
IPage<GoodsName> pageList = goodsNameService.page(page, queryWrapper);
|
||||
IPage<GoodsName> pageList = goodsNameService.page(page, lambdaQueryWrapper);
|
||||
result.setSuccess(true);
|
||||
result.setResult(pageList);
|
||||
return result;
|
||||
|
||||
@ -2,7 +2,7 @@ package com.zhgd.xmgl.modules.weight.controller;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
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.metadata.IPage;
|
||||
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.ApiOperation;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
||||
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
||||
import org.jeecgframework.poi.excel.entity.ExportParams;
|
||||
@ -48,210 +49,213 @@ import java.util.Map;
|
||||
@Slf4j
|
||||
@Api(tags = "ReceivingForwardingUnitController相关Api")
|
||||
public class ReceivingForwardingUnitController {
|
||||
@Autowired
|
||||
private IReceivingForwardingUnitService receivingForwardingUnitService;
|
||||
@Autowired
|
||||
private IReceivingForwardingUnitService receivingForwardingUnitService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param receivingForwardingUnit
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value = " 分页列表查询收发货单位信息", notes = "分页列表查询收发货单位信息", httpMethod = "GET")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<ReceivingForwardingUnit>> queryPageList(ReceivingForwardingUnit receivingForwardingUnit,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
Result<IPage<ReceivingForwardingUnit>> result = new Result<IPage<ReceivingForwardingUnit>>();
|
||||
QueryWrapper<ReceivingForwardingUnit> queryWrapper = QueryGenerator.initQueryWrapper(receivingForwardingUnit, req.getParameterMap());
|
||||
Page<ReceivingForwardingUnit> page = new Page<ReceivingForwardingUnit>(pageNo, pageSize);
|
||||
IPage<ReceivingForwardingUnit> pageList = receivingForwardingUnitService.page(page, queryWrapper);
|
||||
result.setSuccess(true);
|
||||
result.setResult(pageList);
|
||||
return result;
|
||||
}
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param receivingForwardingUnit
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value = " 分页列表查询收发货单位信息", notes = "分页列表查询收发货单位信息", httpMethod = "GET")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<ReceivingForwardingUnit>> queryPageList(ReceivingForwardingUnit receivingForwardingUnit,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
Result<IPage<ReceivingForwardingUnit>> result = new Result<IPage<ReceivingForwardingUnit>>();
|
||||
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);
|
||||
IPage<ReceivingForwardingUnit> pageList = receivingForwardingUnitService.page(page, lambdaQueryWrapper);
|
||||
result.setSuccess(true);
|
||||
result.setResult(pageList);
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param receivingForwardingUnit
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value = " 添加收发货单位信息", notes = "添加收发货单位信息", httpMethod = "POST")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<ReceivingForwardingUnit> add(@RequestBody ReceivingForwardingUnit receivingForwardingUnit) {
|
||||
Result<ReceivingForwardingUnit> result = new Result<ReceivingForwardingUnit>();
|
||||
try {
|
||||
receivingForwardingUnitService.save(receivingForwardingUnit);
|
||||
result.success("添加成功!");
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
log.info(e.getMessage());
|
||||
result.error500("操作失败");
|
||||
}
|
||||
return result;
|
||||
}
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param receivingForwardingUnit
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value = " 添加收发货单位信息", notes = "添加收发货单位信息", httpMethod = "POST")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<ReceivingForwardingUnit> add(@RequestBody ReceivingForwardingUnit receivingForwardingUnit) {
|
||||
Result<ReceivingForwardingUnit> result = new Result<ReceivingForwardingUnit>();
|
||||
try {
|
||||
receivingForwardingUnitService.save(receivingForwardingUnit);
|
||||
result.success("添加成功!");
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
log.info(e.getMessage());
|
||||
result.error500("操作失败");
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param receivingForwardingUnit
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value = "编辑收发货单位信息", notes = "编辑收发货单位信息", httpMethod = "POST")
|
||||
@PostMapping(value = "/edit")
|
||||
public Result<ReceivingForwardingUnit> edit(@RequestBody ReceivingForwardingUnit receivingForwardingUnit) {
|
||||
Result<ReceivingForwardingUnit> result = new Result<ReceivingForwardingUnit>();
|
||||
ReceivingForwardingUnit receivingForwardingUnitEntity = receivingForwardingUnitService.getById(receivingForwardingUnit.getId());
|
||||
if (receivingForwardingUnitEntity == null) {
|
||||
result.error500("未找到对应实体");
|
||||
} else {
|
||||
receivingForwardingUnitService.updateById(receivingForwardingUnit);
|
||||
result.success("修改成功!");
|
||||
}
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param receivingForwardingUnit
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value = "编辑收发货单位信息", notes = "编辑收发货单位信息", httpMethod = "POST")
|
||||
@PostMapping(value = "/edit")
|
||||
public Result<ReceivingForwardingUnit> edit(@RequestBody ReceivingForwardingUnit receivingForwardingUnit) {
|
||||
Result<ReceivingForwardingUnit> result = new Result<ReceivingForwardingUnit>();
|
||||
ReceivingForwardingUnit receivingForwardingUnitEntity = receivingForwardingUnitService.getById(receivingForwardingUnit.getId());
|
||||
if (receivingForwardingUnitEntity == null) {
|
||||
result.error500("未找到对应实体");
|
||||
} else {
|
||||
receivingForwardingUnitService.updateById(receivingForwardingUnit);
|
||||
result.success("修改成功!");
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value = "删除收发货单位信息", notes = "删除收发货单位信息", httpMethod = "POST")
|
||||
@PostMapping(value = "/delete")
|
||||
public Result<ReceivingForwardingUnit> delete(@RequestBody String id) {
|
||||
JSONObject jsonObject = JSON.parseObject(id, JSONObject.class);
|
||||
id = String.valueOf(jsonObject.get("id"));
|
||||
Result<ReceivingForwardingUnit> result = new Result<ReceivingForwardingUnit>();
|
||||
ReceivingForwardingUnit receivingForwardingUnit = receivingForwardingUnitService.getById(id);
|
||||
if (receivingForwardingUnit == null) {
|
||||
result.error500("未找到对应实体");
|
||||
} else {
|
||||
boolean ok = receivingForwardingUnitService.removeById(id);
|
||||
if (ok) {
|
||||
result.success("删除成功!");
|
||||
}
|
||||
}
|
||||
/**
|
||||
* 通过id删除
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value = "删除收发货单位信息", notes = "删除收发货单位信息", httpMethod = "POST")
|
||||
@PostMapping(value = "/delete")
|
||||
public Result<ReceivingForwardingUnit> delete(@RequestBody String id) {
|
||||
JSONObject jsonObject = JSON.parseObject(id, JSONObject.class);
|
||||
id = String.valueOf(jsonObject.get("id"));
|
||||
Result<ReceivingForwardingUnit> result = new Result<ReceivingForwardingUnit>();
|
||||
ReceivingForwardingUnit receivingForwardingUnit = receivingForwardingUnitService.getById(id);
|
||||
if (receivingForwardingUnit == null) {
|
||||
result.error500("未找到对应实体");
|
||||
} else {
|
||||
boolean ok = receivingForwardingUnitService.removeById(id);
|
||||
if (ok) {
|
||||
result.success("删除成功!");
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param ids
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value = "批量删除收发货单位信息", notes = "批量删除收发货单位信息", httpMethod = "POST")
|
||||
@ApiImplicitParam(name = "id", value = "收发货单位ID字符串", paramType = "query", required = true, dataType = "String")
|
||||
@PostMapping(value = "/deleteBatch")
|
||||
public Result<ReceivingForwardingUnit> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||
Result<ReceivingForwardingUnit> result = new Result<ReceivingForwardingUnit>();
|
||||
if (ids == null || "".equals(ids.trim())) {
|
||||
result.error500("参数不识别!");
|
||||
} else {
|
||||
this.receivingForwardingUnitService.removeByIds(Arrays.asList(ids.split(",")));
|
||||
result.success("删除成功!");
|
||||
}
|
||||
return result;
|
||||
}
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param ids
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value = "批量删除收发货单位信息", notes = "批量删除收发货单位信息", httpMethod = "POST")
|
||||
@ApiImplicitParam(name = "id", value = "收发货单位ID字符串", paramType = "query", required = true, dataType = "String")
|
||||
@PostMapping(value = "/deleteBatch")
|
||||
public Result<ReceivingForwardingUnit> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||
Result<ReceivingForwardingUnit> result = new Result<ReceivingForwardingUnit>();
|
||||
if (ids == null || "".equals(ids.trim())) {
|
||||
result.error500("参数不识别!");
|
||||
} else {
|
||||
this.receivingForwardingUnitService.removeByIds(Arrays.asList(ids.split(",")));
|
||||
result.success("删除成功!");
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value = "通过id查询收发货单位信息", notes = "通过id查询收发货单位信息", httpMethod = "GET")
|
||||
@ApiImplicitParam(name = "id", value = "收发货单位ID", paramType = "query", required = true, dataType = "Integer")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<ReceivingForwardingUnit> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
Result<ReceivingForwardingUnit> result = new Result<ReceivingForwardingUnit>();
|
||||
ReceivingForwardingUnit receivingForwardingUnit = receivingForwardingUnitService.getById(id);
|
||||
if (receivingForwardingUnit == null) {
|
||||
result.error500("未找到对应实体");
|
||||
} else {
|
||||
result.setResult(receivingForwardingUnit);
|
||||
result.setSuccess(true);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value = "通过id查询收发货单位信息", notes = "通过id查询收发货单位信息", httpMethod = "GET")
|
||||
@ApiImplicitParam(name = "id", value = "收发货单位ID", paramType = "query", required = true, dataType = "Integer")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<ReceivingForwardingUnit> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
Result<ReceivingForwardingUnit> result = new Result<ReceivingForwardingUnit>();
|
||||
ReceivingForwardingUnit receivingForwardingUnit = receivingForwardingUnitService.getById(id);
|
||||
if (receivingForwardingUnit == null) {
|
||||
result.error500("未找到对应实体");
|
||||
} else {
|
||||
result.setResult(receivingForwardingUnit);
|
||||
result.setSuccess(true);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param response
|
||||
*/
|
||||
@ApiOperation(value = "导出excel收发货单位信息", notes = "导出excel收发货单位信息", httpMethod = "POST")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
|
||||
// Step.1 组装查询条件
|
||||
QueryWrapper<ReceivingForwardingUnit> queryWrapper = null;
|
||||
try {
|
||||
String paramsStr = request.getParameter("paramsStr");
|
||||
if (oConvertUtils.isNotEmpty(paramsStr)) {
|
||||
String deString = URLDecoder.decode(paramsStr, "UTF-8");
|
||||
ReceivingForwardingUnit receivingForwardingUnit = JSON.parseObject(deString, ReceivingForwardingUnit.class);
|
||||
queryWrapper = QueryGenerator.initQueryWrapper(receivingForwardingUnit, request.getParameterMap());
|
||||
}
|
||||
} catch (UnsupportedEncodingException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param response
|
||||
*/
|
||||
@ApiOperation(value = "导出excel收发货单位信息", notes = "导出excel收发货单位信息", httpMethod = "POST")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
|
||||
// Step.1 组装查询条件
|
||||
QueryWrapper<ReceivingForwardingUnit> queryWrapper = null;
|
||||
try {
|
||||
String paramsStr = request.getParameter("paramsStr");
|
||||
if (oConvertUtils.isNotEmpty(paramsStr)) {
|
||||
String deString = URLDecoder.decode(paramsStr, "UTF-8");
|
||||
ReceivingForwardingUnit receivingForwardingUnit = JSON.parseObject(deString, ReceivingForwardingUnit.class);
|
||||
queryWrapper = QueryGenerator.initQueryWrapper(receivingForwardingUnit, request.getParameterMap());
|
||||
}
|
||||
} catch (UnsupportedEncodingException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
//Step.2 AutoPoi 导出Excel
|
||||
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
|
||||
List<ReceivingForwardingUnit> pageList = receivingForwardingUnitService.list(queryWrapper);
|
||||
//导出文件名称
|
||||
mv.addObject(NormalExcelConstants.FILE_NAME, "收发货单位列表");
|
||||
mv.addObject(NormalExcelConstants.CLASS, ReceivingForwardingUnit.class);
|
||||
mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("收发货单位列表数据", "导出人:Jeecg", "导出信息"));
|
||||
mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
|
||||
return mv;
|
||||
}
|
||||
//Step.2 AutoPoi 导出Excel
|
||||
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
|
||||
List<ReceivingForwardingUnit> pageList = receivingForwardingUnitService.list(queryWrapper);
|
||||
//导出文件名称
|
||||
mv.addObject(NormalExcelConstants.FILE_NAME, "收发货单位列表");
|
||||
mv.addObject(NormalExcelConstants.CLASS, ReceivingForwardingUnit.class);
|
||||
mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("收发货单位列表数据", "导出人:Jeecg", "导出信息"));
|
||||
mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
|
||||
return mv;
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过excel导入数据
|
||||
*
|
||||
* @param request
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value = "通过excel导入收发货单位信息", notes = "通过excel导入收发货单位信息", httpMethod = "POST")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
|
||||
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
|
||||
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
|
||||
MultipartFile file = entity.getValue();// 获取上传文件对象
|
||||
ImportParams params = new ImportParams();
|
||||
params.setTitleRows(2);
|
||||
params.setHeadRows(1);
|
||||
params.setNeedSave(true);
|
||||
try {
|
||||
List<ReceivingForwardingUnit> listReceivingForwardingUnits = ExcelImportUtil.importExcel(file.getInputStream(), ReceivingForwardingUnit.class, params);
|
||||
for (ReceivingForwardingUnit receivingForwardingUnitExcel : listReceivingForwardingUnits) {
|
||||
receivingForwardingUnitService.save(receivingForwardingUnitExcel);
|
||||
}
|
||||
return Result.ok("文件导入成功!数据行数:" + listReceivingForwardingUnits.size());
|
||||
} catch (Exception e) {
|
||||
log.error(e.getMessage());
|
||||
return Result.error("文件导入失败!");
|
||||
} finally {
|
||||
try {
|
||||
file.getInputStream().close();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
return Result.ok("文件导入失败!");
|
||||
}
|
||||
/**
|
||||
* 通过excel导入数据
|
||||
*
|
||||
* @param request
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value = "通过excel导入收发货单位信息", notes = "通过excel导入收发货单位信息", httpMethod = "POST")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
|
||||
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
|
||||
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
|
||||
MultipartFile file = entity.getValue();// 获取上传文件对象
|
||||
ImportParams params = new ImportParams();
|
||||
params.setTitleRows(2);
|
||||
params.setHeadRows(1);
|
||||
params.setNeedSave(true);
|
||||
try {
|
||||
List<ReceivingForwardingUnit> listReceivingForwardingUnits = ExcelImportUtil.importExcel(file.getInputStream(), ReceivingForwardingUnit.class, params);
|
||||
for (ReceivingForwardingUnit receivingForwardingUnitExcel : listReceivingForwardingUnits) {
|
||||
receivingForwardingUnitService.save(receivingForwardingUnitExcel);
|
||||
}
|
||||
return Result.ok("文件导入成功!数据行数:" + listReceivingForwardingUnits.size());
|
||||
} catch (Exception e) {
|
||||
log.error(e.getMessage());
|
||||
return Result.error("文件导入失败!");
|
||||
} finally {
|
||||
try {
|
||||
file.getInputStream().close();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
return Result.ok("文件导入失败!");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -4,6 +4,7 @@ import cn.hutool.core.date.DateTime;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
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.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
@ -69,10 +70,14 @@ public class WeighBookVehicleInfoController {
|
||||
@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) {
|
||||
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)) {
|
||||
DateTime dateTime = DateUtil.parse(lastAdddatetime);
|
||||
queryWrapper.lambda().ge(WeighBookVehicleInfo::getAddDateTime, dateTime);
|
||||
queryWrapper.ge(WeighBookVehicleInfo::getAddDateTime, dateTime);
|
||||
}
|
||||
Page<WeighBookVehicleInfo> page = new Page<WeighBookVehicleInfo>(pageNo, pageSize);
|
||||
IPage<WeighBookVehicleInfo> pageList = weighBookVehicleInfoService.page(page, queryWrapper);
|
||||
|
||||
@ -6,12 +6,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
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.WeighPic;
|
||||
import com.zhgd.xmgl.modules.weight.mapper.WeighInfoMapper;
|
||||
import com.zhgd.xmgl.modules.weight.mapper.WeighPicMapper;
|
||||
import com.zhgd.xmgl.modules.weight.service.IWeighInfoService;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
@ -37,7 +37,9 @@ public class WeighInfoServiceImpl extends ServiceImpl<WeighInfoMapper, WeighInfo
|
||||
@Override
|
||||
public Result<IPage<WeighInfo>> queryPageList(WeighInfo weighInfo, Integer pageNo, Integer pageSize, HttpServletRequest req) {
|
||||
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);
|
||||
IPage<WeighInfo> pageList = page(page, queryWrapper);
|
||||
if (!CollectionUtils.isEmpty(pageList.getRecords())) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user