From 736003d4534e1686b3e9ee27f7baa2afba7ad959 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 10 七月 2025 11:41:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderDetailController.java | 140 ++++++----------------------------------------
1 files changed, 20 insertions(+), 120 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderDetailController.java
index 573666c..bb4bcad 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderDetailController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderDetailController.java
@@ -1,26 +1,22 @@
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.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderDetail;
import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderDetailService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
+import java.util.List;
- /**
+/**
* @Description: 鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�
* @Author: jeecg-boot
* @Date: 2025-07-09
@@ -32,120 +28,24 @@
@RequestMapping("/eam/eamTechnicalStatusEvaluationOrderDetail")
public class EamTechnicalStatusEvaluationOrderDetailController extends JeecgController<EamTechnicalStatusEvaluationOrderDetail, IEamTechnicalStatusEvaluationOrderDetailService> {
@Autowired
- private IEamTechnicalStatusEvaluationOrderDetailService eamTechnicalStatusEvaluationOrderDetailService;
-
+ private IEamTechnicalStatusEvaluationOrderDetailService orderDetailService;
+
/**
- * 鍒嗛〉鍒楄〃鏌ヨ
+ * 涓�娆″姞杞�
*
- * @param eamTechnicalStatusEvaluationOrderDetail
- * @param pageNo
- * @param pageSize
- * @param req
+ * @param orderId
* @return
*/
- @ApiOperation(value="鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�-鍒嗛〉鍒楄〃鏌ヨ", notes="鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<?> queryPageList(EamTechnicalStatusEvaluationOrderDetail eamTechnicalStatusEvaluationOrderDetail,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<EamTechnicalStatusEvaluationOrderDetail> queryWrapper = QueryGenerator.initQueryWrapper(eamTechnicalStatusEvaluationOrderDetail, req.getParameterMap());
- Page<EamTechnicalStatusEvaluationOrderDetail> page = new Page<EamTechnicalStatusEvaluationOrderDetail>(pageNo, pageSize);
- IPage<EamTechnicalStatusEvaluationOrderDetail> pageList = eamTechnicalStatusEvaluationOrderDetailService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param eamTechnicalStatusEvaluationOrderDetail
- * @return
- */
- @AutoLog(value = "鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�-娣诲姞")
- @ApiOperation(value="鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�-娣诲姞", notes="鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�-娣诲姞")
- @PostMapping(value = "/add")
- public Result<?> add(@RequestBody EamTechnicalStatusEvaluationOrderDetail eamTechnicalStatusEvaluationOrderDetail) {
- eamTechnicalStatusEvaluationOrderDetailService.save(eamTechnicalStatusEvaluationOrderDetail);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param eamTechnicalStatusEvaluationOrderDetail
- * @return
- */
- @AutoLog(value = "鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�-缂栬緫")
- @ApiOperation(value="鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�-缂栬緫", notes="鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<?> edit(@RequestBody EamTechnicalStatusEvaluationOrderDetail eamTechnicalStatusEvaluationOrderDetail) {
- eamTechnicalStatusEvaluationOrderDetailService.updateById(eamTechnicalStatusEvaluationOrderDetail);
- 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) {
- eamTechnicalStatusEvaluationOrderDetailService.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.eamTechnicalStatusEvaluationOrderDetailService.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) {
- EamTechnicalStatusEvaluationOrderDetail eamTechnicalStatusEvaluationOrderDetail = eamTechnicalStatusEvaluationOrderDetailService.getById(id);
- return Result.OK(eamTechnicalStatusEvaluationOrderDetail);
+ @ApiOperation(value = "鎶�鏈姸鎬侀壌瀹氳鑼冩槑缁�-涓嶅垎椤靛垪琛ㄦ煡璇�", notes = "鎶�鏈姸鎬侀壌瀹氳鑼冩槑缁�-涓嶅垎椤靛垪琛ㄦ煡璇�")
+ @GetMapping(value = "/queryList")
+ public Result<?> queryList(@RequestParam("orderId") String orderId) {
+ LambdaQueryWrapper<EamTechnicalStatusEvaluationOrderDetail> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EamTechnicalStatusEvaluationOrderDetail::getOrderId, orderId);
+ queryWrapper.orderByAsc(EamTechnicalStatusEvaluationOrderDetail::getCheckCategory);
+ queryWrapper.orderByAsc(EamTechnicalStatusEvaluationOrderDetail::getItemCode);
+ List<EamTechnicalStatusEvaluationOrderDetail> list = orderDetailService.list(queryWrapper);
+ return Result.OK(list);
}
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param eamTechnicalStatusEvaluationOrderDetail
- */
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, EamTechnicalStatusEvaluationOrderDetail eamTechnicalStatusEvaluationOrderDetail) {
- return super.exportXls(request, eamTechnicalStatusEvaluationOrderDetail, EamTechnicalStatusEvaluationOrderDetail.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, EamTechnicalStatusEvaluationOrderDetail.class);
- }
}
--
Gitblit v1.9.3