From f84d9e69907cb678150eaa6393fd74cf042fcca4 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:39:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnsealController.java | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 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..8eeb992 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,12 +1,17 @@
package org.jeecg.modules.eam.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
+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 org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
@@ -14,12 +19,8 @@
import org.jeecg.common.system.query.QueryGenerator;
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.service.IEamEquipmentService;
-import org.jeecg.modules.eam.service.IEquipmentUnsealDetailService;
-import org.jeecg.modules.eam.service.IEquipmentUnsealService;
+import org.jeecg.modules.eam.entity.EquipmentUnseal;
import org.jeecg.modules.eam.vo.EquipmentUnsealPage;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -93,7 +94,7 @@
IPage<EquipmentUnseal> pageList = equipmentUnsealService.page(page, queryWrapper);
return Result.OK(pageList);
}
-
+
/**
* 娣诲姞
*
@@ -110,7 +111,7 @@
equipmentUnsealService.saveMain(equipmentUnseal, equipmentUnsealPage.getEquipmentUnsealDetailList());
return Result.OK("娣诲姞鎴愬姛锛�");
}
-
+
/**
* 缂栬緫
*
@@ -131,7 +132,7 @@
equipmentUnsealService.updateMain(equipmentUnseal, equipmentUnsealPage.getEquipmentUnsealDetailList());
return Result.OK("缂栬緫鎴愬姛!");
}
-
+
/**
* 閫氳繃id鍒犻櫎
*
@@ -146,7 +147,7 @@
equipmentUnsealService.delMain(id);
return Result.OK("鍒犻櫎鎴愬姛!");
}
-
+
/**
* 鎵归噺鍒犻櫎
*
@@ -161,7 +162,7 @@
this.equipmentUnsealService.delBatchMain(Arrays.asList(ids.split(",")));
return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
}
-
+
/**
* 閫氳繃id鏌ヨ
*
@@ -179,7 +180,7 @@
return Result.OK(equipmentUnseal);
}
-
+
/**
* 閫氳繃id鏌ヨ
*
--
Gitblit v1.9.3