设备管理修改

qushaowei

2024-07-12 15ae1e3b5cda40a8248a1addf4a64c1e0a9e2b13

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

@@ -29,6 +29,7 @@
import java.text.SimpleDateFormat;
import java.time.YearMonth;
import java.util.*;
import java.util.stream.Collectors;

/**
 * @Description: 维修工单
@@ -102,9 +103,54 @@
      }
      List<String> equipNums = new ArrayList<>();
        if(StringUtils.isNotBlank(repairOrder.getNums())){
           equipNums = Arrays.asList(repairOrder.getNums().trim().split(","));
           equipNums = Arrays.asList(repairOrder.getNums().trim().split("\n")).stream().filter(num->!num.equals("\n")).collect(Collectors.toList());
      }
      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()));
      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(),
            repairOrder.getFaultStartTime(),
            repairOrder.getFaultEndTime(),
            repairOrder.getCreateStartTime(),
            repairOrder.getCreateEndTime(),
            repairOrder.getEquipmentImportanceId(),
            repairOrder.getFaultCause()
            ));
   }

   @Override
   public List<Map<String, Object>> getFaultCause(String equipmentId) {
      return this.baseMapper.getFaultCause(equipmentId);
   }

   @Override
   public List<Map<String, Object>> getAllFaultCause() {
      return this.baseMapper.getAllFaultCause();
   }

   @Override
   public List<Map<String, Object>> getFaultCausePie( Map<String, Object> params) {
      return this.baseMapper.getFaultCausePie(params);
   }

   @Override
   public List<Map<String, Object>> getFaultCauseBar(Map<String, Object> params) {
      return this.baseMapper.getFaultCauseBar(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);
   }

   @Override
@@ -383,7 +429,7 @@
               if(equipmentReportRepair.getFaultTime() != null && equipmentReportRepair.getFaultTime().compareTo(endDate) < 0 &&  equipmentReportRepair.getFaultTime().compareTo(startDate) > 0){
                  //2、验收时间在查询时间段内
                  if(equipmentReportRepair.getAcceptTime() != null && equipmentReportRepair.getAcceptTime().compareTo(endDate) < 0){
                     equipmentFaultTime = equipmentFaultTime.add(new BigDecimal(equipmentReportRepair.getFaultHour()));
                     equipmentFaultTime = equipmentFaultTime.add(equipmentReportRepair.getFaultHour());
                     int flag = 0;
                     if(CollectionUtils.isNotEmpty(faultTimeList)){
                        for(String faultTime : faultTimeList){
@@ -504,7 +550,7 @@
               if(equipmentReportRepair.getFaultTime() != null && equipmentReportRepair.getFaultTime().compareTo(endDate) < 0 &&  equipmentReportRepair.getFaultTime().compareTo(startDate) > 0){
                  //2、验收时间在查询时间段内
                  if(equipmentReportRepair.getAcceptTime() != null && equipmentReportRepair.getAcceptTime().compareTo(endDate) < 0){
                     equipmentFaultTime = equipmentFaultTime.add(new BigDecimal(equipmentReportRepair.getFaultHour()));
                     equipmentFaultTime = equipmentFaultTime.add(equipmentReportRepair.getFaultHour());
                     //3、验收时间大于查询结束时间
                  }else {
                     long diff2 = endDate.getTime() - equipmentReportRepair.getFaultTime().getTime();