From 608f20e0d5d8f95d9bbb917e95e2913682deb77d Mon Sep 17 00:00:00 2001
From: PC <PC@PC1RHZ4L>
Date: 星期日, 31 三月 2024 10:00:00 +0800
Subject: [PATCH] Merge branch 'master' of http://wangzq@www.beijingsoft.cn:9090/r/smart.git

---
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/RepairApplyServiceImpl.java |  461 +++++++++++----------------------------------------------
 1 files changed, 91 insertions(+), 370 deletions(-)

diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/RepairApplyServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/RepairApplyServiceImpl.java
index 7d5bde8..3dea7e7 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/RepairApplyServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/RepairApplyServiceImpl.java
@@ -80,351 +80,6 @@
     @Autowired
     private IWorkstationService workstationService;
 
-    private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
-        String implMethodName = lambda.getImplMethodName();
-        boolean z = true;
-        switch (implMethodName.hashCode()) {
-            case -2085769275:
-                if (implMethodName.equals("getApplyCode")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case -1107875961:
-                if (implMethodName.equals("getDeviceId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case -826050023:
-                if (implMethodName.equals("getRecordStatus")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case -151423706:
-                if (implMethodName.equals("getRepairApplyId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 37124789:
-                if (implMethodName.equals("getMalfunctionId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 98245393:
-                if (implMethodName.equals("getId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 482925913:
-                if (implMethodName.equals("getDeviceCode")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 483240439:
-                if (implMethodName.equals("getDeviceName")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 731625057:
-                if (implMethodName.equals("getDeviceTypeId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 771206363:
-                if (implMethodName.equals("getTenantId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 862572307:
-                if (implMethodName.equals("getUrgency")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 1071464927:
-                if (implMethodName.equals("getCreateTime")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 1317519847:
-                if (implMethodName.equals("getMalfunctionTime")) {
-                    z = false;
-                    break;
-                }
-                break;
-            case 1331332693:
-                if (implMethodName.equals("getIsAffect")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 1788066762:
-                if (implMethodName.equals("getApplyStatus")) {
-                    z = true;
-                    break;
-                }
-                break;
-        }
-        switch (z) {
-            case false:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApply") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDateTime;")) {
-                    return (v0) -> {
-                        return v0.getMalfunctionTime();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
-                    return (v0) -> {
-                        return v0.getCreateTime();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApply") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getMalfunctionId();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApply") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getApplyCode();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApply") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getApplyCode();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApply") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getApplyCode();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getId();
-                    };
-                }
-                break;
-            case RegionCache.VILLAGE_LEVEL /* 5 */:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/tenant/mp/TenantEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getTenantId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/tenant/mp/TenantEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getTenantId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/tenant/mp/TenantEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getTenantId();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApply") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getIsAffect();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApply") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getIsAffect();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApply") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getDeviceId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApply") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getDeviceId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getDeviceId();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApply") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getDeviceCode();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApply") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getDeviceCode();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApply") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getApplyStatus();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApply") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getApplyStatus();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApply") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getApplyStatus();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApply") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getApplyStatus();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApply") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getApplyStatus();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApply") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getApplyStatus();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApply") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getApplyStatus();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApply") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getApplyStatus();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApply") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getApplyStatus();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApply") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getApplyStatus();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApply") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getDeviceTypeId();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApply") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getDeviceName();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApply") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getDeviceName();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApply") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getUrgency();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApply") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getUrgency();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getRecordStatus();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApplyFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getRepairApplyId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApplyFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getRepairApplyId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApplyFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getRepairApplyId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApplyFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getRepairApplyId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairApplyFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getRepairApplyId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/tpm/entity/RepairRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getRepairApplyId();
-                    };
-                }
-                break;
-        }
-        throw new IllegalArgumentException("Invalid lambda deserialization");
-    }
-
     @Override // org.springblade.modules.tpm.service.IRepairApplyService
     @Transactional(rollbackFor = {Exception.class})
     public RepairApply createRepairApply(RepairApplyAddVO repairApplyAddVO) {
@@ -453,41 +108,61 @@
     }
 
     private boolean checkApplyCode(String applyCode) {
+    	RepairApply repairApply = this.baseMapper.selectOne(Wrappers.<RepairApply>query().lambda()
+    			.eq(Func.isNotEmpty(AuthUtil.getTenantId()), RepairApply::getTenantId, AuthUtil.getTenantId())
+    			.eq(RepairApply::getApplyCode, applyCode));
+    	/*
         RepairApply repairApply = (RepairApply) this.baseMapper.selectOne((Wrapper) Wrappers.query().lambda().eq(Func.isNotEmpty(AuthUtil.getTenantId()), (v0) -> {
             return v0.getTenantId();
         }, AuthUtil.getTenantId()).eq((v0) -> {
             return v0.getApplyCode();
-        }, applyCode));
+        }, applyCode));*/
         return repairApply != null;
     }
 
     @Override // org.springblade.modules.tpm.service.IRepairApplyService
     public RepairApplyDetailVO detailApply(Long id) {
+    	
+    	RepairApply repairApply = this.baseMapper.selectOne(Wrappers.<RepairApply>query().lambda().eq(RepairApply::getId, id));
+    	/*
         RepairApply repairApply = (RepairApply) this.baseMapper.selectOne((Wrapper) Wrappers.query().lambda().eq((v0) -> {
             return v0.getId();
-        }, id));
+        }, id));*/
         if (Func.isEmpty(repairApply)) {
             throw new ServiceException(MessageUtils.message("cps.tpm.repair.apply.not.exists", new Object[0]));
         }
+        List<RepairApplyFile> fileList = this.iRepairApplyFileService.list(Wrappers.<RepairApplyFile>lambdaQuery().eq(RepairApplyFile::getRepairApplyId, id));
+        /*
         List<RepairApplyFile> fileList = this.iRepairApplyFileService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
             return v0.getRepairApplyId();
-        }, id));
+        }, id));*/
         new RepairApplyDetailVO();
         RepairApplyDetailVO vo = RepairApplyConvert.INSTANCE.convert1(repairApply);
+        List<RepairApplyFileAddDTO> fileAddDtoList = fileList.stream().map(RepairApplyFileConvert.INSTANCE::convert).collect(Collectors.toList());
+        /*
         Stream<RepairApplyFile> stream = fileList.stream();
         RepairApplyFileConvert repairApplyFileConvert = RepairApplyFileConvert.INSTANCE;
         repairApplyFileConvert.getClass();
         List<RepairApplyFileAddDTO> fileAddDtoList = (List) stream.map(this::convert).collect(Collectors.toList());
+        */
         if (Func.isNotEmpty(fileAddDtoList)) {
             vo.setFileAddDTOList(fileAddDtoList);
         } else {
-            vo.setFileAddDTOList(new ArrayList());
+            vo.setFileAddDTOList(new ArrayList<>());
         }
         return vo;
     }
 
     @Override // org.springblade.modules.tpm.service.IRepairApplyService
     public IPage<RepairApplyVO> getPageApply(RepairApplyLookVO repairApplyLookVO, Query query) {
+    	IPage<RepairApply> pages = page(Condition.getPage(query), Wrappers.<RepairApply>lambdaQuery()
+    	        .eq(Func.isNotEmpty(AuthUtil.getTenantId()), RepairApply::getTenantId, AuthUtil.getTenantId())
+    	        .and(Func.isNotEmpty(repairApplyLookVO.getDeviceTypeId()), i -> i.eq(RepairApply::getDeviceTypeId, repairApplyLookVO.getDeviceTypeId()))
+    	        .and(CollectionUtil.isNotEmpty(repairApplyLookVO.getApplyStatusList()), i -> i.in(RepairApply::getApplyStatus, repairApplyLookVO.getApplyStatusList()))
+    	        .and(Func.isNotEmpty(repairApplyLookVO.getKeyWords()), i -> i.likeRight(RepairApply::getApplyCode, repairApplyLookVO.getKeyWords()).or().likeRight(RepairApply::getDeviceCode, repairApplyLookVO.getKeyWords()).or().likeRight(RepairApply::getDeviceName, repairApplyLookVO.getKeyWords()))
+    	        
+    	        .orderByAsc(RepairApply::getIsAffect).orderByDesc(RepairApply::getUrgency).orderByDesc(RepairApply::getCreateTime).orderByDesc(RepairApply::getId));
+    	/*
         IPage<RepairApply> pages = page(Condition.getPage(query), (Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq(Func.isNotEmpty(AuthUtil.getTenantId()), (v0) -> {
             return v0.getTenantId();
         }, AuthUtil.getTenantId()).and(Func.isNotEmpty(repairApplyLookVO.getDeviceTypeId()), i -> {
@@ -514,12 +189,19 @@
             return v0.getCreateTime();
         })).orderByDesc((v0) -> {
             return v0.getId();
-        }));
-        return RepairApplyConvert.INSTANCE.convert((IPage) pages);
+        }));*/
+        return RepairApplyConvert.INSTANCE.convert(pages);
     }
 
     @Override // org.springblade.modules.tpm.service.IRepairApplyService
     public List<RepairApplyVO> queryApply(RepairApplyLookVO repairApplyLookVO) {
+    	List<RepairApply> pages = list(Wrappers.<RepairApply>lambdaQuery()
+    	        .eq(Func.isNotEmpty(AuthUtil.getTenantId()), RepairApply::getTenantId, AuthUtil.getTenantId())
+    	        .and(CollectionUtil.isNotEmpty(repairApplyLookVO.getApplyStatusList()), i -> i.in(RepairApply::getApplyStatus, repairApplyLookVO.getApplyStatusList()))
+    	        .and(Func.isNotEmpty(repairApplyLookVO.getKeyWords()), i -> i.likeRight(RepairApply::getApplyCode, repairApplyLookVO.getKeyWords()).or().likeRight(RepairApply::getDeviceCode, repairApplyLookVO.getKeyWords()).or().likeRight(RepairApply::getDeviceName, repairApplyLookVO.getKeyWords()))
+    	        
+    	        .orderByAsc(RepairApply::getIsAffect).orderByDesc(RepairApply::getUrgency).orderByAsc(RepairApply::getMalfunctionTime));
+    	/*
         List<RepairApply> pages = list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq(Func.isNotEmpty(AuthUtil.getTenantId()), (v0) -> {
             return v0.getTenantId();
         }, AuthUtil.getTenantId()).and(CollectionUtil.isNotEmpty(repairApplyLookVO.getApplyStatusList()), i -> {
@@ -540,7 +222,7 @@
             return v0.getUrgency();
         })).orderByAsc((v0) -> {
             return v0.getMalfunctionTime();
-        }));
+        }));*/
         return RepairApplyConvert.INSTANCE.convert(pages);
     }
 
@@ -556,50 +238,64 @@
         for (Long id : ids) {
             RepairApply repairApply = (RepairApply) getById(id);
             removeById(id);
+            List<RepairApplyFile> list = this.iRepairApplyFileService.list(Wrappers.<RepairApplyFile>lambdaQuery().eq(RepairApplyFile::getRepairApplyId, id));
+            /*
             List<RepairApplyFile> list = this.iRepairApplyFileService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
                 return v0.getRepairApplyId();
-            }, id));
+            }, id));*/
             if (Func.isNotEmpty(list)) {
                 list.forEach(i -> {
                     this.iRepairApplyFileService.removeById(i.getId());
                 });
             }
+            
+            List<RepairApply> y1List = list(Wrappers.<RepairApply>query().lambda().eq(RepairApply::getDeviceId, repairApply.getDeviceId()).eq(RepairApply::getApplyStatus, Integer.valueOf(RepairApplyStatusEnum.Y1.getType())));
+            /*
             List<RepairApply> y1List = list((Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
                 return v0.getDeviceId();
             }, repairApply.getDeviceId())).eq((v0) -> {
                 return v0.getApplyStatus();
-            }, Integer.valueOf(RepairApplyStatusEnum.Y1.getType())));
+            }, Integer.valueOf(RepairApplyStatusEnum.Y1.getType())));*/
+            List<RepairApply> y2List = list(Wrappers.<RepairApply>query().lambda().eq(RepairApply::getDeviceId, repairApply.getDeviceId()).eq(RepairApply::getApplyStatus, Integer.valueOf(RepairApplyStatusEnum.Y2.getType())));
+            /*
             List<RepairApply> y2List = list((Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
                 return v0.getDeviceId();
             }, repairApply.getDeviceId())).eq((v0) -> {
                 return v0.getApplyStatus();
             }, Integer.valueOf(RepairApplyStatusEnum.Y2.getType())));
+            */
+            List<RepairRecord> r1List = this.repairRecordService.list(Wrappers.<RepairRecord>query().lambda().eq(RepairRecord::getDeviceId, repairApply.getDeviceId()).eq(RepairRecord::getRecordStatus, Integer.valueOf(RepairRecordEnum.R1.getType())));
+            /*
             List<RepairRecord> r1List = this.repairRecordService.list((Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
                 return v0.getDeviceId();
             }, repairApply.getDeviceId())).eq((v0) -> {
                 return v0.getRecordStatus();
-            }, Integer.valueOf(RepairRecordEnum.R1.getType())));
+            }, Integer.valueOf(RepairRecordEnum.R1.getType())));*/
             this.machineService.updateMachineRepairPriority(repairApply.getDeviceId(), r1List, y2List, y1List);
         }
         return true;
     }
 
     private boolean checkApplyStatus(List<Long> ids) {
+    	List<RepairApply> list = list(Wrappers.<RepairApply>query().lambda().ne(RepairApply::getApplyStatus, Integer.valueOf(RepairApplyStatusEnum.Y1.getType())).in(RepairApply::getId, ids));
+    	/*
         List<RepairApply> list = list((Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().ne((v0) -> {
             return v0.getApplyStatus();
         }, Integer.valueOf(RepairApplyStatusEnum.Y1.getType()))).in((v0) -> {
             return v0.getId();
-        }, ids));
+        }, ids));*/
         return Func.isEmpty(list);
     }
 
     @Override // org.springblade.modules.tpm.service.IRepairApplyService
     public boolean checkRepairApplyStatus(Long id) {
+    	RepairApply repairApply = this.baseMapper.selectOne(Wrappers.<RepairApply>query().lambda().eq(RepairApply::getId, id).eq(RepairApply::getApplyStatus, Integer.valueOf(RepairApplyStatusEnum.Y1.getType())));
+    	/*
         RepairApply repairApply = (RepairApply) this.baseMapper.selectOne((Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
             return v0.getId();
         }, id)).eq((v0) -> {
             return v0.getApplyStatus();
-        }, Integer.valueOf(RepairApplyStatusEnum.Y1.getType())));
+        }, Integer.valueOf(RepairApplyStatusEnum.Y1.getType())));*/
         return Func.isNotEmpty(repairApply);
     }
 
@@ -609,9 +305,11 @@
         if (!checkRepairApplyStatus(id)) {
             throw new ServiceException(MessageUtils.message("cps.tpm.repair.execution.apply.status.is.pending", new Object[0]));
         }
+        RepairApply repairApply = getOne(Wrappers.<RepairApply>query().lambda().eq(RepairApply::getId, id));
+        /*
         RepairApply repairApply = (RepairApply) getOne((Wrapper) Wrappers.query().lambda().eq((v0) -> {
             return v0.getId();
-        }, id));
+        }, id));*/
         if (Func.isEmpty(repairApply)) {
             throw new ServiceException(MessageUtils.message("cps.tpm.repair.apply.not.exists", new Object[0]));
         }
@@ -634,11 +332,14 @@
         RepairApply repairApply = RepairApplyConvert.INSTANCE.convertUpdate(repairApplyUpdateVO);
         updateById(repairApply);
         if (Func.isNotEmpty(repairApplyUpdateVO.getFileAddDTOList())) {
+        	List<RepairApplyFile> oldFiles = this.iRepairApplyFileService.list(Wrappers.<RepairApplyFile>query().lambda().eq(RepairApplyFile::getRepairApplyId, repairApplyUpdateVO.getId()));
+        	/*
             List<RepairApplyFile> oldFiles = this.iRepairApplyFileService.list((Wrapper) Wrappers.query().lambda().eq((v0) -> {
                 return v0.getRepairApplyId();
             }, repairApplyUpdateVO.getId()));
+            */
             if (!Func.isNull(oldFiles)) {
-                this.iRepairApplyFileService.removeByIds((Collection) oldFiles.stream().map((v0) -> {
+                this.iRepairApplyFileService.removeByIds(oldFiles.stream().map((v0) -> {
                     return v0.getId();
                 }).collect(Collectors.toList()));
             }
@@ -648,9 +349,11 @@
             });
             this.iRepairApplyFileService.saveBatch(newFiles);
         } else {
-            List<RepairApplyFile> oldFiles2 = this.iRepairApplyFileService.list((Wrapper) Wrappers.query().lambda().eq((v0) -> {
+        	List<RepairApplyFile> oldFiles2 = this.iRepairApplyFileService.list(Wrappers.<RepairApplyFile>query().lambda().eq(RepairApplyFile::getRepairApplyId, repairApplyUpdateVO.getId()));
+        	/*
+            List<RepairApplyFile> oldFiles2 = this.iRepairApplyFileService.list(Wrappers.<RepairApplyFilequery().lambda().eq((v0) -> {
                 return v0.getRepairApplyId();
-            }, repairApplyUpdateVO.getId()));
+            }, repairApplyUpdateVO.getId()));*/
             if (!Func.isNull(oldFiles2)) {
                 this.iRepairApplyFileService.removeByIds((Collection) oldFiles2.stream().map((v0) -> {
                     return v0.getId();
@@ -667,31 +370,37 @@
         if (Func.isNull(repairApply)) {
             throw new ServiceException(MessageUtils.message("cps.tpm.repair.apply.not.exists", new Object[0]));
         }
+        List<RepairApplyFile> files = this.iRepairApplyFileService.list(Wrappers.<RepairApplyFile>query().lambda().eq(RepairApplyFile::getRepairApplyId, id));
+        /*
         List<RepairApplyFile> files = this.iRepairApplyFileService.list((Wrapper) Wrappers.query().lambda().eq((v0) -> {
             return v0.getRepairApplyId();
-        }, id));
+        }, id));*/
         RepairFileVO repairFileVo = new RepairFileVO();
         if (!Func.isNull(repairApply.getDescription())) {
             repairFileVo.setDescription(repairApply.getDescription());
         }
         if (!Func.isNull(files)) {
+        	repairFileVo.setFileAddDTOList(files.stream().map(RepairApplyFileConvert.INSTANCE::convert).collect(Collectors.toList()));
+        	/*
             Stream<RepairApplyFile> stream = files.stream();
             RepairApplyFileConvert repairApplyFileConvert = RepairApplyFileConvert.INSTANCE;
             repairApplyFileConvert.getClass();
-            repairFileVo.setFileAddDTOList((List) stream.map(this::convert).collect(Collectors.toList()));
+            repairFileVo.setFileAddDTOList((List) stream.map(this::convert).collect(Collectors.toList()));*/
         } else {
-            repairFileVo.setFileAddDTOList(new ArrayList());
+            repairFileVo.setFileAddDTOList(new ArrayList<>());
         }
         return repairFileVo;
     }
 
     @Override // org.springblade.modules.tpm.service.IRepairApplyService
     public List<ApplyCodeVO> queryApplyCode() {
+    	List<RepairApply> list = list(Wrappers.<RepairApply>query().lambda().eq(RepairApply::getApplyStatus, Integer.valueOf(RepairApplyStatusEnum.Y2.getType())));
+    	/*
         List<RepairApply> list = list((Wrapper) Wrappers.query().lambda().eq((v0) -> {
             return v0.getApplyStatus();
-        }, Integer.valueOf(RepairApplyStatusEnum.Y2.getType())));
+        }, Integer.valueOf(RepairApplyStatusEnum.Y2.getType())));*/
         if (Func.isNotEmpty(list)) {
-            return (List) list.stream().map(i -> {
+            return list.stream().map(i -> {
                 ApplyCodeVO applyCodeVo = new ApplyCodeVO();
                 applyCodeVo.setId(i.getId());
                 applyCodeVo.setApplyCode(i.getApplyCode());
@@ -703,13 +412,17 @@
 
     @Override // org.springblade.modules.tpm.service.IRepairApplyService
     public List<RepairApply> getRepairApplyByMalId(Long malId) {
+    	List<RepairApply> repairApplyList = list(Wrappers.<RepairApply>query().lambda()
+    	        .eq(RepairApply::getMalfunctionId, malId)
+    	        .and(i -> i.ne(RepairApply::getApplyStatus, Integer.valueOf(RepairApplyStatusEnum.Y4.getType()))));
+    	/*
         List<RepairApply> repairApplyList = list((Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
             return v0.getMalfunctionId();
         }, malId)).and(i -> {
             LambdaQueryWrapper lambdaQueryWrapper = (LambdaQueryWrapper) i.ne((v0) -> {
                 return v0.getApplyStatus();
             }, Integer.valueOf(RepairApplyStatusEnum.Y4.getType()));
-        }));
+        }));*/
         if (Func.isNull(repairApplyList)) {
             throw new ServiceException(MessageUtils.message("cps.tpm.repair.apply.malfunction.not.exists", new Object[0]));
         }
@@ -722,14 +435,14 @@
         if (Func.isNotEmpty(repairApplyByMalList)) {
             List<RepairApply> collect = null;
             if (action.equals(Integer.valueOf(ActionEnum.UPDATE_MAL.getType()))) {
-                collect = (List) repairApplyByMalList.stream().map(i -> {
+                collect = repairApplyByMalList.stream().map(i -> {
                     i.setMalfunctionId(malId);
                     i.setMalfunctionName(malName);
                     i.setMalfunctionCode(malCode);
                     return i;
                 }).collect(Collectors.toList());
             } else if (action.equals(Integer.valueOf(ActionEnum.DELETE_MAL.getType()))) {
-                collect = (List) repairApplyByMalList.stream().peek(i2 -> {
+                collect = repairApplyByMalList.stream().peek(i2 -> {
                     i2.setMalfunctionId(null);
                     i2.setMalfunctionName(null);
                     i2.setMalfunctionCode(null);
@@ -780,20 +493,28 @@
 
     @Override // org.springblade.modules.tpm.service.IRepairApplyService
     public Long countApplyNum() {
+    	Long count = Long.valueOf(count(Wrappers.<RepairApply>lambdaQuery()
+    	          .eq(RepairApply::getApplyStatus, Integer.valueOf(RepairApplyStatusEnum.Y2.getType()))
+    	          .or()
+    	          .eq(RepairApply::getApplyStatus, Integer.valueOf(RepairApplyStatusEnum.Y1.getType()))));
+    	/*
         Long count = Long.valueOf(count((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
             return v0.getApplyStatus();
         }, Integer.valueOf(RepairApplyStatusEnum.Y2.getType()))).or()).eq((v0) -> {
             return v0.getApplyStatus();
         }, Integer.valueOf(RepairApplyStatusEnum.Y1.getType()))));
+        */
         return (Long) Optional.of(count).orElse(0L);
     }
 
     @Override // org.springblade.modules.tpm.service.IRepairApplyService
     public RepairApplyDetailVO detail(Long id) {
         RepairApplyDetailVO repairApplyDetailVO = detailApply(id);
+        RepairRecord bean = this.repairRecordService.getOne(Wrappers.<RepairRecord>query().lambda().eq(RepairRecord::getRepairApplyId, id));
+        /*
         RepairRecord bean = (RepairRecord) this.repairRecordService.getOne((Wrapper) Wrappers.query().lambda().eq((v0) -> {
             return v0.getRepairApplyId();
-        }, id));
+        }, id));*/
         if (bean != null) {
             repairApplyDetailVO.setRepairRecordDetailVO(this.repairRecordService.detailRecord(bean.getId()));
         }

--
Gitblit v1.9.3