bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

功能优化

This commit is contained in:
mashuai 2025-01-23 09:50:35 +08:00
parent 6a66e48eab
commit 44a4c0d4a1
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java
View File

@ -38,6 +38,10 @@ public class ComplexQueryController extends BaseController {
@GetMapping("/getRetainedEquipmentList") @GetMapping("/getRetainedEquipmentList")
public AjaxResult getRetainedEquipmentList(RetainedEquipmentInfo bean) { public AjaxResult getRetainedEquipmentList(RetainedEquipmentInfo bean) {
bean.setIsExport(1); bean.setIsExport(1);
if (bean.getIsApp() != null && bean.getIsApp() == 1) {
List<RetainedEquipmentInfo> pageList = complexQueryService.getRetainedEquipmentList(bean);
return AjaxResult.success(pageList);
}
startPage(); startPage();
List<RetainedEquipmentInfo> pageList = complexQueryService.getRetainedEquipmentList(bean); List<RetainedEquipmentInfo> pageList = complexQueryService.getRetainedEquipmentList(bean);
return AjaxResult.success(getDataTable(pageList)); return AjaxResult.success(getDataTable(pageList));
@ -93,9 +97,10 @@ public class ComplexQueryController extends BaseController {
@ApiOperation(value = "综合查询--查询在库机具设备详情") @ApiOperation(value = "综合查询--查询在库机具设备详情")
@GetMapping("/getStorageInfoList") @GetMapping("/getStorageInfoList")
public AjaxResult getStorageInfoList(StorageInfo bean) { public AjaxResult getStorageInfoList(StorageInfo bean) {
startPage(); Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10);
List<StorageInfo> list = complexQueryService.getMaCodeList(bean); List<StorageInfo> list = complexQueryService.getMaCodeList(bean);
return AjaxResult.success(getDataTable(list)); return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list));
} }
/** /**