问题项修改

qushaowei

2024-07-25 654dc30c50b1c176966ad8e6e7d791b92531de83

 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,6 +107,16 @@
      }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());
@@ -123,7 +139,8 @@
            repairOrder.getCreateStartTime(),
            repairOrder.getCreateEndTime(),
            repairOrder.getEquipmentImportanceId(),
            repairOrder.getFaultCause()
            repairOrder.getFaultCause(),
            workCenterIds
            ));
   }

@@ -148,6 +165,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);