From a7ecb4b14c2e5a56f425f46decc9c203580edd35 Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期四, 25 七月 2024 10:56:56 +0800 Subject: [PATCH] 小修改 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderServiceImpl.java | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderServiceImpl.java index 4bac73c..f53a6f1 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderServiceImpl.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderServiceImpl.java @@ -1,16 +1,23 @@ package org.jeecg.modules.eam.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.shiro.SecurityUtils; +import org.jeecg.common.system.vo.LoginUser; import org.jeecg.modules.eam.entity.DailyMaintenanceOrder; import org.jeecg.modules.eam.mapper.DailyMaintenanceOrderMapper; import org.jeecg.modules.eam.model.DepartVo; import org.jeecg.modules.eam.model.MaintenanceCycleVo; import org.jeecg.modules.eam.service.IDailyMaintenanceOrderService; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.service.ISysUserService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.Arrays; import java.util.List; import java.util.Map; @@ -23,15 +30,36 @@ @Service public class DailyMaintenanceOrderServiceImpl extends ServiceImpl<DailyMaintenanceOrderMapper, DailyMaintenanceOrder> implements IDailyMaintenanceOrderService { + @Autowired + private ISysUserService sysUserService; + @Override public IPage<Map<String, Object>> getDailyMaintenanceOrderList(Integer pageNo, Integer pageSize, Map<String, Object> params) { IPage<Map> pageData = new Page<Map>(pageNo, pageSize); + 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); + params.put("workCenterIds",workCenterIds); + } return super.getBaseMapper().getDailyMaintenanceOrderList(pageData,params); } @Override public IPage<Map<String, Object>> getDailyMaintenanceOrder3List(Integer pageNo, Integer pageSize, Map<String, Object> params) { IPage<Map> pageData = new Page<Map>(pageNo, pageSize); + 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); + params.put("workCenterIds",workCenterIds); + } return super.getBaseMapper().getDailyMaintenanceOrder3List(pageData,params); } @@ -50,6 +78,16 @@ return this.baseMapper.getDailyMaintenanceOrderDetailByOrderId(dailyMaintenanceOrderId); } + @Override + public List<Map<String, Object>> getOperationUser(String dailyMaintenanceOrderId) { + return this.baseMapper.getOperationUser(dailyMaintenanceOrderId); + } + + @Override + public List<Map<String, Object>> getRepairUser(String dailyMaintenanceOrderId) { + return this.baseMapper.getRepairUser(dailyMaintenanceOrderId); + } + /** * 鏃ュ父淇濆吇宸ュ崟 鑾峰彇璁惧鍙扮珯宸茬粦瀹氱殑瀵硅薄閮ㄩ棬 * qsw 2023-7-11 -- Gitblit v1.9.3