From bf465beb883aaa88e452b04f13a18f50f40b1354 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 14 十一月 2022 13:53:47 +0800
Subject: [PATCH] 卡口管理调整
---
ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java | 36 ++----------------------------------
1 files changed, 2 insertions(+), 34 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java b/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
index 28d34b3..f2499b2 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
@@ -1,15 +1,11 @@
package com.ycl.controller.epuipment;
-import com.alibaba.excel.EasyExcel;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
-import com.ycl.entity.dict.DataDictionary;
import com.ycl.entity.equipment.EquipmentBayonet;
-import com.ycl.entity.region.SccgRegion;
import com.ycl.service.dict.IDataDictionaryService;
import com.ycl.service.equipment.IEquipmentBayonetService;
import com.ycl.service.region.ISccgRegionService;
@@ -18,15 +14,10 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.SneakyThrows;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.stream.Collectors;
/**
* <p>
@@ -57,19 +48,7 @@
Page<EquipmentBayonet> equipmentBayonetPage = new Page<>();
equipmentBayonetPage.setCurrent(current);
equipmentBayonetPage.setSize(size);
- return CommonResult.success(iEquipmentBayonetService
- .page(equipmentBayonetPage, new LambdaQueryWrapper<EquipmentBayonet>()
- .like(StringUtils.isNotBlank(bayonetName), EquipmentBayonet::getBayonetName, bayonetName))
- .getRecords()
- .stream()
- .map(item -> {
- EquipmentBayonetVO equipmentBayonetVO = new EquipmentBayonetVO();
- BeanUtils.copyProperties(item, equipmentBayonetVO);
- equipmentBayonetVO.setFrontEndType(iDataDictionaryService.getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getId, item.getFrontEndType())).getName());
- equipmentBayonetVO.setInOutCityType(iDataDictionaryService.getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getId, item.getInOutCityType())).getName());
- equipmentBayonetVO.setBelongArea(iSccgRegionService.getOne(new LambdaQueryWrapper<SccgRegion>().eq(SccgRegion::getId,item.getBelongArea())).getRegionName());
- return equipmentBayonetVO;
- }).collect(Collectors.toList()));
+ return CommonResult.success(iEquipmentBayonetService.selectEquipmentPage(equipmentBayonetPage, bayonetName));
}
@PostMapping("/addition")
@@ -97,17 +76,6 @@
Page<EquipmentBayonet> equipmentBayonetPage = new Page<>();
equipmentBayonetPage.setCurrent(current);
equipmentBayonetPage.setSize(size);
- EasyExcelUtils.export(response,"鏁版嵁",EquipmentBayonetVO.class,iEquipmentBayonetService
- .page(equipmentBayonetPage, new LambdaQueryWrapper<EquipmentBayonet>()
- .like(StringUtils.isNotBlank(bayonetName), EquipmentBayonet::getBayonetName, bayonetName))
- .getRecords()
- .stream()
- .map(item -> {
- EquipmentBayonetVO equipmentBayonetVO = new EquipmentBayonetVO();
- BeanUtils.copyProperties(item, equipmentBayonetVO);
- equipmentBayonetVO.setFrontEndType(iDataDictionaryService.getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getId, item.getFrontEndType())).getName());
- equipmentBayonetVO.setInOutCityType(iDataDictionaryService.getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getId, item.getInOutCityType())).getName());
- return equipmentBayonetVO;
- }).collect(Collectors.toList()));
+ EasyExcelUtils.export(response, "鏁版嵁", EquipmentBayonetVO.class, iEquipmentBayonetService.selectEquipmentPage(equipmentBayonetPage, bayonetName).getRecords());
}
}
\ No newline at end of file
--
Gitblit v1.8.0