细节修改

“linengliang”

2023-11-18 3363cc541bf40b48269950e1f6e6c87eec4603e6

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java

@@ -121,28 +121,28 @@
                           HttpServletRequest req) {
      Page<RepairOrder> page = new Page<RepairOrder>(pageNo, pageSize);
      IPage<RepairOrder> pageList = repairOrderService.getRepairOrderList(page, repairOrder);
      for(RepairOrder repairOrder1 : pageList.getRecords()){
         if(StringUtils.isNotBlank(repairOrder1.getReportRepairId())){
            EquipmentReportRepair equipmentReportRepair = equipmentReportRepairService.getById(repairOrder1.getReportRepairId());
            repairOrder1.setReportRepairNum(equipmentReportRepair.getNum());
         }
         if(StringUtils.isNotBlank(repairOrder1.getProjectMaintenanceOrderId())){
            ProjectMaintenanceOrderDetail projectMaintenanceOrderDetail = projectMaintenanceOrderDetailService.getById(repairOrder1.getProjectMaintenanceOrderId());
            repairOrder1.setProjectMaintenanceOrderNum(projectMaintenanceOrderDetail.getTaskNum());
         }

         String id = repairOrder1.getId();
         QueryWrapper<RepairOrderActualWorkHours> wrapper = new QueryWrapper<>();
         wrapper.eq("repair_order_id", id)
               .eq("del_flag", 0);
         wrapper.select("sum(actual_hour) as actualHour");
         Map<String, Object> map = repairOrderActualWorkHoursService.getMap(wrapper);
         BigDecimal actualHour = new BigDecimal(0);
         if (map != null) {
            actualHour = (BigDecimal) map.get("actualHour");
         }
         repairOrder1.setActualHour(actualHour);
      }
//      for(RepairOrder repairOrder1 : pageList.getRecords()){
//         if(StringUtils.isNotBlank(repairOrder1.getReportRepairId())){
//            EquipmentReportRepair equipmentReportRepair = equipmentReportRepairService.getById(repairOrder1.getReportRepairId());
//            repairOrder1.setReportRepairNum(equipmentReportRepair.getNum());
//         }
//         if(StringUtils.isNotBlank(repairOrder1.getProjectMaintenanceOrderId())){
//            ProjectMaintenanceOrderDetail projectMaintenanceOrderDetail = projectMaintenanceOrderDetailService.getById(repairOrder1.getProjectMaintenanceOrderId());
//            repairOrder1.setProjectMaintenanceOrderNum(projectMaintenanceOrderDetail.getTaskNum());
//         }
//
//         String id = repairOrder1.getId();
//         QueryWrapper<RepairOrderActualWorkHours> wrapper = new QueryWrapper<>();
//         wrapper.eq("repair_order_id", id)
//               .eq("del_flag", 0);
//         wrapper.select("sum(actual_hour) as actualHour");
//         Map<String, Object> map = repairOrderActualWorkHoursService.getMap(wrapper);
//         BigDecimal actualHour = new BigDecimal(0);
//         if (map != null) {
//            actualHour = (BigDecimal) map.get("actualHour");
//         }
//         repairOrder1.setActualHour(actualHour);
//      }
      return Result.OK(pageList);
   }