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/service/impl/RepairOrderServiceImpl.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/RepairOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/RepairOrderServiceImpl.java
index 1607d57..df0bab1 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/RepairOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/RepairOrderServiceImpl.java
@@ -5,7 +5,9 @@
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.DateUtils;
import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.entity.EquipmentReportRepair;
@@ -19,6 +21,7 @@
import org.jeecg.modules.eam.vo.EquipmentAvailabilityVo;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.mapper.SysUserMapper;
+import org.jeecg.modules.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -63,6 +66,9 @@
@Autowired
private IEquipmentReportRepairService equipmentReportRepairService;
+ @Autowired
+ private ISysUserService sysUserService;
+
@Override
@@ -101,9 +107,25 @@
}else{
repairOrder.setTeamId("");
}
+
+ LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ SysUser sysUser = sysUserService.getById(user.getId());
+ String areaId = sysUser.getAreaId();
+ List<String> workCenterIds = null;
+ if(StringUtils.isNotBlank(areaId)){
+ String[] split = areaId.split(",");
+ workCenterIds = Arrays.asList(split);
+ }
+
List<String> equipNums = new ArrayList<>();
if(StringUtils.isNotBlank(repairOrder.getNums())){
equipNums = Arrays.asList(repairOrder.getNums().trim().split("\n")).stream().filter(num->!num.equals("\n")).collect(Collectors.toList());
+ }
+ //鐘舵�佺瓫閫�
+ List<String> statusEnumList = null;
+ if(repairOrder.getStatusEnums() != null && StringUtils.isNotBlank(repairOrder.getStatusEnums())) {
+ String[] statusEnums = repairOrder.getStatusEnums().split(",");
+ statusEnumList = Arrays.asList(statusEnums);
}
return page.setRecords(baseMapper.getRepairOrderList(page,
repairOrder.getId(),
@@ -123,7 +145,10 @@
repairOrder.getCreateStartTime(),
repairOrder.getCreateEndTime(),
repairOrder.getEquipmentImportanceId(),
- repairOrder.getFaultCause()
+ repairOrder.getFaultCause(),
+ workCenterIds,
+ repairOrder.getEquipmentId(),
+ statusEnumList
));
}
@@ -148,6 +173,11 @@
}
@Override
+ public List<Map<String, Object>> getEquipmentFaultCause(Map<String, Object> params) {
+ return this.baseMapper.getEquipmentFaultCause(params);
+ }
+
+ @Override
public IPage<Map<String, Object>> getMTPF(Integer pageNo, Integer pageSize, Map<String, Object> params) {
IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
return this.baseMapper.getMTPF(pageData,params);
--
Gitblit v1.9.3