Merge remote-tracking branch 'origin/master'

Lius

2024-07-25 854856127101ea6cbbc261db46cb06ac141d6ab0

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

@@ -1,28 +1,39 @@
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;
//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.jeecg.modules.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

/**
 * @Description: equipment_report_repair
@@ -37,6 +48,15 @@
//    private IUploadRelaService uploadRelaService;
    @Autowired
    private ISysBaseAPI sysBaseApi;
    @Autowired
    private SysUserMapper userMapper;
    @Autowired
    private SysUserRoleMapper sysUserRoleMapper;
    @Autowired
    private SysRoleMapper sysRoleMapper;

    @Autowired
    private ISysUserService sysUserService;
    /**
     * 故障报修添加
     *
@@ -61,7 +81,6 @@
        baseMapper.updateById(faultTimeVerify(equipmentReportRepair));
        // 验证修改前修改后是否一致
        if (!equipmentReportRepair.getPhoto().equals(equipmentReportRepair1.getPhoto())) {
//            uploadRelaService.delSysUploadRelaByBusIdAndBusType(id, "equipment_management_failure_photo");
            sysBaseApi.delSysUploadRelaByBusIdAndBusType(id, "equipment_management_failure_photo");
            establishRelations(equipmentReportRepair.getSysUploadList(), id);
        }
@@ -89,7 +108,6 @@
                    sysUploadRelaList.add(sysUploadRela);
                });
                // 上传文件与业务数据关系
//                uploadRelaService.saveBatch(sysUploadRelaList);
                sysBaseApi.saveOrUpdateBatchUploadRela(sysUploadRelaList);
            }
        }
@@ -98,6 +116,58 @@
    @Override
    public IPage<Map<String, Object>> getReportRepairList(Integer pageNo, Integer pageSize, Map<String, Object> params) {
        IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
        return super.getBaseMapper().getReportRepairList(pageData, params) ;
        if(StringUtils.isNotBlank((String)params.get("userId"))){
            SysUser sysUser = userMapper.selectById((String)params.get("userId"));
            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());
        }
        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
        );

    }
}