维修工单

“linengliang”

2023-11-18 7eef12f6ffa0a76abb3a6dfecda9460144655e3a

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

@@ -1,6 +1,7 @@
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 com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.eam.entity.RepairOrder;
@@ -8,14 +9,14 @@
import org.jeecg.modules.eam.mapper.*;
import org.jeecg.modules.eam.service.IRepairOrderDetailService;
import org.jeecg.modules.eam.service.IRepairOrderService;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.mapper.SysUserMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.io.Serializable;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
 * @Description: 维修工单
@@ -42,6 +43,8 @@
   private RepairOrderActualWorkHoursMapper repairOrderActualWorkHoursMapper;
   @Autowired
   private EquipmentDocumentMapper equipmentDocumentMapper;
   @Autowired
   private SysUserMapper sysUserMapper;



@@ -75,8 +78,17 @@

   @Override
   public Page<RepairOrder> getRepairOrderList(Page<RepairOrder> page, RepairOrder repairOrder) {

      return page.setRecords(baseMapper.getRepairOrderList(page,repairOrder.getNum(),repairOrder.getEquipmentNum(),repairOrder.getEquipmentName(),repairOrder.getStatus(),repairOrder.getRepairOrderType()));
      if(StringUtils.isNotBlank(repairOrder.getUserId())){
         SysUser sysUser = sysUserMapper.selectById(repairOrder.getUserId());
         repairOrder.setTeamId(sysUser.getTeamId());
      }else{
         repairOrder.setTeamId("");
      }
      List<String> equipNums = new ArrayList<>();
        if(StringUtils.isNotBlank(repairOrder.getNums())){
           equipNums = Arrays.asList(repairOrder.getNums().trim().split(","));
      }
      return page.setRecords(baseMapper.getRepairOrderList(page,repairOrder.getId(),repairOrder.getNum(),repairOrder.getEquipmentNum(),repairOrder.getEquipmentName(),repairOrder.getStatus(),repairOrder.getRepairOrderType(),repairOrder.getEquipmentCategoryId(),repairOrder.getFactoryModelId(),repairOrder.getSpecificEquipment(),repairOrder.getTeamId(),equipNums,repairOrder.getRepairOrderUda1()));
   }

   @Override