From 17cab0164374a86c946cdffaf7bd0b6b8d4170dc Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 31 三月 2025 17:37:41 +0800
Subject: [PATCH] art: 设备管理-保养标准-明细项展示
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardDetailController.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java | 318 +++++++++++++++++++++++++----------------------------
2 files changed, 152 insertions(+), 168 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
index c753d7e..8f3ffef 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
@@ -1,194 +1,176 @@
package org.jeecg.modules.eam.controller;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.entity.EamMaintenanceStandard;
import org.jeecg.modules.eam.request.EamMaintenanceStandardRequest;
import org.jeecg.modules.eam.service.IEamMaintenanceStandardService;
-import java.util.Date;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
- /**
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
* @Description: 淇濆吇鏍囧噯
* @Author: jeecg-boot
- * @Date: 2025-03-26
+ * @Date: 2025-03-26
* @Version: V1.0
*/
@Slf4j
-@Api(tags="淇濆吇鏍囧噯")
+@Api(tags = "淇濆吇鏍囧噯")
@RestController
@RequestMapping("/eam/maintenanceStandard")
public class EamMaintenanceStandardController extends JeecgController<EamMaintenanceStandard, IEamMaintenanceStandardService> {
- @Autowired
- private IEamMaintenanceStandardService eamMaintenanceStandardService;
- @Autowired
- private ISysBusinessCodeRuleService businessCodeRuleService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param eamMaintenanceStandard
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- @AutoLog(value = "淇濆吇鏍囧噯-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="淇濆吇鏍囧噯-鍒嗛〉鍒楄〃鏌ヨ", notes="淇濆吇鏍囧噯-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<?> queryPageList(EamMaintenanceStandard eamMaintenanceStandard,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<EamMaintenanceStandard> queryWrapper = QueryGenerator.initQueryWrapper(eamMaintenanceStandard, req.getParameterMap());
- Page<EamMaintenanceStandard> page = new Page<EamMaintenanceStandard>(pageNo, pageSize);
- IPage<EamMaintenanceStandard> pageList = eamMaintenanceStandardService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param standardRequest
- * @return
- */
- @AutoLog(value = "淇濆吇鏍囧噯-娣诲姞")
- @ApiOperation(value="淇濆吇鏍囧噯-娣诲姞", notes="淇濆吇鏍囧噯-娣诲姞")
- @PostMapping(value = "/add")
- public Result<?> add(@RequestBody EamMaintenanceStandardRequest standardRequest) {
- if(standardRequest == null){
- return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
- }
- if(CollectionUtil.isEmpty(standardRequest.getTableDetailList())) {
- return Result.error("淇濆吇椤逛笉鑳戒负绌猴紒");
- }
- String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.MAINTENANCE_STANDARD_CODE_RULE);
- standardRequest.setStandardCode(codeSeq);
- boolean b = eamMaintenanceStandardService.addMaintenanceStandard(standardRequest);
- if(!b) {
- return Result.error("娣诲姞澶辫触锛�");
- }
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param standardRequest
- * @return
- */
- @AutoLog(value = "淇濆吇鏍囧噯-缂栬緫")
- @ApiOperation(value="淇濆吇鏍囧噯-缂栬緫", notes="淇濆吇鏍囧噯-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<?> edit(@RequestBody EamMaintenanceStandardRequest standardRequest) {
- if(standardRequest == null){
- return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
- }
- if(CollectionUtil.isEmpty(standardRequest.getTableDetailList())) {
- return Result.error("淇濆吇椤逛笉鑳戒负绌猴紒");
- }
- boolean b = eamMaintenanceStandardService.editMaintenanceStandard(standardRequest);
- if(!b) {
- return Result.error("缂栬緫澶辫触锛�");
- }
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "淇濆吇鏍囧噯-閫氳繃id鍒犻櫎")
- @ApiOperation(value="淇濆吇鏍囧噯-閫氳繃id鍒犻櫎", notes="淇濆吇鏍囧噯-閫氳繃id鍒犻櫎")
- @DeleteMapping(value = "/delete")
- public Result<?> delete(@RequestParam(name="id",required=true) String id) {
- eamMaintenanceStandardService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "淇濆吇鏍囧噯-鎵归噺鍒犻櫎")
- @ApiOperation(value="淇濆吇鏍囧噯-鎵归噺鍒犻櫎", notes="淇濆吇鏍囧噯-鎵归噺鍒犻櫎")
- @DeleteMapping(value = "/deleteBatch")
- public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.eamMaintenanceStandardService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- @AutoLog(value = "淇濆吇鏍囧噯-閫氳繃id鏌ヨ")
- @ApiOperation(value="淇濆吇鏍囧噯-閫氳繃id鏌ヨ", notes="淇濆吇鏍囧噯-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
- EamMaintenanceStandard eamMaintenanceStandard = eamMaintenanceStandardService.getById(id);
- return Result.OK(eamMaintenanceStandard);
- }
+ @Autowired
+ private IEamMaintenanceStandardService eamMaintenanceStandardService;
+ @Autowired
+ private ISysBusinessCodeRuleService businessCodeRuleService;
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param eamMaintenanceStandard
- */
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, EamMaintenanceStandard eamMaintenanceStandard) {
- return super.exportXls(request, eamMaintenanceStandard, EamMaintenanceStandard.class, "淇濆吇鏍囧噯");
- }
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param eamMaintenanceStandard
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @ApiOperation(value = "淇濆吇鏍囧噯-鍒嗛〉鍒楄〃鏌ヨ", notes = "淇濆吇鏍囧噯-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<?> queryPageList(EamMaintenanceStandard eamMaintenanceStandard,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<EamMaintenanceStandard> queryWrapper = QueryGenerator.initQueryWrapper(eamMaintenanceStandard, req.getParameterMap());
+ Page<EamMaintenanceStandard> page = new Page<EamMaintenanceStandard>(pageNo, pageSize);
+ IPage<EamMaintenanceStandard> pageList = eamMaintenanceStandardService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, EamMaintenanceStandard.class);
- }
+ /**
+ * 娣诲姞
+ *
+ * @param standardRequest
+ * @return
+ */
+ @AutoLog(value = "淇濆吇鏍囧噯-娣诲姞")
+ @ApiOperation(value = "淇濆吇鏍囧噯-娣诲姞", notes = "淇濆吇鏍囧噯-娣诲姞")
+ @PostMapping(value = "/add")
+ public Result<?> add(@RequestBody EamMaintenanceStandardRequest standardRequest) {
+ if (standardRequest == null) {
+ return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ if (CollectionUtil.isEmpty(standardRequest.getTableDetailList())) {
+ return Result.error("淇濆吇椤逛笉鑳戒负绌猴紒");
+ }
+ String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.MAINTENANCE_STANDARD_CODE_RULE);
+ standardRequest.setStandardCode(codeSeq);
+ boolean b = eamMaintenanceStandardService.addMaintenanceStandard(standardRequest);
+ if (!b) {
+ return Result.error("娣诲姞澶辫触锛�");
+ }
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param standardRequest
+ * @return
+ */
+ @AutoLog(value = "淇濆吇鏍囧噯-缂栬緫")
+ @ApiOperation(value = "淇濆吇鏍囧噯-缂栬緫", notes = "淇濆吇鏍囧噯-缂栬緫")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<?> edit(@RequestBody EamMaintenanceStandardRequest standardRequest) {
+ if (standardRequest == null) {
+ return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ if (CollectionUtil.isEmpty(standardRequest.getTableDetailList())) {
+ return Result.error("淇濆吇椤逛笉鑳戒负绌猴紒");
+ }
+ boolean b = eamMaintenanceStandardService.editMaintenanceStandard(standardRequest);
+ if (!b) {
+ return Result.error("缂栬緫澶辫触锛�");
+ }
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "淇濆吇鏍囧噯-閫氳繃id鍒犻櫎")
+ @ApiOperation(value = "淇濆吇鏍囧噯-閫氳繃id鍒犻櫎", notes = "淇濆吇鏍囧噯-閫氳繃id鍒犻櫎")
+ @DeleteMapping(value = "/delete")
+ public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+ eamMaintenanceStandardService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "淇濆吇鏍囧噯-鎵归噺鍒犻櫎")
+ @ApiOperation(value = "淇濆吇鏍囧噯-鎵归噺鍒犻櫎", notes = "淇濆吇鏍囧噯-鎵归噺鍒犻櫎")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ this.eamMaintenanceStandardService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "淇濆吇鏍囧噯-閫氳繃id鏌ヨ", notes = "淇濆吇鏍囧噯-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+ EamMaintenanceStandard eamMaintenanceStandard = eamMaintenanceStandardService.getById(id);
+ return Result.OK(eamMaintenanceStandard);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param eamMaintenanceStandard
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, EamMaintenanceStandard eamMaintenanceStandard) {
+ return super.exportXls(request, eamMaintenanceStandard, EamMaintenanceStandard.class, "淇濆吇鏍囧噯");
+ }
+
+ /**
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, EamMaintenanceStandard.class);
+ }
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardDetailController.java
index 7f82d37..39769f7 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardDetailController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardDetailController.java
@@ -47,6 +47,7 @@
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
LambdaQueryWrapper<EamMaintenanceStandardDetail> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EamMaintenanceStandardDetail::getStandardId, standardId);
+ queryWrapper.orderByAsc(EamMaintenanceStandardDetail::getItemCode);
Page<EamMaintenanceStandardDetail> page = new Page<>(pageNo, pageSize);
IPage<EamMaintenanceStandardDetail> pageList = eamMaintenanceStandardDetailService.page(page, queryWrapper);
return Result.OK(pageList);
@@ -63,6 +64,7 @@
public Result<?> queryList(@RequestParam("standardId") String standardId) {
LambdaQueryWrapper<EamMaintenanceStandardDetail> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EamMaintenanceStandardDetail::getStandardId, standardId);
+ queryWrapper.orderByAsc(EamMaintenanceStandardDetail::getItemCode);
List<EamMaintenanceStandardDetail> list = eamMaintenanceStandardDetailService.list(queryWrapper);
return Result.OK(list);
}
--
Gitblit v1.9.3