问题项修改

qushaowei

2024-07-25 654dc30c50b1c176966ad8e6e7d791b92531de83

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentReportRepairServiceImpl.java

@@ -1,13 +1,17 @@
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;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.base.entity.SysUpload;
import org.jeecg.common.system.base.entity.SysUploadRela;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.eam.entity.EquipmentReportRepair;
import org.jeecg.modules.eam.mapper.EquipmentReportRepairMapper;
import org.jeecg.modules.eam.service.IEquipmentReportRepairService;
@@ -15,8 +19,13 @@
//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.jeecg.modules.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -41,6 +50,13 @@
    private ISysBaseAPI sysBaseApi;
    @Autowired
    private SysUserMapper userMapper;
    @Autowired
    private SysUserRoleMapper sysUserRoleMapper;
    @Autowired
    private SysRoleMapper sysRoleMapper;

    @Autowired
    private ISysUserService sysUserService;
    /**
     * 故障报修添加
     *
@@ -102,8 +118,27 @@
        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());
                }
            }
        }

        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);
        }

        List<String> equipNums = new ArrayList<>();
        if(StringUtils.isNotBlank((String)params.get("nums"))){
            equipNums = Arrays.asList(((String) params.get("nums")).trim().split("\n")).stream().filter(num->!num.equals("\n")).collect(Collectors.toList());