维修履历

“linengliang”

2023-12-12 a5b427bc39acc0cea80e3ca44d5744968778bc74

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

@@ -383,7 +383,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 +504,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();