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/EamThirdMaintenanceOrderDetailController.java | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderDetailController.java
index 94ca430..f436b92 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderDetailController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderDetailController.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.eam.controller;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,6 +9,7 @@
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.eam.entity.EamSecondMaintenanceOrderDetail;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrderDetail;
import org.jeecg.modules.eam.service.IEamThirdMaintenanceOrderDetailService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +18,9 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
/**
* @Description: 璁惧涓夌骇淇濆吇鏄庣粏
@@ -68,4 +72,44 @@
List<EamThirdMaintenanceOrderDetail> list = eamThirdMaintenanceOrderDetailService.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<EamThirdMaintenanceOrderDetail> details = new ArrayList<>();
+ List<EamThirdMaintenanceOrderDetail> list = eamThirdMaintenanceOrderDetailService.lambdaQuery()
+ .eq(EamThirdMaintenanceOrderDetail::getOrderId, orderId)
+ .eq(EamThirdMaintenanceOrderDetail::getMaintenanceResult, "2")
+ .list();
+ EamThirdMaintenanceOrderDetail detail = new EamThirdMaintenanceOrderDetail();
+
+ StringBuilder sb = new StringBuilder();
+ int index = 1;
+ for (EamThirdMaintenanceOrderDetail 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