From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnsealController.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnsealController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnsealController.java
index 77d76e5..874890b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnsealController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnsealController.java
@@ -1,5 +1,17 @@
package org.jeecg.modules.eam.controller;
+import java.io.UnsupportedEncodingException;
+import java.io.IOException;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -15,8 +27,8 @@
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.entity.Equipment;
-import org.jeecg.modules.eam.entity.EquipmentUnseal;
import org.jeecg.modules.eam.entity.EquipmentUnsealDetail;
+import org.jeecg.modules.eam.entity.EquipmentUnseal;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEquipmentUnsealDetailService;
import org.jeecg.modules.eam.service.IEquipmentUnsealService;
@@ -73,9 +85,9 @@
@ApiOperation(value="璁惧鍚皝-鍒嗛〉鍒楄〃鏌ヨ", notes="璁惧鍚皝-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
public Result<IPage<EquipmentUnseal>> queryPageList(EquipmentUnseal equipmentUnseal,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
//QueryWrapper<EquipmentUnseal> queryWrapper = QueryGenerator.initQueryWrapper(equipmentUnseal, req.getParameterMap());
//Page<EquipmentUnseal> page = new Page<EquipmentUnseal>(pageNo, pageSize);
QueryWrapper<EquipmentUnseal> queryWrapper = new QueryWrapper<>();
@@ -93,7 +105,7 @@
IPage<EquipmentUnseal> pageList = equipmentUnsealService.page(page, queryWrapper);
return Result.OK(pageList);
}
-
+
/**
* 娣诲姞
*
@@ -110,7 +122,7 @@
equipmentUnsealService.saveMain(equipmentUnseal, equipmentUnsealPage.getEquipmentUnsealDetailList());
return Result.OK("娣诲姞鎴愬姛锛�");
}
-
+
/**
* 缂栬緫
*
@@ -131,7 +143,7 @@
equipmentUnsealService.updateMain(equipmentUnseal, equipmentUnsealPage.getEquipmentUnsealDetailList());
return Result.OK("缂栬緫鎴愬姛!");
}
-
+
/**
* 閫氳繃id鍒犻櫎
*
@@ -146,7 +158,7 @@
equipmentUnsealService.delMain(id);
return Result.OK("鍒犻櫎鎴愬姛!");
}
-
+
/**
* 鎵归噺鍒犻櫎
*
@@ -161,7 +173,7 @@
this.equipmentUnsealService.delBatchMain(Arrays.asList(ids.split(",")));
return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
}
-
+
/**
* 閫氳繃id鏌ヨ
*
@@ -179,7 +191,7 @@
return Result.OK(equipmentUnseal);
}
-
+
/**
* 閫氳繃id鏌ヨ
*
--
Gitblit v1.9.3