From 453f63fd6cd6466222304df619e62b3a5667ca68 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期二, 05 八月 2025 13:56:47 +0800
Subject: [PATCH] 修复0730测试问题
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsFaultKnowController.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 1 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsFaultKnowController.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsFaultKnowController.java
index 9fa2230..c9ce5ef 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsFaultKnowController.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsFaultKnowController.java
@@ -1,11 +1,19 @@
package org.dromara.eims.controller;
+import java.util.ArrayList;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.eims.domain.bo.EimsRepairResBo;
+import org.dromara.eims.domain.vo.EimsEquVo;
+import org.dromara.eims.domain.vo.EimsRepairReqVo;
+import org.dromara.eims.domain.vo.EimsRepairResVo;
+import org.dromara.eims.service.IEimsEquService;
+import org.dromara.eims.service.IEimsRepairReqService;
+import org.dromara.eims.service.IEimsRepairResService;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -35,6 +43,9 @@
public class EimsFaultKnowController extends BaseController {
private final IEimsFaultKnowService eimsFaultKnowService;
+ private final IEimsRepairResService repairResService;
+ private final IEimsRepairReqService repairReqService;
+ private final IEimsEquService equService;
/**
* 鏌ヨ鏁呴殰鐭ヨ瘑鍒楄〃
@@ -42,7 +53,54 @@
@SaCheckPermission("eims:faultKnow:list")
@GetMapping("/list")
public TableDataInfo<EimsFaultKnowVo> list(EimsFaultKnowBo bo, PageQuery pageQuery) {
- return eimsFaultKnowService.queryPageList(bo, pageQuery);
+
+// return eimsFaultKnowService.queryPageList(bo, pageQuery);
+ return comp(bo, pageQuery);
+ }
+
+ private TableDataInfo<EimsFaultKnowVo> comp(EimsFaultKnowBo bo,PageQuery pageQuery){
+ EimsRepairResBo b = new EimsRepairResBo();
+ PageQuery pQuery = new PageQuery();
+ pQuery.setPageNum(pageQuery.getPageNum());
+ pQuery.setPageSize(pageQuery.getPageSize());
+ b.setParams(bo.getParams());
+ b.setResHandle(bo.getResHandle());
+ b.setReqDesc(bo.getReqDesc());
+ TableDataInfo<EimsRepairResVo> tableDataInfo = repairResService.queryPageListCustom(b, pQuery);
+
+ return getEimsFaultKnowVoTableDataInfo(tableDataInfo);
+ }
+
+ private TableDataInfo<EimsFaultKnowVo> getEimsFaultKnowVoTableDataInfo(TableDataInfo<EimsRepairResVo> tableDataInfo) {
+ TableDataInfo<EimsFaultKnowVo> resTableData = new TableDataInfo<>();
+ resTableData.setCode(tableDataInfo.getCode());
+ resTableData.setMsg(tableDataInfo.getMsg());
+ resTableData.setTotal(tableDataInfo.getTotal());
+ List<EimsFaultKnowVo> rows= new ArrayList<>();
+ int size = tableDataInfo.getRows().size();
+ for (int i = 0; i < size; i++) {
+ EimsFaultKnowVo vo = new EimsFaultKnowVo();
+ EimsRepairResVo res = tableDataInfo.getRows().get(i);
+ vo.setFaultCode("GZZS"+ String.valueOf(res.getId()).substring(0,10));
+ vo.setFaultReason(res.getResReason());
+ vo.setResHandle(res.getResHandle());
+ EimsRepairReqVo reqVo = repairReqService.queryById(res.getReqId());
+ if(reqVo!=null){
+ vo.setReqDesc(reqVo.getReqDesc());
+ Long equId = reqVo.getEquId();
+ if(equId!=null){
+ EimsEquVo equVo = equService.queryById(equId);
+ if(equVo!=null){
+ vo.setAssetNo(equVo.getAssetNo());
+ vo.setEquId(equVo.getEquId());
+ }
+
+ }
+ }
+ rows.add(vo);
+ }
+ resTableData.setRows(rows);
+ return resTableData;
}
/**
--
Gitblit v1.9.3