From 09aa0d2eebbdf7d0a584323babc02c4608ab852a Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期二, 05 九月 2023 18:10:10 +0800
Subject: [PATCH] 设备台账维护子表
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnsealController.java | 87 +++++++++++++++++++++++--------------------
1 files changed, 47 insertions(+), 40 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..77d76e5 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
@@ -1,49 +1,45 @@
package org.jeecg.modules.eam.controller;
-import java.io.UnsupportedEncodingException;
-import java.io.IOException;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-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.EquipmentUnseal;
+import org.jeecg.modules.eam.entity.EquipmentUnsealDetail;
+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 +56,10 @@
private IEquipmentUnsealService equipmentUnsealService;
@Autowired
private IEquipmentUnsealDetailService equipmentUnsealDetailService;
-
+
+ @Autowired
+ private IEamEquipmentService equipmentService;
+
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -94,7 +93,7 @@
IPage<EquipmentUnseal> pageList = equipmentUnsealService.page(page, queryWrapper);
return Result.OK(pageList);
}
-
+
/**
* 娣诲姞
*
@@ -111,7 +110,7 @@
equipmentUnsealService.saveMain(equipmentUnseal, equipmentUnsealPage.getEquipmentUnsealDetailList());
return Result.OK("娣诲姞鎴愬姛锛�");
}
-
+
/**
* 缂栬緫
*
@@ -132,7 +131,7 @@
equipmentUnsealService.updateMain(equipmentUnseal, equipmentUnsealPage.getEquipmentUnsealDetailList());
return Result.OK("缂栬緫鎴愬姛!");
}
-
+
/**
* 閫氳繃id鍒犻櫎
*
@@ -147,7 +146,7 @@
equipmentUnsealService.delMain(id);
return Result.OK("鍒犻櫎鎴愬姛!");
}
-
+
/**
* 鎵归噺鍒犻櫎
*
@@ -162,7 +161,7 @@
this.equipmentUnsealService.delBatchMain(Arrays.asList(ids.split(",")));
return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
}
-
+
/**
* 閫氳繃id鏌ヨ
*
@@ -180,7 +179,7 @@
return Result.OK(equipmentUnseal);
}
-
+
/**
* 閫氳繃id鏌ヨ
*
@@ -292,6 +291,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