维修履历

“linengliang”

2023-12-12 a5b427bc39acc0cea80e3ca44d5744968778bc74

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

@@ -1547,6 +1547,15 @@
    @PutMapping(value = "/report")
    @Transactional(rollbackFor = {Exception.class})
    public Result<?> orderReport(@RequestBody RepairOrder repairOrder){
        String id = repairOrder.getId();
         List<RepairOrderActualWorkHours> hoursList = repairOrderActualWorkHoursService.list(new QueryWrapper<RepairOrderActualWorkHours>().eq("repair_order_id",id).eq("del_flag",0));
       List<RepairOrderActualWorkHours> mainStuff = repairOrderActualWorkHoursService.list(new QueryWrapper<RepairOrderActualWorkHours>().eq("repair_order_id",id).eq("del_flag",0).eq("principal_contractor","1"));
       if(hoursList.size()<2){
          return Result.error("操作失败，请至少添加两个承修人");
       }
       if(mainStuff.size()!=1){
          return Result.error("操作失败，请添加主承修人，有且只有一个");
       }
       if(StringUtils.isNotBlank(repairOrder.getProjectMaintenanceOrderId())){
          //判断项目性维修子表状态
          ProjectMaintenanceOrderDetail projectMaintenanceOrderDetail = projectMaintenanceOrderDetailService.getById(repairOrder.getProjectMaintenanceOrderId());
@@ -1587,7 +1596,7 @@
       repairOrder.setStatus("4");
       repairOrder.setActualEndTime(now);
       repairOrder.setActualHour(hours);
       repairOrder.setRecipientUserId(user.getId());
       repairOrder.setRecipientUserId(mainStuff.get(0).getUserId());
       repairOrderService.updateById(repairOrder);
       if(StringUtils.isNotBlank(repairOrder.getEquipmentId())){
          Equipment equipment = equipmentService.getById(repairOrder.getEquipmentId());