From 218ab860ed4708f6f70a519775c56c9554000fe7 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 27 六月 2025 13:42:41 +0800
Subject: [PATCH] 去除多余引用

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnsealController.java |   69 ++++++++++++++++++++++------------
 1 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnsealController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnsealController.java
index 56cf6c9..874890b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnsealController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnsealController.java
@@ -12,38 +12,46 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+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.apache.commons.lang3.StringUtils;
-import org.jeecg.modules.eam.entity.EquipmentSeal;
-import org.jeecg.modules.eam.vo.EquipmentDisposalPage;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.eam.entity.Equipment;
+import org.jeecg.modules.eam.entity.EquipmentUnsealDetail;
+import org.jeecg.modules.eam.entity.EquipmentUnseal;
+import org.jeecg.modules.eam.service.IEamEquipmentService;
+import org.jeecg.modules.eam.service.IEquipmentUnsealDetailService;
+import org.jeecg.modules.eam.service.IEquipmentUnsealService;
+import org.jeecg.modules.eam.vo.EquipmentUnsealPage;
 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.jeecg.common.system.vo.LoginUser;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.eam.entity.EquipmentUnsealDetail;
-import org.jeecg.modules.eam.entity.EquipmentUnseal;
-import org.jeecg.modules.eam.vo.EquipmentUnsealPage;
-import org.jeecg.modules.eam.service.IEquipmentUnsealService;
-import org.jeecg.modules.eam.service.IEquipmentUnsealDetailService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
-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 com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
  /**
  * @Description: 璁惧鍚皝
@@ -60,7 +68,10 @@
 	private IEquipmentUnsealService equipmentUnsealService;
 	@Autowired
 	private IEquipmentUnsealDetailService equipmentUnsealDetailService;
-	
+
+	 @Autowired
+	private IEamEquipmentService equipmentService;
+
 	/**
 	 * 鍒嗛〉鍒楄〃鏌ヨ
 	 *
@@ -74,9 +85,9 @@
 	@ApiOperation(value="璁惧鍚皝-鍒嗛〉鍒楄〃鏌ヨ", notes="璁惧鍚皝-鍒嗛〉鍒楄〃鏌ヨ")
 	@GetMapping(value = "/list")
 	public Result<IPage<EquipmentUnseal>> queryPageList(EquipmentUnseal equipmentUnseal,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
+														@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														HttpServletRequest req) {
 		//QueryWrapper<EquipmentUnseal> queryWrapper = QueryGenerator.initQueryWrapper(equipmentUnseal, req.getParameterMap());
 		//Page<EquipmentUnseal> page = new Page<EquipmentUnseal>(pageNo, pageSize);
 		QueryWrapper<EquipmentUnseal> queryWrapper = new QueryWrapper<>();
@@ -292,6 +303,14 @@
 		 QueryWrapper<EquipmentUnsealDetail> queryWrapper = QueryGenerator.initQueryWrapper(equipmentUnsealDetail, req.getParameterMap());
 		 Page<EquipmentUnsealDetail> page = new Page<EquipmentUnsealDetail>(pageNo, pageSize);
 		 IPage<EquipmentUnsealDetail> pageList = equipmentUnsealDetailService.page(page, queryWrapper);
+		 for (EquipmentUnsealDetail record : pageList.getRecords()) {
+			 String equipmentId = record.getEquipmentId();
+			 Equipment equipment = equipmentService.getById(equipmentId);
+			 if(ObjectUtils.isNotNull(equipment)&&StringUtils.isNotBlank(equipment.getEquipmentPhoto())){
+				 record.setEquipmentPhoto(equipment.getEquipmentPhoto());
+			 }
+
+		 }
 		 return Result.OK(pageList);
 	 }
 

--
Gitblit v1.9.3