|
@@ -163,6 +163,8 @@ public class MaterialInfoController {
|
|
HttpServletRequest req) {
|
|
HttpServletRequest req) {
|
|
|
|
|
|
Result<IPage<MaterialInfo>> result = new Result<>();
|
|
Result<IPage<MaterialInfo>> result = new Result<>();
|
|
|
|
+ String materialName = materialInfo.getMaterialName();
|
|
|
|
+ materialInfo.setMaterialName(null);
|
|
QueryWrapper<MaterialInfo> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<MaterialInfo> queryWrapper = new QueryWrapper<>();
|
|
Object createTime = materialInfo.getCreateTime();
|
|
Object createTime = materialInfo.getCreateTime();
|
|
materialInfo.setCreateTime(null);
|
|
materialInfo.setCreateTime(null);
|
|
@@ -199,6 +201,10 @@ public class MaterialInfoController {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ if (!Check.isNull(materialName)) {
|
|
|
|
+ queryWrapper.like("material_name", materialName);
|
|
|
|
+
|
|
|
|
+ }
|
|
Page<MaterialInfo> page = new Page<>(pageNo, pageSize);
|
|
Page<MaterialInfo> page = new Page<>(pageNo, pageSize);
|
|
IPage<MaterialInfo> pageList = materialInfoService.page(page, queryWrapper);
|
|
IPage<MaterialInfo> pageList = materialInfoService.page(page, queryWrapper);
|
|
List<MaterialInfo> materialInfoList = pageList.getRecords();
|
|
List<MaterialInfo> materialInfoList = pageList.getRecords();
|