From ac4d1a5962441156ff22a0c87f4eacc083daa9a6 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 20 六月 2025 11:32:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSecondMaintenanceOrderDetailController.java | 92 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 75 insertions(+), 17 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSecondMaintenanceOrderDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSecondMaintenanceOrderDetailController.java
index b7f3457..cd4f85d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSecondMaintenanceOrderDetailController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSecondMaintenanceOrderDetailController.java
@@ -1,26 +1,29 @@
package org.jeecg.modules.eam.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
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.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.entity.EamSecondMaintenanceOrderDetail;
import org.jeecg.modules.eam.service.IEamSecondMaintenanceOrderDetailService;
+import org.jeecg.modules.eam.vo.InspectionVo;
import org.springframework.beans.factory.annotation.Autowired;
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 java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
- /**
+/**
* @Description: 璁惧浜岀骇淇濆吇鏄庣粏
* @Author: jeecg-boot
* @Date: 2025-04-29
@@ -29,30 +32,85 @@
@Slf4j
@Api(tags="璁惧浜岀骇淇濆吇鏄庣粏")
@RestController
-@RequestMapping("/eam/eamSecondMaintenanceOrderDetail")
+@RequestMapping("/eam/secondMaintenanceOrderDetail")
public class EamSecondMaintenanceOrderDetailController extends JeecgController<EamSecondMaintenanceOrderDetail, IEamSecondMaintenanceOrderDetailService> {
@Autowired
private IEamSecondMaintenanceOrderDetailService eamSecondMaintenanceOrderDetailService;
-
+
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
- * @param eamSecondMaintenanceOrderDetail
+ * @param orderId
* @param pageNo
* @param pageSize
- * @param req
* @return
*/
- @AutoLog(value = "璁惧浜岀骇淇濆吇鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="璁惧浜岀骇淇濆吇鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ", notes="璁惧浜岀骇淇濆吇鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "鍛ㄤ繚宸ュ崟鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ", notes = "鍛ㄤ繚宸ュ崟鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
- public Result<?> queryPageList(EamSecondMaintenanceOrderDetail eamSecondMaintenanceOrderDetail,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<EamSecondMaintenanceOrderDetail> queryWrapper = QueryGenerator.initQueryWrapper(eamSecondMaintenanceOrderDetail, req.getParameterMap());
- Page<EamSecondMaintenanceOrderDetail> page = new Page<EamSecondMaintenanceOrderDetail>(pageNo, pageSize);
+ public Result<?> queryPageList(@RequestParam("orderId") String orderId,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+ LambdaQueryWrapper<EamSecondMaintenanceOrderDetail> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EamSecondMaintenanceOrderDetail::getOrderId, orderId);
+ queryWrapper.orderByAsc(EamSecondMaintenanceOrderDetail::getItemCode);
+ Page<EamSecondMaintenanceOrderDetail> page = new Page<>(pageNo, pageSize);
IPage<EamSecondMaintenanceOrderDetail> pageList = eamSecondMaintenanceOrderDetailService.page(page, queryWrapper);
return Result.OK(pageList);
}
+
+ /**
+ * 涓�娆″姞杞�
+ *
+ * @param orderId
+ * @return
+ */
+ @ApiOperation(value = "鍛ㄤ繚宸ュ崟鏄庣粏-涓嶅垎椤靛垪琛ㄦ煡璇�", notes = "鍛ㄤ繚宸ュ崟鏄庣粏-涓嶅垎椤靛垪琛ㄦ煡璇�")
+ @GetMapping(value = "/queryList")
+ public Result<?> queryList(@RequestParam("orderId") String orderId) {
+ LambdaQueryWrapper<EamSecondMaintenanceOrderDetail> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EamSecondMaintenanceOrderDetail::getOrderId, orderId);
+ queryWrapper.orderByAsc(EamSecondMaintenanceOrderDetail::getItemCode);
+ List<EamSecondMaintenanceOrderDetail> list = eamSecondMaintenanceOrderDetailService.list(queryWrapper);
+ return Result.OK(list);
+ }
+
+ /**
+ * 鎶ヨ〃浣跨敤 qsw
+ * 2025-6-19
+ */
+ @GetMapping("/findExceptionDescriptionAll")
+ public JSONObject findInspectionUser(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "1000") Integer pageSize,
+ @RequestParam Map<String, Object> params) {
+
+ String orderId = (String)params.get("id");
+
+ List<EamSecondMaintenanceOrderDetail> details = new ArrayList<>();
+ List<EamSecondMaintenanceOrderDetail> list = eamSecondMaintenanceOrderDetailService.lambdaQuery()
+ .eq(EamSecondMaintenanceOrderDetail::getOrderId, orderId)
+ .eq(EamSecondMaintenanceOrderDetail::getMaintenanceResult, "2")
+ .list();
+ EamSecondMaintenanceOrderDetail detail = new EamSecondMaintenanceOrderDetail();
+
+ StringBuilder sb = new StringBuilder();
+ int index = 1;
+ for (EamSecondMaintenanceOrderDetail item : list) {
+ String value = item.getExceptionDescription();
+ if (value != null && !value.isEmpty()) { // 璺宠繃null鍜岀┖瀛楃涓�
+ sb.append(index).append(". ").append(value).append(System.lineSeparator());
+ index++;
+ }
+ }
+ // 绉婚櫎鏈�鍚庝竴涓浣欑殑鎹㈣绗︼紙鍙�夛級
+ if (sb.length() > 0) {
+ sb.setLength(sb.length() - System.lineSeparator().length());
+ }
+
+ String s = sb.toString();
+ detail.setExceptionDescription(s);
+ details.add(detail);
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("data",details);
+ return jsonObject;
+ }
}
--
Gitblit v1.9.3