From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentReportRepairServiceImpl.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentReportRepairServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentReportRepairServiceImpl.java
index 226a957..70413d9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentReportRepairServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentReportRepairServiceImpl.java
@@ -1,6 +1,8 @@
package org.jeecg.modules.eam.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -14,8 +16,13 @@
//import org.jeecg.modules.system.entity.SysUpload;
//import org.jeecg.modules.system.entity.SysUploadRela;
//import org.jeecg.modules.system.service.IUploadRelaService;
+import org.jeecg.modules.eam.vo.RepairReportExportVo;
+import org.jeecg.modules.system.entity.SysRole;
import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.entity.SysUserRole;
+import org.jeecg.modules.system.mapper.SysRoleMapper;
import org.jeecg.modules.system.mapper.SysUserMapper;
+import org.jeecg.modules.system.mapper.SysUserRoleMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -23,6 +30,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @Description: equipment_report_repair
@@ -39,6 +47,10 @@
private ISysBaseAPI sysBaseApi;
@Autowired
private SysUserMapper userMapper;
+ @Autowired
+ private SysUserRoleMapper sysUserRoleMapper;
+ @Autowired
+ private SysRoleMapper sysRoleMapper;
/**
* 鏁呴殰鎶ヤ慨娣诲姞
*
@@ -100,12 +112,45 @@
IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
if(StringUtils.isNotBlank((String)params.get("userId"))){
SysUser sysUser = userMapper.selectById((String)params.get("userId"));
- params.put("teamId",sysUser.getTeamId());
+ SysRole sysRole = sysRoleMapper.selectOne(new QueryWrapper<SysRole>().eq("role_code","AcceptAllRepair"));
+ if(ObjectUtils.isNull(sysRole)){
+ params.put("teamId",sysUser.getTeamId());
+ }else {
+ SysUserRole sysUserRole = sysUserRoleMapper.selectOne(new QueryWrapper<SysUserRole>().eq("user_id",sysUser.getId()).eq("role_id",sysRole.getId()));
+ if(ObjectUtils.isNull(sysUserRole)){
+ params.put("teamId",sysUser.getTeamId());
+ }
+ }
}
List<String> equipNums = new ArrayList<>();
if(StringUtils.isNotBlank((String)params.get("nums"))){
- equipNums = Arrays.asList(((String) params.get("nums")).trim().split(","));
+ equipNums = Arrays.asList(((String) params.get("nums")).trim().split("\n")).stream().filter(num->!num.equals("\n")).collect(Collectors.toList());
}
return super.getBaseMapper().getReportRepairList(pageData, params,equipNums) ;
}
+
+ @Override
+ public List<RepairReportExportVo> exportList(RepairReportExportVo repairReportExportVo) {
+ List<String> equipNums = new ArrayList<>();
+ if(StringUtils.isNotBlank(repairReportExportVo.getNums())){
+ equipNums = Arrays.asList(repairReportExportVo.getNums().trim().split("\n"));
+ }
+ return baseMapper.exportList(
+ repairReportExportVo.getNum(),
+ repairReportExportVo.getFaultStartTime(),
+ repairReportExportVo.getFaultEndTime(),
+ repairReportExportVo.getIsStop(),
+ repairReportExportVo.getStatus(),
+ repairReportExportVo.getErrUda2(),
+ repairReportExportVo.getErrUda1(),
+ repairReportExportVo.getCreateBy(),
+ repairReportExportVo.getEquipmentNum(),
+ repairReportExportVo.getEquipmentName(),
+ repairReportExportVo.getModel(),
+ repairReportExportVo.getSpecification(),
+ repairReportExportVo.getUseId(),
+ equipNums
+ );
+
+ }
}
--
Gitblit v1.9.3