点检报表修改

qushaowei

2025-05-29 07a7e4e1a172960806e41ce686044aabc50ca379

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

@@ -161,8 +161,8 @@
//            List<MaintenanceCycleVo> maintenanceCycles = dailyMaintenanceOrderService.getMaintenanceCycleByStandardId(maintenanceStandardId);
//            record.put("maintenanceCycles", maintenanceCycles);

//            List<Map<String, Object>> dailyMaintenanceDetails = dailyMaintenanceOrderService.getDailyMaintenanceDetailByOrderId(id);
//            record.put("dailyMaintenanceDetails", dailyMaintenanceDetails);
            List<Map<String, Object>> dailyMaintenanceDetails = dailyMaintenanceOrderService.getDailyMaintenanceDetailByOrderId(id);
            record.put("dailyMaintenanceDetails", dailyMaintenanceDetails);

            List<Map<String, Object>> operationUserDetails = dailyMaintenanceOrderService.getOperationUser(id);
            record.put("operationUserDetails", operationUserDetails);
@@ -677,6 +677,11 @@
        finishTransferOrder.setDelFlag(0);
        finishTransferOrderService.save(finishTransferOrder);

        String equipmentId = maintenanceOrder.getEquipmentId();
        Equipment equipment = equipmentService.getById(equipmentId);
        equipment.setSecondMaintenanceTime(new Date());
        equipmentService.updateById(equipment);

        if (!b) {
            return Result.error("报工失败!");
        } else {
@@ -722,6 +727,20 @@

        this.createMaintenanceStoveExempt(maintenanceOrder);

        /**
         * 三保报工时  更新本次三保日期  和下次三保日期
         */
        String equipmentImportanceId = equipment.getEquipmentImportanceId();
        equipment.setThirdMaintenanceTime(new Date());
        if("A".equals(equipmentImportanceId)){
            equipment.setNextThirdMaintenanceTime(DateUtils.getYearAfter(new Date(),3));
        }else if("B".equals(equipmentImportanceId)){
            equipment.setNextThirdMaintenanceTime(DateUtils.getYearAfter(new Date(),4));
        }else if("C".equals(equipmentImportanceId)){
            equipment.setNextThirdMaintenanceTime(DateUtils.getYearAfter(new Date(),4));
        }
        equipmentService.updateById(equipment);

        if (!b) {
            return Result.error("报工失败!");
        } else {