From 286375a43369462cd75147271949cf819916912f Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 12 一月 2024 16:39:17 +0800
Subject: [PATCH] 问题项修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index e9fd024..3ba20b8 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -195,6 +195,55 @@
return Result.OK(pageList);
}
+ @ApiOperation(value="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ", notes="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/showEquipmentList")
+ public Result<IPage<Equipment>> showEquipmentList(Equipment equipment,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
+ if(StringUtils.isNotBlank(equipment.getNum())){
+ queryWrapper.like("num",equipment.getNum());
+ }
+ if(StringUtils.isNotBlank(equipment.getName())){
+ queryWrapper.like("name",equipment.getName());
+ }
+ queryWrapper.eq("equipment_status","1");
+ queryWrapper.in("technology_status","qualified","limitedUse");
+ queryWrapper.eq("status","1");
+ queryWrapper.eq("del_flag",0);
+ queryWrapper.orderByDesc("create_time");
+
+ Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
+ IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ @ApiOperation(value="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ", notes="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/findEquipmentList")
+ public Result<IPage<Equipment>> findEquipmentList(Equipment equipment,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
+ if(StringUtils.isNotBlank(equipment.getNum())){
+ queryWrapper.like("num",equipment.getNum());
+ }
+ if(StringUtils.isNotBlank(equipment.getName())){
+ queryWrapper.like("name",equipment.getName());
+ }
+ queryWrapper.eq("equipment_status","1");
+ queryWrapper.in("technology_status","qualified","limitedUse");
+ queryWrapper.in("equipment_importance_id","A","B","C");
+ queryWrapper.eq("status","1");
+ queryWrapper.eq("del_flag",0);
+ queryWrapper.orderByDesc("create_time");
+
+ Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
+ IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
/**
* 璁惧淇濅慨 鑾峰彇璁惧鍒楄〃缁勪欢
--
Gitblit v1.9.3