From 5bdb7fbe5290dd64342de92f12ffb45c3f5abe28 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 09 Mar 2022 15:27:05 +0800
Subject: [PATCH] 导入测试接口修改（admin用），自动生成保安证编号并存档
---
src/main/java/org/springblade/modules/electronrail/service/impl/ElectronRailServiceImpl.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/electronrail/service/impl/ElectronRailServiceImpl.java b/src/main/java/org/springblade/modules/electronrail/service/impl/ElectronRailServiceImpl.java
index 1be63f8..a2687bf 100644
--- a/src/main/java/org/springblade/modules/electronrail/service/impl/ElectronRailServiceImpl.java
+++ b/src/main/java/org/springblade/modules/electronrail/service/impl/ElectronRailServiceImpl.java
@@ -3,11 +3,18 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.modules.dispatcher.entity.DispatcherUnit;
+import org.springblade.modules.dispatcher.service.IDispatcherUnitService;
import org.springblade.modules.electronrail.entity.ElectronRail;
import org.springblade.modules.electronrail.mapper.ElectronRailMapper;
import org.springblade.modules.electronrail.service.ElectronRailService;
import org.springblade.modules.electronrail.vo.ElectronRailVO;
+import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.service.IDeptService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* 电子围栏服务实现类
@@ -18,6 +25,12 @@
@Service
public class ElectronRailServiceImpl extends ServiceImpl<ElectronRailMapper, ElectronRail> implements ElectronRailService {
+ @Autowired
+ private IDeptService deptService;
+
+ @Autowired
+ private IDispatcherUnitService dispatcherUnitService;
+
/**
* 自定义分页查询电子围栏数据
* @param page
@@ -26,6 +39,27 @@
*/
@Override
public IPage<ElectronRailVO> selectElectronRailPage(IPage<ElectronRailVO> page, ElectronRailVO electronRail) {
- return page.setRecords(baseMapper.selectElectronRailPage(page, electronRail));
+ List<ElectronRailVO> railVOS = baseMapper.selectElectronRailPage(page, electronRail);
+ //遍历
+ if (railVOS.size()>0){
+ railVOS.forEach(electronRailVO -> {
+ //根据类型查询单位名称
+ if (electronRailVO.getType().equals(1) || electronRailVO.getType().equals(2)){
+ //本单位
+ Dept dept = deptService.getById(electronRailVO.getCompanyId());
+ if (null!=dept){
+ electronRailVO.setCompanyName(dept.getDeptName());
+ }
+ }
+ if (electronRailVO.getType().equals(3)){
+ //服务单位
+ DispatcherUnit dispatcherUnit = dispatcherUnitService.getById(electronRailVO.getCompanyId());
+ if (null!=dispatcherUnit){
+ electronRailVO.setCompanyName(dispatcherUnit.getName());
+ }
+ }
+ });
+ }
+ return page.setRecords(railVOS);
}
}
--
Gitblit v1.9.3