新版430
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
zenglf
2023-09-28 f84d9e69907cb678150eaa6393fd74cf042fcca4 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnsealController.java


@@ -13,37 +13,34 @@


import javax.servlet.http.HttpServletResponse;




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.EquipmentUnsealDetail;


import org.jeecg.modules.eam.entity.EquipmentUnseal;


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 +57,10 @@


   private IEquipmentUnsealService equipmentUnsealService;


   @Autowired


   private IEquipmentUnsealDetailService equipmentUnsealDetailService;


	




    @Autowired


   private IEamEquipmentService equipmentService;




   /**


    * 分页列表查询


    *


@@ -292,6 +292,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);


    }