From 4684d271ea0107097209f7de0951bf451e48df21 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 30 三月 2024 19:16:36 +0800
Subject: [PATCH] tpm模块修复

---
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/DeviceMaterialRecordServiceImpl.java |  145 --
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/CheckRecordServiceImpl.java          |  264 +-----
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/RepairApplyServiceImpl.java          |  461 ++---------
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/RepairRecordServiceImpl.java         |  493 ++---------
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/MaintainPlanServiceImpl.java         |  594 ++-----------
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/MaintainRecordServiceImpl.java       |  503 ++---------
 6 files changed, 501 insertions(+), 1,959 deletions(-)

diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/CheckRecordServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/CheckRecordServiceImpl.java
index 73350f2..2d183e7 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/CheckRecordServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/CheckRecordServiceImpl.java
@@ -1,20 +1,19 @@
 package com.qianwen.smartman.modules.tpm.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import java.lang.invoke.SerializedLambda;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.utils.MessageUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.qianwen.core.excel.util.ExcelUtil;
 import com.qianwen.core.log.exception.ServiceException;
 import com.qianwen.core.mp.service.impl.BladeServiceImpl;
@@ -23,6 +22,7 @@
 import com.qianwen.core.oss.model.BladeFile;
 import com.qianwen.core.tool.utils.DateUtil;
 import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.utils.MessageUtils;
 import com.qianwen.smartman.modules.resource.builder.oss.OssBuilder;
 import com.qianwen.smartman.modules.system.service.ICodeGeneratorService;
 import com.qianwen.smartman.modules.tpm.convert.CheckRecordConvert;
@@ -46,9 +46,6 @@
 import com.qianwen.smartman.modules.tpm.vo.CheckRecordVO;
 import com.qianwen.smartman.modules.tpm.vo.RecordFilesVO;
 import com.qianwen.smartman.modules.tpm.vo.excel.CheckRecordExcel;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
 
 @Service
 /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tpm/service/impl/CheckRecordServiceImpl.class */
@@ -59,191 +56,6 @@
     private final CheckRecordMapper checkRecordMapper;
     private final ICodeGeneratorService codeGeneratorService;
     private final OssBuilder ossBuilder;
-
-    private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
-        String implMethodName = lambda.getImplMethodName();
-        boolean z = true;
-        switch (implMethodName.hashCode()) {
-            case 85916175:
-                if (implMethodName.equals("getCheckResult")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 98245393:
-                if (implMethodName.equals("getId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 388478047:
-                if (implMethodName.equals("getCheckCode")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 497623742:
-                if (implMethodName.equals("getCheckRecordId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 539848180:
-                if (implMethodName.equals("getCheckProjectCode")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 540162706:
-                if (implMethodName.equals("getCheckProjectName")) {
-                    z = false;
-                    break;
-                }
-                break;
-            case 653075170:
-                if (implMethodName.equals("getCheckProjectId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 761390710:
-                if (implMethodName.equals("getRemark")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 1071464927:
-                if (implMethodName.equals("getCreateTime")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 1342380108:
-                if (implMethodName.equals("getFileType")) {
-                    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/CheckRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getCheckProjectName();
-                    };
-                }
-                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/CheckRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getCheckResult();
-                    };
-                }
-                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/CheckRecordItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getCheckRecordId();
-                    };
-                }
-                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/CheckRecordFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getCheckRecordId();
-                    };
-                }
-                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/CheckRecordItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getCheckRecordId();
-                    };
-                }
-                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/CheckRecordItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getCheckRecordId();
-                    };
-                }
-                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/CheckRecordFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getCheckRecordId();
-                    };
-                }
-                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/CheckRecordFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getCheckRecordId();
-                    };
-                }
-                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/CheckRecordFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getCheckRecordId();
-                    };
-                }
-                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/CheckRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getRemark();
-                    };
-                }
-                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/modules/tpm/entity/CheckRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getCheckCode();
-                    };
-                }
-                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/CheckRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getCheckProjectCode();
-                    };
-                }
-                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();
-                    };
-                }
-                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/CheckRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getCheckProjectId();
-                    };
-                }
-                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/CheckRecordFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getFileType();
-                    };
-                }
-                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/CheckRecordFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getFileType();
-                    };
-                }
-                break;
-        }
-        throw new IllegalArgumentException("Invalid lambda deserialization");
-    }
 
     public CheckRecordServiceImpl(final ICheckRecordItemService itemService, final ICheckRecordFileService fileService, final CheckRecordMapper checkRecordMapper, final ICodeGeneratorService codeGeneratorService, final OssBuilder ossBuilder) {
         this.itemService = itemService;
@@ -269,20 +81,20 @@
         if (Func.isEmpty(itemList)) {
             throw new ServiceException(MessageUtils.message("cps.tpm.check.item.can.not.empty", new Object[0]));
         }
-        List<CheckRecordItem> items = (List) itemList.stream().map(c -> {
+        List<CheckRecordItem> items = itemList.stream().map(c -> {
             return CheckRecordItem.builder().checkRecordId(checkRecord.getId()).checkValue(c.getCheckValue()).itemId(c.getItemId()).name(c.getName()).valueType(c.getValueType()).requirement(c.getRequirement()).standardValue(c.getStandardValue()).build();
         }).collect(Collectors.toList());
         this.itemService.saveBatch(items);
         List<CheckRecordFileDTO> pictureList = vo.getPictureList();
         if (Func.isNotEmpty(pictureList)) {
-            List<CheckRecordFile> files = (List) pictureList.stream().map(c2 -> {
+            List<CheckRecordFile> files = pictureList.stream().map(c2 -> {
                 return CheckRecordFile.builder().checkRecordId(checkRecord.getId()).fileName(c2.getFileName()).objectKey(c2.getObjectKey()).link(c2.getLink()).contentType(c2.getContentType()).fileSize(c2.getFileSize()).uploadTime(c2.getUploadTime()).fileType(FileTypeEnum.PICTURE.getType()).build();
             }).collect(Collectors.toList());
             this.fileService.saveBatch(files);
         }
         List<CheckRecordFileDTO> fileList = vo.getFileList();
         if (Func.isNotEmpty(fileList)) {
-            List<CheckRecordFile> files2 = (List) fileList.stream().map(c3 -> {
+            List<CheckRecordFile> files2 = fileList.stream().map(c3 -> {
                 return CheckRecordFile.builder().checkRecordId(checkRecord.getId()).fileName(c3.getFileName()).objectKey(c3.getObjectKey()).link(c3.getLink()).contentType(c3.getContentType()).fileSize(c3.getFileSize()).uploadTime(c3.getUploadTime()).fileType(FileTypeEnum.FILE.getType()).build();
             }).collect(Collectors.toList());
             this.fileService.saveBatch(files2);
@@ -291,9 +103,7 @@
     }
 
     private void validCheckCode(String code) {
-        long count = count((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
-            return v0.getCheckCode();
-        }, code));
+    	long count = count(Wrappers.<CheckRecord>lambdaQuery().eq(CheckRecord::getCheckCode, code));
         if (count > 0) {
             throw new ServiceException(MessageUtils.message("cps.tpm.check.record.code.exists", new Object[0]));
         }
@@ -309,12 +119,16 @@
     public boolean deleteCheckRecord(List<String> ids) {
         if (Func.isNotEmpty(ids)) {
             removeByIds(Func.toLongList(ids));
+            
+            this.itemService.remove(Wrappers.<CheckRecordItem>lambdaQuery().in(CheckRecordItem::getCheckRecordId, ids));
+            this.fileService.remove(Wrappers.<CheckRecordFile>lambdaQuery().in(CheckRecordFile::getCheckRecordId, ids));
+            /*
             this.itemService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
                 return v0.getCheckRecordId();
             }, ids));
             this.fileService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
                 return v0.getCheckRecordId();
-            }, ids));
+            }, ids));*/
             return true;
         }
         return true;
@@ -327,6 +141,14 @@
         Long checkProjectId = vo.getCheckProjectId();
         Integer checkResult = vo.getCheckResult();
         String remark = vo.getRemark();
+        update(Wrappers.<CheckRecord>lambdaUpdate()
+                .set(Func.isNotEmpty(checkProjectId), CheckRecord::getCheckProjectId, checkProjectId)
+                .set(Func.isNotEmpty(vo.getCheckProjectCode()), CheckRecord::getCheckProjectCode, vo.getCheckProjectCode())
+                .set(Func.isNotEmpty(vo.getCheckProjectName()), CheckRecord::getCheckProjectName, vo.getCheckProjectName())
+                .set(Func.isNotEmpty(checkResult), CheckRecord::getCheckResult, checkResult)
+                .set(CheckRecord::getRemark, remark)
+                .eq(CheckRecord::getId, id));
+        /*
         update((Wrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().set(Func.isNotEmpty(checkProjectId), (v0) -> {
             return v0.getCheckProjectId();
         }, checkProjectId)).set(Func.isNotEmpty(vo.getCheckProjectCode()), (v0) -> {
@@ -339,14 +161,13 @@
             return v0.getRemark();
         }, remark)).eq((v0) -> {
             return v0.getId();
-        }, id));
+        }, id));*/
         List<CheckRecordItemDTO> itemList = vo.getItemList();
         if (Func.isNotEmpty(checkProjectId)) {
-            this.itemService.remove((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
-                return v0.getCheckRecordId();
-            }, id));
+        	this.itemService.remove(Wrappers.<CheckRecordItem>lambdaQuery().eq(CheckRecordItem::getCheckRecordId, id));
+            
             if (Func.isNotEmpty(itemList)) {
-                List<CheckRecordItem> items = (List) itemList.stream().map(c -> {
+                List<CheckRecordItem> items = itemList.stream().map(c -> {
                     return CheckRecordItem.builder().checkRecordId(id).itemId(c.getItemId()).checkValue(c.getCheckValue()).name(c.getName()).valueType(c.getValueType()).requirement(c.getRequirement()).standardValue(c.getStandardValue()).build();
                 }).collect(Collectors.toList());
                 this.itemService.saveBatch(items);
@@ -361,11 +182,16 @@
     public boolean removeItems(String recordId, List<String> ids) {
         boolean flag = true;
         if (Func.isNotEmpty(ids)) {
+        	flag = this.itemService.remove(Wrappers.<CheckRecordItem>lambdaQuery()
+        	          .eq(CheckRecordItem::getCheckRecordId, recordId)
+        	          .in(CheckRecordItem::getId, ids)); 
+        	/*
             flag = this.itemService.remove((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
                 return v0.getCheckRecordId();
             }, recordId)).in((v0) -> {
                 return v0.getId();
             }, ids));
+            */
         }
         return flag;
     }
@@ -374,11 +200,15 @@
     public boolean removeFiles(String recordId, List<String> ids) {
         boolean flag = true;
         if (Func.isNotEmpty(ids)) {
+        	flag = this.fileService.remove(Wrappers.<CheckRecordFile>lambdaQuery()
+        	          .eq(CheckRecordFile::getCheckRecordId, recordId)
+        	          .in(CheckRecordFile::getId, ids)); 
+        	/*
             flag = this.fileService.remove((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
                 return v0.getCheckRecordId();
             }, recordId)).in((v0) -> {
                 return v0.getId();
-            }, ids));
+            }, ids));*/
         }
         return flag;
     }
@@ -388,7 +218,7 @@
         List<CheckRecordFileDTO> files = vo.getFiles();
         boolean fileFlag = true;
         if (Func.isNotEmpty(files)) {
-            List<CheckRecordFile> recordFiles = (List) files.stream().map(c -> {
+            List<CheckRecordFile> recordFiles = files.stream().map(c -> {
                 return CheckRecordFile.builder().checkRecordId(recordId).fileName(c.getFileName()).link(c.getLink()).objectKey(c.getObjectKey()).contentType(c.getContentType()).fileSize(c.getFileSize()).uploadTime(c.getUploadTime()).fileType(FileTypeEnum.FILE.getType()).build();
             }).collect(Collectors.toList());
             fileFlag = this.fileService.saveBatch(recordFiles);
@@ -396,7 +226,7 @@
         List<CheckRecordFileDTO> pictures = vo.getPictures();
         boolean pictureFlag = true;
         if (Func.isNotEmpty(pictures)) {
-            List<CheckRecordFile> recordFiles2 = (List) pictures.stream().map(c2 -> {
+            List<CheckRecordFile> recordFiles2 = pictures.stream().map(c2 -> {
                 return CheckRecordFile.builder().checkRecordId(recordId).fileName(c2.getFileName()).link(c2.getLink()).objectKey(c2.getObjectKey()).contentType(c2.getContentType()).fileSize(c2.getFileSize()).uploadTime(c2.getUploadTime()).fileType(FileTypeEnum.PICTURE.getType()).build();
             }).collect(Collectors.toList());
             pictureFlag = this.fileService.saveBatch(recordFiles2);
@@ -411,7 +241,7 @@
         if (Func.isNotEmpty(todayPage)) {
             return page.setRecords(todayPage);
         }
-        return page.setRecords(new ArrayList());
+        return page.setRecords(new ArrayList<>());
     }
 
     @Override // org.springblade.modules.tpm.service.ICheckRecordService
@@ -419,13 +249,19 @@
         LocalDate localDate = LocalDate.now();
         Date now = DateUtil.toDate(localDate);
         Date plusDays = DateUtil.plusDays(now, 1L);
+        return Long.valueOf(count(Wrappers.<CheckRecord>lambdaQuery().between(CheckRecord::getCreateTime, now, plusDays)));
+        /*
         return Long.valueOf(count((Wrapper) Wrappers.lambdaQuery().between((v0) -> {
             return v0.getCreateTime();
-        }, now, plusDays)));
+        }, now, plusDays)));*/
     }
 
     @Override // org.springblade.modules.tpm.service.ICheckRecordService
     public CheckRecordDetailVO detail(String id) {
+    	List<CheckRecordFile> files = this.fileService.list(Wrappers.<CheckRecordFile>lambdaQuery().eq(CheckRecordFile::getCheckRecordId, id).eq(CheckRecordFile::getFileType, FileTypeEnum.FILE.getType()));
+        List<CheckRecordFile> pictures = this.fileService.list(Wrappers.<CheckRecordFile>lambdaQuery().eq(CheckRecordFile::getCheckRecordId, id).eq(CheckRecordFile::getFileType, FileTypeEnum.PICTURE.getType()));
+        
+    	/*
         List<CheckRecordFile> files = this.fileService.list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
             return v0.getCheckRecordId();
         }, id)).eq((v0) -> {
@@ -435,7 +271,7 @@
             return v0.getCheckRecordId();
         }, id)).eq((v0) -> {
             return v0.getFileType();
-        }, FileTypeEnum.PICTURE.getType()));
+        }, FileTypeEnum.PICTURE.getType()));*/
         List<CheckRecordItemVO> items = this.itemService.listItem(id);
         return CheckRecordDetailVO.builder().files(CheckRecordConvert.INSTANCE.convertFile(files)).pictures(CheckRecordConvert.INSTANCE.convertFile(pictures)).items(items).build();
     }
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/DeviceMaterialRecordServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/DeviceMaterialRecordServiceImpl.java
index ca88486..38009b1 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/DeviceMaterialRecordServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/DeviceMaterialRecordServiceImpl.java
@@ -1,14 +1,17 @@
 package com.qianwen.smartman.modules.tpm.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.lang.invoke.SerializedLambda;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qianwen.core.mp.base.BaseServiceImpl;
 import com.qianwen.core.mp.support.Condition;
 import com.qianwen.core.mp.support.Query;
@@ -25,10 +28,6 @@
 import com.qianwen.smartman.modules.tpm.service.IRepairRecordService;
 import com.qianwen.smartman.modules.tpm.vo.DeviceMaterialRecordVO;
 import com.qianwen.smartman.modules.tpm.vo.RepairRecordMaterialVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 @Service
 /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tpm/service/impl/DeviceMaterialRecordServiceImpl.class */
@@ -40,99 +39,10 @@
     @Lazy
     private IMaintainRecordService maintainRecordService;
 
-    private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
-        String implMethodName = lambda.getImplMethodName();
-        boolean z = true;
-        switch (implMethodName.hashCode()) {
-            case -1107875961:
-                if (implMethodName.equals("getDeviceId")) {
-                    z = false;
-                    break;
-                }
-                break;
-            case 98245393:
-                if (implMethodName.equals("getId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 771206363:
-                if (implMethodName.equals("getTenantId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 1070984535:
-                if (implMethodName.equals("getCreateDept")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 1278665410:
-                if (implMethodName.equals("getRecordId")) {
-                    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/DeviceMaterialRecord") && 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/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getCreateDept();
-                    };
-                }
-                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/DeviceMaterialRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getRecordId();
-                    };
-                }
-                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/DeviceMaterialRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getRecordId();
-                    };
-                }
-                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/DeviceMaterialRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getRecordId();
-                    };
-                }
-                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/DeviceMaterialRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getRecordId();
-                    };
-                }
-                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();
-                    };
-                }
-                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/tenant/mp/TenantEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getTenantId();
-                    };
-                }
-                break;
-        }
-        throw new IllegalArgumentException("Invalid lambda deserialization");
-    }
 
     @Override // org.springblade.modules.tpm.service.IDeviceMaterialRecordService
     public Boolean createDeviceMaterialRecord(List<RepairRecordMaterialAddVO> list) {
-        List<DeviceMaterialRecord> collect = (List) list.stream().map(o -> {
+        List<DeviceMaterialRecord> collect = list.stream().map(o -> {
             return new DeviceMaterialRecord() { // from class: org.springblade.modules.tpm.service.impl.DeviceMaterialRecordServiceImpl.1
                 {
                     setRecordId(o.getRecordId());
@@ -154,12 +64,14 @@
     /* JADX WARN: Multi-variable type inference failed */
     @Override // org.springblade.modules.tpm.service.IDeviceMaterialRecordService
     public List<RepairRecordMaterialVO> getRecordByRecordId(Long id) {
+    	List<DeviceMaterialRecord> list = list(Wrappers.<DeviceMaterialRecord>lambdaQuery().eq(DeviceMaterialRecord::getRecordId, id));
+    	/*
         List<DeviceMaterialRecord> list = list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
             return v0.getRecordId();
-        }, id));
+        }, id));*/
         List<RepairRecordMaterialVO> addDTOList = new ArrayList<>(list.size());
         if (Func.isNotEmpty(list)) {
-            addDTOList = (List) list.stream().map(o -> {
+            addDTOList = list.stream().map(o -> {
                 RepairRecordMaterialVO vo = new RepairRecordMaterialVO();
                 BeanUtil.copyProperties(o, vo);
                 return vo;
@@ -174,12 +86,18 @@
         boolean remove = true;
         boolean save = true;
         if (Func.isNotEmpty(list)) {
+        	
+        	List<DeviceMaterialRecord> records = list(Wrappers.<DeviceMaterialRecord>lambdaQuery()
+        	          .eq(DeviceMaterialRecord::getRecordId, list.get(0).getRecordId()));
+        	remove = remove(Wrappers.<DeviceMaterialRecord>query().lambda().eq(DeviceMaterialRecord::getRecordId, list.get(0).getRecordId()));
+        	      
+        	/*
             list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
                 return v0.getRecordId();
             }, list.get(0).getRecordId()));
             remove = remove((Wrapper) Wrappers.query().lambda().eq((v0) -> {
                 return v0.getRecordId();
-            }, list.get(0).getRecordId()));
+            }, list.get(0).getRecordId()));*/
             save = createDeviceMaterialRecord(list).booleanValue();
         }
         return Boolean.valueOf(remove && save);
@@ -187,13 +105,18 @@
 
     @Override // org.springblade.modules.tpm.service.IDeviceMaterialRecordService
     public void deleteDeviceMaterialRecordByRecordId(List<Long> ids) {
-        remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
-            return v0.getRecordId();
-        }, ids));
+    	remove(Wrappers.<DeviceMaterialRecord>lambdaQuery().in(DeviceMaterialRecord::getRecordId, ids));
+    	
     }
 
     @Override // org.springblade.modules.tpm.service.IDeviceMaterialRecordService
     public IPage<DeviceMaterialRecordVO> pageCheckMaterialRecord(Query query, Long id) {
+    	IPage<DeviceMaterialRecord> page = page(Condition.getPage(query), Wrappers.<DeviceMaterialRecord>lambdaQuery()
+    	        .eq(DeviceMaterialRecord::getDeviceId, id)
+    	        .eq(Func.isNotEmpty(AuthUtil.getTenantId()), DeviceMaterialRecord::getTenantId, AuthUtil.getTenantId())
+    	        .orderByDesc(DeviceMaterialRecord::getCreateDept)
+    	        .orderByDesc(DeviceMaterialRecord::getId));
+    	/*
         IPage<DeviceMaterialRecord> page = page(Condition.getPage(query), (Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
             return v0.getDeviceId();
         }, id)).eq(Func.isNotEmpty(AuthUtil.getTenantId()), (v0) -> {
@@ -202,8 +125,8 @@
             return v0.getCreateDept();
         })).orderByDesc((v0) -> {
             return v0.getId();
-        }));
-        Page page2 = new Page(page.getCurrent(), page.getSize(), page.getTotal());
+        }));*/
+        Page<DeviceMaterialRecordVO> page2 = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
         if (Func.isNotEmpty(page.getRecords())) {
             page2.setRecords(convertData(page.getRecords()));
         }
@@ -211,14 +134,14 @@
     }
 
     private List<DeviceMaterialRecordVO> convertData(List<DeviceMaterialRecord> list) {
-        return (List) list.stream().map(o -> {
+        return list.stream().map(o -> {
             DeviceMaterialRecordVO vo = new DeviceMaterialRecordVO();
             BeanUtil.copyProperties(o, vo);
             if (o.getBizType().intValue() == 1) {
-                RepairRecord repairRecord = (RepairRecord) this.repairRecordService.getById(o.getRecordId());
+                RepairRecord repairRecord =this.repairRecordService.getById(o.getRecordId());
                 vo.setRecordCode(Func.isEmpty(repairRecord) ? "" : repairRecord.getRecordCode());
             } else {
-                MaintainRecord maintainRecord = (MaintainRecord) this.maintainRecordService.getById(o.getRecordId());
+                MaintainRecord maintainRecord = this.maintainRecordService.getById(o.getRecordId());
                 vo.setRecordCode(Func.isEmpty(maintainRecord) ? "" : maintainRecord.getRecordCode());
             }
             return vo;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/MaintainPlanServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/MaintainPlanServiceImpl.java
index 9fec85c..ab31448 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/MaintainPlanServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/MaintainPlanServiceImpl.java
@@ -86,471 +86,8 @@
     private final BusinessSendFactory businessSendFactory;
     private final IBusinessNotifyStateService businessNotifyStateService;
 
-    private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
-        String implMethodName = lambda.getImplMethodName();
-        boolean z = true;
-        switch (implMethodName.hashCode()) {
-            case -1107875961:
-                if (implMethodName.equals("getDeviceId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case -904436898:
-                if (implMethodName.equals("getProjectId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case -798691761:
-                if (implMethodName.equals("getMaintainDate")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case -75622813:
-                if (implMethodName.equals("getCode")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 98245393:
-                if (implMethodName.equals("getId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 112409713:
-                if (implMethodName.equals("getPlanStatus")) {
-                    z = false;
-                    break;
-                }
-                break;
-            case 482925913:
-                if (implMethodName.equals("getDeviceCode")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 483240439:
-                if (implMethodName.equals("getDeviceName")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 515366127:
-                if (implMethodName.equals("getIsAuto")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 710250778:
-                if (implMethodName.equals("getPlanId")) {
-                    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 1071464927:
-                if (implMethodName.equals("getCreateTime")) {
-                    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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getPlanStatus();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getPlanStatus();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getPlanStatus();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getPlanStatus();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getPlanStatus();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getPlanStatus();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getPlanStatus();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getPlanStatus();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getPlanStatus();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getPlanStatus();
-                    };
-                }
-                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();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getProjectId();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getProjectId();
-                    };
-                }
-                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/cps/entity/MaintainProjectItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getProjectId();
-                    };
-                }
-                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();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDateTime;")) {
-                    return (v0) -> {
-                        return v0.getMaintainDate();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDateTime;")) {
-                    return (v0) -> {
-                        return v0.getMaintainDate();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDateTime;")) {
-                    return (v0) -> {
-                        return v0.getMaintainDate();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDateTime;")) {
-                    return (v0) -> {
-                        return v0.getMaintainDate();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDateTime;")) {
-                    return (v0) -> {
-                        return v0.getMaintainDate();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDateTime;")) {
-                    return (v0) -> {
-                        return v0.getMaintainDate();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDateTime;")) {
-                    return (v0) -> {
-                        return v0.getMaintainDate();
-                    };
-                }
-                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();
-                    };
-                }
-                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/MaintainPlanItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getPlanId();
-                    };
-                }
-                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/MaintainPlanItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getPlanId();
-                    };
-                }
-                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/MaintainPlan") && 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/MaintainPlan") && 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/MaintainPlan") && 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/MaintainPlan") && 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/MaintainPlan") && 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/MaintainPlan") && 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/MaintainPlan") && 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/MaintainPlan") && 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/MaintainPlan") && 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/MaintainPlan") && 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/MaintainPlan") && 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/MaintainPlan") && 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/MaintainPlan") && 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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getIsAuto();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getIsAuto();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getIsAuto();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getIsAuto();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getIsAuto();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getDeviceTypeId();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getDeviceTypeId();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getDeviceTypeId();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getDeviceTypeId();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getDeviceTypeId();
-                    };
-                }
-                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/MaintainPlan") && 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/MaintainPlan") && 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/MaintainPlan") && 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/MaintainPlan") && 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/MaintainPlan") && 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/MaintainPlan") && 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/MaintainPlan") && 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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getCode();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getCode();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getCode();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getCode();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getCode();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getCode();
-                    };
-                }
-                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/MaintainPlan") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getCode();
-                    };
-                }
-                break;
-        }
-        throw new IllegalArgumentException("Invalid lambda deserialization");
-    }
 
-    public MaintainPlanServiceImpl(final OssBuilder ossBuilder, final IMaintainPlanItemService maintainPlanItemService, final IMachineService machineService, final ICodeGeneratorService codeGeneratorService, final IMaintainProjectService maintainProjectService, final IMaintainProjectItemService maintainProjectItemService, final BusinessSendFactory businessSendFactory, final IBusinessNotifyStateService businessNotifyStateService) {
+    public MaintainPlanServiceImpl(OssBuilder ossBuilder,IMaintainPlanItemService maintainPlanItemService, IMachineService machineService, ICodeGeneratorService codeGeneratorService, IMaintainProjectService maintainProjectService, IMaintainProjectItemService maintainProjectItemService, BusinessSendFactory businessSendFactory, IBusinessNotifyStateService businessNotifyStateService) {
         this.ossBuilder = ossBuilder;
         this.maintainPlanItemService = maintainPlanItemService;
         this.machineService = machineService;
@@ -607,9 +144,11 @@
         updateMaintainPlan.setUpdateTime(LocalDateTimeUtils.LocalDateTimeToDate(now));
         List<MaintainPlan> maintainPlanList = checkPlanStatus(Arrays.asList(updateMaintainPlan), now);
         updateBatchById(maintainPlanList);
+        this.maintainPlanItemService.remove(Wrappers.<MaintainPlanItem>query().lambda().in(MaintainPlanItem::getPlanId, maintainPlan.getId()));
+        /*
         this.maintainPlanItemService.remove((Wrapper) Wrappers.query().lambda().in((v0) -> {
             return v0.getPlanId();
-        }, new Object[]{maintainPlan.getId()}));
+        }, new Object[]{maintainPlan.getId()}));*/
         List<MaintainPlanItem> maintainPlanItemList = new ArrayList<>();
         maintainPlanUpdateVO.getMaintainItemList().forEach(maintainItem -> {
             MaintainPlanItem bean = new MaintainPlanItem();
@@ -626,7 +165,7 @@
     @Override // org.springblade.modules.tpm.service.IMaintainPlanService
     public MaintainPlanVO getMaintainPlan(Long id) {
         MaintainPlanVO maintainPlanVO = (MaintainPlanVO) Optional.ofNullable(getById(id)).map(maintainPlan -> {
-            MaintainPlanVO bean = MaintainPlanConvert.INSTANCE.convert((MaintainPlanConvert) maintainPlan);
+            MaintainPlanVO bean = MaintainPlanConvert.INSTANCE.convert(maintainPlan);
             bean.setPlanStatusName(MaintainPlanStatusEnum.getDescDetail(bean.getPlanStatus()));
             bean.setMaintainNatureName(RepairNatureEnum.getDescDetail(bean.getMaintainNature()));
             bean.setIsAutoName(MaintainPlanIsAutoEnum.getDescDetail(bean.getIsAuto()));
@@ -639,9 +178,16 @@
 
     @Override // org.springblade.modules.tpm.service.IMaintainPlanService
     public List<MaintainPlanVO> queryMaintainPlanList(MaintainPlanSearchVO maintainPlanSearchVO) {
-        List<MaintainPlan> list;
-        new ArrayList();
+    	List<MaintainPlan> list = new ArrayList<>();
+    	
         if (!maintainPlanSearchVO.getFilterPlus().booleanValue()) {
+        	list = list(Wrappers.<MaintainPlan>query().lambda().in((maintainPlanSearchVO.getDeviceTypeId() != null), MaintainPlan::getDeviceTypeId, new Object[] { maintainPlanSearchVO.getDeviceTypeId() }).eq((maintainPlanSearchVO.getDeviceId() != null), MaintainPlan::getDeviceId, maintainPlanSearchVO.getDeviceId())
+        	          .eq(maintainPlanSearchVO.getIsAuto() != null, MaintainPlan::getIsAuto, maintainPlanSearchVO.getIsAuto())
+        	          .in(CollectionUtil.isNotEmpty(maintainPlanSearchVO.getPlanStatusList()), MaintainPlan::getPlanStatus, maintainPlanSearchVO.getPlanStatusList())
+        	          .and(Func.isNotEmpty(maintainPlanSearchVO.getKeyWord()), i -> i.likeRight(MaintainPlan::getDeviceName, maintainPlanSearchVO.getKeyWord()).or().likeRight(MaintainPlan::getCode, maintainPlanSearchVO.getKeyWord()).or().likeRight(MaintainPlan::getDeviceCode, maintainPlanSearchVO.getKeyWord()))
+        	          
+        	          .orderByAsc(MaintainPlan::getMaintainDate));
+        	/*
             list = list((Wrapper) Wrappers.query().lambda().in(maintainPlanSearchVO.getDeviceTypeId() != null, (v0) -> {
                 return v0.getDeviceTypeId();
             }, new Object[]{maintainPlanSearchVO.getDeviceTypeId()}).eq(maintainPlanSearchVO.getDeviceId() != null, (v0) -> {
@@ -660,8 +206,18 @@
                 }, maintainPlanSearchVO.getKeyWord());
             }).orderByAsc((v0) -> {
                 return v0.getMaintainDate();
-            }));
+            }));*/
         } else {
+        	list = list(Condition.getQueryWrapper(maintainPlanSearchVO.getParam(), MaintainPlan.class).lambda()
+        			.in(maintainPlanSearchVO.getDeviceTypeId() != null, MaintainPlan::getDeviceTypeId, new Object[] { maintainPlanSearchVO.getDeviceTypeId() })
+        				.eq((maintainPlanSearchVO.getDeviceId() != null), MaintainPlan::getDeviceId, maintainPlanSearchVO.getDeviceId())
+        	          .eq((maintainPlanSearchVO.getIsAuto() != null), MaintainPlan::getIsAuto, maintainPlanSearchVO.getIsAuto())
+        	          .in(CollectionUtil.isNotEmpty(maintainPlanSearchVO.getPlanStatusList()), MaintainPlan::getPlanStatus, maintainPlanSearchVO.getPlanStatusList())
+        	          .and(Func.isNotEmpty(maintainPlanSearchVO.getKeyWord()), i -> i.likeRight(MaintainPlan::getDeviceName, maintainPlanSearchVO.getKeyWord()).or().likeRight(MaintainPlan::getCode, maintainPlanSearchVO.getKeyWord()).or().likeRight(MaintainPlan::getDeviceCode, maintainPlanSearchVO.getKeyWord()))
+        	          
+        	          .orderByAsc(MaintainPlan::getMaintainDate));
+        	
+        	/*
             list = list((Wrapper) Condition.getQueryWrapper(maintainPlanSearchVO.getParam(), MaintainPlan.class).lambda().in(maintainPlanSearchVO.getDeviceTypeId() != null, (v0) -> {
                 return v0.getDeviceTypeId();
             }, new Object[]{maintainPlanSearchVO.getDeviceTypeId()}).eq(maintainPlanSearchVO.getDeviceId() != null, (v0) -> {
@@ -680,9 +236,9 @@
                 }, maintainPlanSearchVO.getKeyWord());
             }).orderByAsc((v0) -> {
                 return v0.getMaintainDate();
-            }));
+            }));*/
         }
-        List<MaintainPlanVO> result = MaintainPlanConvert.INSTANCE.convert((List) list);
+        List<MaintainPlanVO> result = MaintainPlanConvert.INSTANCE.convert( list);
         result.forEach(bean -> {
             bean.setPlanStatusName(MaintainPlanStatusEnum.getDescDetail(bean.getPlanStatus()));
             bean.setIsAutoName(MaintainPlanIsAutoEnum.getDescDetail(bean.getIsAuto()));
@@ -695,6 +251,17 @@
     public IPage<MaintainPlanVO> queryMaintainPlanPage(MaintainPlanSearchVO maintainPlanSearchVO, Query query) {
         IPage<MaintainPlan> pages;
         if (!maintainPlanSearchVO.getFilterPlus().booleanValue()) {
+        	pages = page(Condition.getPage(query), Wrappers.<MaintainPlan>query().lambda()
+        			.in(maintainPlanSearchVO.getDeviceTypeId() != null, MaintainPlan::getDeviceTypeId, new Object[] { maintainPlanSearchVO.getDeviceTypeId()})
+        			.eq((maintainPlanSearchVO.getDeviceId() != null), MaintainPlan::getDeviceId, maintainPlanSearchVO.getDeviceId())
+        	          .eq((maintainPlanSearchVO.getIsAuto() != null), MaintainPlan::getIsAuto, maintainPlanSearchVO.getIsAuto())
+        	          .in(CollectionUtil.isNotEmpty(maintainPlanSearchVO.getPlanStatusList()), MaintainPlan::getPlanStatus, maintainPlanSearchVO.getPlanStatusList())
+        	          .and(Func.isNotEmpty(maintainPlanSearchVO.getKeyWord()), i -> i.likeRight(MaintainPlan::getDeviceName, maintainPlanSearchVO.getKeyWord()).or().likeRight(MaintainPlan::getCode, maintainPlanSearchVO.getKeyWord()).or().likeRight(MaintainPlan::getDeviceCode, maintainPlanSearchVO.getKeyWord()))
+        	          
+        	          .orderByDesc(MaintainPlan::getCreateTime).orderByDesc(MaintainPlan::getId)
+        			);
+        	
+        	/*
             pages = page(Condition.getPage(query), (Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().in(maintainPlanSearchVO.getDeviceTypeId() != null, (v0) -> {
                 return v0.getDeviceTypeId();
             }, new Object[]{maintainPlanSearchVO.getDeviceTypeId()}).eq(maintainPlanSearchVO.getDeviceId() != null, (v0) -> {
@@ -715,8 +282,19 @@
                 return v0.getCreateTime();
             })).orderByDesc((v0) -> {
                 return v0.getId();
-            }));
+            }));*/
         } else {
+        	pages = page(Condition.getPage(query), Condition.getQueryWrapper(maintainPlanSearchVO.getParam(), MaintainPlan.class)
+        	          
+        	          .lambda().in((maintainPlanSearchVO.getDeviceTypeId() != null), MaintainPlan::getDeviceTypeId, new Object[] { maintainPlanSearchVO.getDeviceTypeId() })
+        			.eq((maintainPlanSearchVO.getDeviceId() != null), MaintainPlan::getDeviceId, maintainPlanSearchVO.getDeviceId())
+        	          .eq((maintainPlanSearchVO.getIsAuto() != null), MaintainPlan::getIsAuto, maintainPlanSearchVO.getIsAuto())
+        	          .in(CollectionUtil.isNotEmpty(maintainPlanSearchVO.getPlanStatusList()), MaintainPlan::getPlanStatus, maintainPlanSearchVO.getPlanStatusList())
+        	          .and(Func.isNotEmpty(maintainPlanSearchVO.getKeyWord()), i -> i.likeRight(MaintainPlan::getDeviceName, maintainPlanSearchVO.getKeyWord()).or().likeRight(MaintainPlan::getCode, maintainPlanSearchVO.getKeyWord()).or().likeRight(MaintainPlan::getDeviceCode, maintainPlanSearchVO.getKeyWord()))
+        	          
+        	          .orderByDesc(MaintainPlan::getCreateTime).orderByDesc(MaintainPlan::getId));
+        	
+        	/*
             pages = page(Condition.getPage(query), (Wrapper) ((LambdaQueryWrapper) Condition.getQueryWrapper(maintainPlanSearchVO.getParam(), MaintainPlan.class).lambda().in(maintainPlanSearchVO.getDeviceTypeId() != null, (v0) -> {
                 return v0.getDeviceTypeId();
             }, new Object[]{maintainPlanSearchVO.getDeviceTypeId()}).eq(maintainPlanSearchVO.getDeviceId() != null, (v0) -> {
@@ -737,9 +315,9 @@
                 return v0.getCreateTime();
             })).orderByDesc((v0) -> {
                 return v0.getId();
-            }));
+            }));*/
         }
-        IPage<MaintainPlanVO> result = MaintainPlanConvert.INSTANCE.convert((IPage) pages);
+        IPage<MaintainPlanVO> result = MaintainPlanConvert.INSTANCE.convert(pages);
         result.getRecords().forEach(bean -> {
             bean.setPlanStatusName(MaintainPlanStatusEnum.getDescDetail(bean.getPlanStatus()));
             bean.setIsAutoName(MaintainPlanIsAutoEnum.getDescDetail(bean.getIsAuto()));
@@ -774,9 +352,11 @@
             }
         }
         removeByIds(maintainPlanIdListVO.getIdList());
+        this.maintainPlanItemService.remove(Wrappers.<MaintainPlanItem>query().lambda().in(MaintainPlanItem::getPlanId, maintainPlanIdListVO.getIdList()));
+        /*
         this.maintainPlanItemService.remove((Wrapper) Wrappers.query().lambda().in((v0) -> {
             return v0.getPlanId();
-        }, maintainPlanIdListVO.getIdList()));
+        }, maintainPlanIdListVO.getIdList()));*/
         for (MaintainPlan bean2 : maintainPlanList) {
             this.machineService.updateDeviceMaintainStatus(bean2.getDeviceId(), bean2.getId(), null);
         }
@@ -804,17 +384,24 @@
 
     @Override // org.springblade.modules.tpm.service.IMaintainPlanService
     public List<MaintainPlan> getMaintainPlanListByStatus(List<Integer> statusList) {
+    	return list(Wrappers.<MaintainPlan>query().lambda().in(MaintainPlan::getPlanStatus, statusList)
+    	        .eq(Func.isNotBlank(AuthUtil.getTenantId()), MaintainPlan::getTenantId, AuthUtil.getTenantId()).orderByAsc(MaintainPlan::getMaintainDate));
+    	/*
         return list((Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().in((v0) -> {
             return v0.getPlanStatus();
         }, statusList)).eq(Func.isNotBlank(AuthUtil.getTenantId()), (v0) -> {
             return v0.getTenantId();
         }, AuthUtil.getTenantId()).orderByAsc((v0) -> {
             return v0.getMaintainDate();
-        }));
+        }));*/
     }
 
     @Override // org.springblade.modules.tpm.service.IMaintainPlanService
     public List<MaintainPlan> getMaintainPlanListByStatusAndProjectId(List<Integer> statusList, Long projectId) {
+    	return list(Wrappers.<MaintainPlan>query().lambda().in(MaintainPlan::getPlanStatus, statusList)
+    	        .eq(Func.isNotBlank(AuthUtil.getTenantId()), MaintainPlan::getTenantId, AuthUtil.getTenantId())
+    	        .eq(Func.isNotEmpty(projectId), MaintainPlan::getProjectId, projectId).orderByAsc(MaintainPlan::getMaintainDate));
+    	/*
         return list((Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().in((v0) -> {
             return v0.getPlanStatus();
         }, statusList)).eq(Func.isNotBlank(AuthUtil.getTenantId()), (v0) -> {
@@ -823,7 +410,7 @@
             return v0.getProjectId();
         }, projectId).orderByAsc((v0) -> {
             return v0.getMaintainDate();
-        }));
+        }));*/
     }
 
     @Override // org.springblade.modules.tpm.service.IMaintainPlanService
@@ -834,7 +421,7 @@
         if (list.isEmpty()) {
             return true;
         }
-        List<Long> planIdList = (List) list.stream().map((v0) -> {
+        List<Long> planIdList = list.stream().map((v0) -> {
             return v0.getId();
         }).distinct().collect(Collectors.toList());
         List<MaintainPlan> planList = listByIds(planIdList);
@@ -849,13 +436,16 @@
 
     @Override // org.springblade.modules.tpm.service.IMaintainPlanService
     public List<MaintainPlanVO> queryMaintainPlanListByStatus(Integer planStatus) {
+    	List<MaintainPlan> list = list(Wrappers.<MaintainPlan>query().lambda().eq(Func.isNotEmpty(planStatus), MaintainPlan::getPlanStatus, planStatus)
+    	        .eq(Func.isNotBlank(AuthUtil.getTenantId()), MaintainPlan::getTenantId, AuthUtil.getTenantId()).orderByAsc(MaintainPlan::getMaintainDate));
+    	/*
         List<MaintainPlan> list = list((Wrapper) Wrappers.query().lambda().eq(Func.isNotEmpty(planStatus), (v0) -> {
             return v0.getPlanStatus();
         }, planStatus).eq(Func.isNotBlank(AuthUtil.getTenantId()), (v0) -> {
             return v0.getTenantId();
         }, AuthUtil.getTenantId()).orderByAsc((v0) -> {
             return v0.getMaintainDate();
-        }));
+        }));*/
         return MaintainPlanConvert.INSTANCE.convert((List) list);
     }
 
@@ -922,13 +512,18 @@
     }
 
     private boolean checkCodeIsExist(String code, Long id) {
+    	List<MaintainPlan> maintainPlanList = this.baseMapper.selectList(Wrappers.<MaintainPlan>query()
+    			.lambda().eq(Func.isNotEmpty(AuthUtil.getTenantId()), MaintainPlan::getTenantId, AuthUtil.getTenantId())
+    			.in(Func.isNotBlank(code), MaintainPlan::getCode, Func.toStrList(code)).notIn(
+    	          Func.isNotEmpty(id), MaintainPlan::getId, new Object[] { id }));
+    	/*
         List<MaintainPlan> maintainPlanList = this.baseMapper.selectList(Wrappers.query().lambda().eq(Func.isNotEmpty(AuthUtil.getTenantId()), (v0) -> {
             return v0.getTenantId();
         }, AuthUtil.getTenantId()).in(Func.isNotBlank(code), (v0) -> {
             return v0.getCode();
         }, Func.toStrList(code)).notIn(Func.isNotEmpty(id), (v0) -> {
             return v0.getId();
-        }, new Object[]{id}));
+        }, new Object[]{id}));*/
         return maintainPlanList != null && maintainPlanList.size() > 0;
     }
 
@@ -936,6 +531,15 @@
     public IPage<MaintainPlanVO> queryMaintainPlanPageByPlanStatus(MaintainPlanSearchByPlanStatusVO maintainPlanSearchByPlanStatusVO, Query query) {
         IPage<MaintainPlan> pages;
         if (!maintainPlanSearchByPlanStatusVO.getFilterPlus().booleanValue()) {
+        	pages = page(Condition.getPage(query), Wrappers.<MaintainPlan>query().lambda()
+        			.in((maintainPlanSearchByPlanStatusVO.getDeviceTypeId() != null), MaintainPlan::getDeviceTypeId, new Object[] { maintainPlanSearchByPlanStatusVO.getDeviceTypeId() })
+        			.eq((maintainPlanSearchByPlanStatusVO.getDeviceId() != null), MaintainPlan::getDeviceId, maintainPlanSearchByPlanStatusVO.getDeviceId())
+        	          .and(Func.isNotEmpty(maintainPlanSearchByPlanStatusVO.getKeyWord()), i -> i.like(MaintainPlan::getDeviceName, maintainPlanSearchByPlanStatusVO.getKeyWord()).or().like(MaintainPlan::getCode, maintainPlanSearchByPlanStatusVO.getKeyWord()).or().like(MaintainPlan::getDeviceCode, maintainPlanSearchByPlanStatusVO.getKeyWord()))
+        	          
+        	          .eq((maintainPlanSearchByPlanStatusVO.getPlanStatus() != null), MaintainPlan::getPlanStatus, maintainPlanSearchByPlanStatusVO.getPlanStatus())
+        	          .orderByAsc(MaintainPlan::getMaintainDate));
+        	
+        	/*
             pages = page(Condition.getPage(query), (Wrapper) Wrappers.query().lambda().in(maintainPlanSearchByPlanStatusVO.getDeviceTypeId() != null, (v0) -> {
                 return v0.getDeviceTypeId();
             }, new Object[]{maintainPlanSearchByPlanStatusVO.getDeviceTypeId()}).eq(maintainPlanSearchByPlanStatusVO.getDeviceId() != null, (v0) -> {
@@ -952,8 +556,17 @@
                 return v0.getPlanStatus();
             }, maintainPlanSearchByPlanStatusVO.getPlanStatus()).orderByAsc((v0) -> {
                 return v0.getMaintainDate();
-            }));
+            }));*/
         } else {
+        	pages = page(Condition.getPage(query),Condition.getQueryWrapper(maintainPlanSearchByPlanStatusVO.getParam(), MaintainPlan.class)
+        	          
+        	          .lambda().in((maintainPlanSearchByPlanStatusVO.getDeviceTypeId() != null), MaintainPlan::getDeviceTypeId, new Object[] { maintainPlanSearchByPlanStatusVO.getDeviceTypeId() })
+        	          .eq((maintainPlanSearchByPlanStatusVO.getDeviceId() != null), MaintainPlan::getDeviceId, maintainPlanSearchByPlanStatusVO.getDeviceId())
+        	          .and(Func.isNotEmpty(maintainPlanSearchByPlanStatusVO.getKeyWord()), i -> i.like(MaintainPlan::getDeviceName, maintainPlanSearchByPlanStatusVO.getKeyWord()).or().like(MaintainPlan::getCode, maintainPlanSearchByPlanStatusVO.getKeyWord()).or().like(MaintainPlan::getDeviceCode, maintainPlanSearchByPlanStatusVO.getKeyWord()))
+        	          
+        	          .eq((maintainPlanSearchByPlanStatusVO.getPlanStatus() != null), MaintainPlan::getPlanStatus, maintainPlanSearchByPlanStatusVO.getPlanStatus())
+        	          .orderByAsc(MaintainPlan::getMaintainDate));
+        	/*
             pages = page(Condition.getPage(query), (Wrapper) Condition.getQueryWrapper(maintainPlanSearchByPlanStatusVO.getParam(), MaintainPlan.class).lambda().in(maintainPlanSearchByPlanStatusVO.getDeviceTypeId() != null, (v0) -> {
                 return v0.getDeviceTypeId();
             }, new Object[]{maintainPlanSearchByPlanStatusVO.getDeviceTypeId()}).eq(maintainPlanSearchByPlanStatusVO.getDeviceId() != null, (v0) -> {
@@ -970,9 +583,9 @@
                 return v0.getPlanStatus();
             }, maintainPlanSearchByPlanStatusVO.getPlanStatus()).orderByAsc((v0) -> {
                 return v0.getMaintainDate();
-            }));
+            }));*/
         }
-        IPage<MaintainPlanVO> result = MaintainPlanConvert.INSTANCE.convert((IPage) pages);
+        IPage<MaintainPlanVO> result = MaintainPlanConvert.INSTANCE.convert(pages);
         result.getRecords().forEach(bean -> {
             bean.setPlanStatusName(MaintainPlanStatusEnum.getDescDetail(bean.getPlanStatus()));
             bean.setMaintainNatureName(RepairNatureEnum.getDescDetail(bean.getMaintainNature()));
@@ -985,6 +598,13 @@
     public Boolean createMaintainPlanAuto(MaintainPlanAutoAddVO maintainPlanAutoAddVO) {
         List<DeviceSimpleDTO> deviceSimpleDTOList = this.machineService.deviceListByDeviceIdList(maintainPlanAutoAddVO.getDeviceIdList());
         List<MaintainProject> maintainProjectList = this.maintainProjectService.listByIds(maintainPlanAutoAddVO.getMaintainProjectIdList());
+        List<MaintainPlan> maintainPlanList = this.baseMapper.selectList(Wrappers.<MaintainPlan>query().lambda()
+        		.eq(Func.isNotEmpty(AuthUtil.getTenantId()), MaintainPlan::getTenantId, AuthUtil.getTenantId())
+                .in(MaintainPlan::getDeviceId, maintainPlanAutoAddVO.getDeviceIdList())
+                .in(MaintainPlan::getProjectId, maintainPlanAutoAddVO.getMaintainProjectIdList())
+                .eq(MaintainPlan::getIsAuto, Integer.valueOf(MaintainPlanIsAutoEnum.T1.getType()))
+                .ne(MaintainPlan::getPlanStatus, Integer.valueOf(MaintainPlanStatusEnum.T5.getType())));
+        /*
         List<MaintainPlan> maintainPlanList = this.baseMapper.selectList((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq(Func.isNotEmpty(AuthUtil.getTenantId()), (v0) -> {
             return v0.getTenantId();
         }, AuthUtil.getTenantId()).in((v0) -> {
@@ -995,17 +615,21 @@
             return v0.getIsAuto();
         }, Integer.valueOf(MaintainPlanIsAutoEnum.T1.getType()))).ne((v0) -> {
             return v0.getPlanStatus();
-        }, Integer.valueOf(MaintainPlanStatusEnum.T5.getType())));
+        }, Integer.valueOf(MaintainPlanStatusEnum.T5.getType())));*/
         Set<String> set = new HashSet<>();
         maintainPlanList.forEach(i -> {
             set.add(String.valueOf(i.getDeviceId()) + String.valueOf(i.getProjectId()));
         });
         for (MaintainProject maintainProject : maintainProjectList) {
+        	List<MaintainProjectItem> maintainProjectItemList = this.maintainProjectItemService.list(Wrappers.<MaintainProjectItem>query().lambda()
+        			.eq(Func.isNotEmpty(AuthUtil.getTenantId()), MaintainProjectItem::getTenantId, AuthUtil.getTenantId())
+        	          .eq(MaintainProjectItem::getProjectId, maintainProject.getId()));
+        	/*
             List<MaintainProjectItem> maintainProjectItemList = this.maintainProjectItemService.list((Wrapper) Wrappers.query().lambda().eq(Func.isNotEmpty(AuthUtil.getTenantId()), (v0) -> {
                 return v0.getTenantId();
             }, AuthUtil.getTenantId()).eq((v0) -> {
                 return v0.getProjectId();
-            }, maintainProject.getId()));
+            }, maintainProject.getId()));*/
             for (DeviceSimpleDTO deviceSimpleDTO : deviceSimpleDTOList) {
                 if (!set.contains(String.valueOf(deviceSimpleDTO.getDeviceId()) + maintainProject.getId())) {
                     MaintainPlanBatchVO maintainPlanBatchVO = MaintainPlanBatchVO.builder().deviceSimpleDTO(deviceSimpleDTO).maintainProject(maintainProject).maintainProjectItemList(maintainProjectItemList).lastTime(null).remark(maintainPlanAutoAddVO.getRemark()).maintainUserId(maintainPlanAutoAddVO.getMaintainUserId()).maintainUserName(maintainPlanAutoAddVO.getMaintainUserName()).maintainNature(maintainPlanAutoAddVO.getMaintainNature()).notifyBusinessSend(maintainPlanAutoAddVO.getNotifyBusinessSend()).build();
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/MaintainRecordServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/MaintainRecordServiceImpl.java
index 89edcb6..1e7b584 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/MaintainRecordServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/MaintainRecordServiceImpl.java
@@ -1,22 +1,24 @@
 package com.qianwen.smartman.modules.tpm.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import java.lang.invoke.SerializedLambda;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
+
 import javax.servlet.http.HttpServletResponse;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.utils.LocalDateTimeUtils;
-import com.qianwen.smartman.common.utils.MessageUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qianwen.core.excel.util.ExcelUtil;
 import com.qianwen.core.log.exception.ServiceException;
 import com.qianwen.core.mp.support.Condition;
@@ -26,6 +28,8 @@
 import com.qianwen.core.tool.utils.CollectionUtil;
 import com.qianwen.core.tool.utils.DateUtil;
 import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.utils.LocalDateTimeUtils;
+import com.qianwen.smartman.common.utils.MessageUtils;
 import com.qianwen.smartman.modules.cps.dto.DeviceSimpleDTO;
 import com.qianwen.smartman.modules.cps.entity.MaintainProject;
 import com.qianwen.smartman.modules.cps.entity.MaintainProjectItem;
@@ -69,14 +73,8 @@
 import com.qianwen.smartman.modules.tpm.vo.MaintainVO;
 import com.qianwen.smartman.modules.tpm.vo.RepairRecordMaterialVO;
 import com.qianwen.smartman.modules.tpm.vo.excel.MaintainRecordExcel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
 
 @Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tpm/service/impl/MaintainRecordServiceImpl.class */
 public class MaintainRecordServiceImpl extends ServiceImpl<MaintainRecordMapper, MaintainRecord> implements IMaintainRecordService {
     private static final Logger log = LoggerFactory.getLogger(MaintainRecordServiceImpl.class);
     @Autowired
@@ -98,364 +96,6 @@
     @Autowired
     private IMaintainProjectItemService maintainProjectItemService;
 
-    private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
-        String implMethodName = lambda.getImplMethodName();
-        boolean z = true;
-        switch (implMethodName.hashCode()) {
-            case -1580315634:
-                if (implMethodName.equals("getProjectName")) {
-                    z = false;
-                    break;
-                }
-                break;
-            case -1107875961:
-                if (implMethodName.equals("getDeviceId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case -904436898:
-                if (implMethodName.equals("getProjectId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case -826050023:
-                if (implMethodName.equals("getRecordStatus")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 98245393:
-                if (implMethodName.equals("getId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 436647380:
-                if (implMethodName.equals("getRecordCode")) {
-                    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 710250778:
-                if (implMethodName.equals("getPlanId")) {
-                    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 1071464927:
-                if (implMethodName.equals("getCreateTime")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 1278665410:
-                if (implMethodName.equals("getRecordId")) {
-                    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/MaintainRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getProjectName();
-                    };
-                }
-                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();
-                    };
-                }
-                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/cps/entity/MaintainProjectItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getProjectId();
-                    };
-                }
-                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();
-                    };
-                }
-                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/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();
-                    };
-                }
-                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 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/modules/tpm/entity/MaintainRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getPlanId();
-                    };
-                }
-                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/MaintainRecord") && 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/MaintainRecord") && 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/MaintainRecord") && 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/MaintainRecord") && 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/MaintainRecord") && 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/MaintainRecord") && 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/MaintainRecord") && 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/MaintainRecord") && 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/MaintainRecord") && 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/MaintainRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getRecordCode();
-                    };
-                }
-                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/MaintainRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getRecordCode();
-                    };
-                }
-                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/MaintainRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getRecordCode();
-                    };
-                }
-                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/MaintainRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getRecordCode();
-                    };
-                }
-                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/MaintainRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getRecordCode();
-                    };
-                }
-                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/MaintainRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getRecordCode();
-                    };
-                }
-                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/MaintainRecordItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getRecordId();
-                    };
-                }
-                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/MaintainRecordItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getRecordId();
-                    };
-                }
-                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/DeviceMaterialRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getRecordId();
-                    };
-                }
-                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/MaintainRecordItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getRecordId();
-                    };
-                }
-                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/MaintainRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getDeviceTypeId();
-                    };
-                }
-                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/MaintainRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getDeviceTypeId();
-                    };
-                }
-                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/MaintainRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getDeviceTypeId();
-                    };
-                }
-                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/MaintainRecord") && 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/MaintainRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getRecordStatus();
-                    };
-                }
-                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/MaintainRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getRecordStatus();
-                    };
-                }
-                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/MaintainRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getRecordStatus();
-                    };
-                }
-                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/MaintainRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getRecordStatus();
-                    };
-                }
-                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/MaintainRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getRecordStatus();
-                    };
-                }
-                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/MaintainRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getRecordStatus();
-                    };
-                }
-                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/MaintainRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getRecordStatus();
-                    };
-                }
-                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/MaintainRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getRecordStatus();
-                    };
-                }
-                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/MaintainRecord") && 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/MaintainRecord") && 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/MaintainRecord") && 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/MaintainRecord") && 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/MaintainRecord") && 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/MaintainRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getDeviceName();
-                    };
-                }
-                break;
-        }
-        throw new IllegalArgumentException("Invalid lambda deserialization");
-    }
 
     @Override // org.springblade.modules.tpm.service.IMaintainRecordService
     @Transactional(rollbackFor = {Exception.class})
@@ -464,7 +104,7 @@
             codeGenerator(MaintainRecordAddVO);
         }
         LocalDateTime now = LocalDateTime.now();
-        MaintainPlan plan = (MaintainPlan) this.maintainPlanService.getById(MaintainRecordAddVO.getPlanId());
+        MaintainPlan plan = this.maintainPlanService.getById(MaintainRecordAddVO.getPlanId());
         if (Func.isNull(plan)) {
             throw new ServiceException(MessageUtils.message("cps.common.the.current.object.does.not.exist", new Object[0]));
         }
@@ -534,9 +174,11 @@
         MaintainRecord maintainRecordUp = MaintainRecordConvert.INSTANCE.convert(maintainRecordUpdateVO);
         maintainRecordUp.setUpdateTime(LocalDateTimeUtils.LocalDateTimeToDate(now));
         updateById(maintainRecordUp);
+        this.maintainRecordItemService.remove(Wrappers.<MaintainRecordItem>query().lambda().in(MaintainRecordItem::getRecordId, new Object[] { maintainRecord.getId() }));
+        /*
         this.maintainRecordItemService.remove((Wrapper) Wrappers.query().lambda().in((v0) -> {
             return v0.getRecordId();
-        }, new Object[]{maintainRecord.getId()}));
+        }, new Object[]{maintainRecord.getId()}));*/
         List<MaintainRecordItem> maintainRecordItemList = new ArrayList<>();
         maintainRecordUpdateVO.getMaintainRecordItemAddVOList().forEach(i -> {
             MaintainRecordItem maintainRecordItem = MaintainRecordItemConvert.INSTANCE.convert(i);
@@ -573,30 +215,44 @@
     @Override // org.springblade.modules.tpm.service.IMaintainRecordService
     public MaintainRecordVO getMaintainRecord(Long id) {
         MaintainRecord maintainRecord = (MaintainRecord) getById(id);
-        MaintainRecordVO maintainRecordVo = MaintainRecordConvert.INSTANCE.convert((MaintainRecordConvert) maintainRecord);
+        MaintainRecordVO maintainRecordVo = MaintainRecordConvert.INSTANCE.convert(maintainRecord);
         maintainRecordVo.setIsDelayName(PlanDelayStatusEnum.getDescDetail(maintainRecordVo.getIsDelay()));
         maintainRecordVo.setMaintainNatureName(RepairNatureEnum.getDescDetail(maintainRecordVo.getMaintainNature()));
+        List<MaintainRecordItem> maintainRecordItemList = this.maintainRecordItemService.list(Wrappers.<MaintainRecordItem>query().lambda()
+        		.in(MaintainRecordItem::getRecordId, new Object[] { maintainRecord.getId() }));
+        /*
         List<MaintainRecordItem> maintainRecordItemList = this.maintainRecordItemService.list((Wrapper) Wrappers.query().lambda().in((v0) -> {
             return v0.getRecordId();
-        }, new Object[]{maintainRecord.getId()}));
-        List<MaintainRecordItemVO> maintainRecordItemVoList = MaintainRecordItemConvert.INSTANCE.convert((List) maintainRecordItemList);
+        }, new Object[]{maintainRecord.getId()}));*/
+        List<MaintainRecordItemVO> maintainRecordItemVoList = MaintainRecordItemConvert.INSTANCE.convert(maintainRecordItemList);
         maintainRecordItemVoList.forEach(i -> {
             i.setIsExecuteName(ExecuteEnum.getDescDetail(i.getIsExecute()));
         });
         maintainRecordVo.setMaintainRecordItemVOList(maintainRecordItemVoList);
+        List<DeviceMaterialRecord> deviceMaterialRecordList = this.deviceMaterialRecordService.list(Wrappers.<DeviceMaterialRecord>query().lambda()
+        		.in(DeviceMaterialRecord::getRecordId, new Object[] { maintainRecord.getId() }));
+        /*
         List<DeviceMaterialRecord> deviceMaterialRecordList = this.deviceMaterialRecordService.list((Wrapper) Wrappers.query().lambda().in((v0) -> {
             return v0.getRecordId();
-        }, new Object[]{maintainRecord.getId()}));
-        List<RepairRecordMaterialVO> recordByRecord = DeviceMaterialRecordConvert.INSTANCE.convert((List) deviceMaterialRecordList);
+        }, new Object[]{maintainRecord.getId()}));*/
+        List<RepairRecordMaterialVO> recordByRecord = DeviceMaterialRecordConvert.INSTANCE.convert(deviceMaterialRecordList);
         maintainRecordVo.setRepairRecordMaterialVOList(recordByRecord);
         return maintainRecordVo;
     }
 
     @Override // org.springblade.modules.tpm.service.IMaintainRecordService
     public List<MaintainRecordVO> queryMaintainRecordList(MaintainRecordSearchVO maintainRecordSearchVO) {
-        List<MaintainRecord> list;
-        new ArrayList();
+    	List<MaintainRecord> list = new ArrayList<>();
         if (!maintainRecordSearchVO.getFilterPlus().booleanValue()) {
+        	list = list(Wrappers.<MaintainRecord>query().lambda()
+        	          .in((maintainRecordSearchVO.getDeviceTypeId() != null), MaintainRecord::getDeviceTypeId, new Object[] { maintainRecordSearchVO.getDeviceTypeId() })
+        	          .eq(Func.isNotEmpty(maintainRecordSearchVO.getDeviceId()), MaintainRecord::getDeviceId, maintainRecordSearchVO.getDeviceId())
+        	          .eq(Func.isNotEmpty(maintainRecordSearchVO.getRecordStatus()), MaintainRecord::getRecordStatus, maintainRecordSearchVO.getRecordStatus())
+        	          .and(Func.isNotEmpty(maintainRecordSearchVO.getKeyWord()), i -> i.likeRight(MaintainRecord::getDeviceName, maintainRecordSearchVO.getKeyWord()).or().likeRight(MaintainRecord::getRecordCode, maintainRecordSearchVO.getKeyWord()).or().likeRight(MaintainRecord::getDeviceCode, maintainRecordSearchVO.getKeyWord()))
+        	          
+        	          .orderByDesc(MaintainRecord::getRecordStatus));
+        	
+        	/*
             list = list((Wrapper) Wrappers.query().lambda().in(maintainRecordSearchVO.getDeviceTypeId() != null, (v0) -> {
                 return v0.getDeviceTypeId();
             }, new Object[]{maintainRecordSearchVO.getDeviceTypeId()}).eq(Func.isNotEmpty(maintainRecordSearchVO.getDeviceId()), (v0) -> {
@@ -613,8 +269,16 @@
                 }, maintainRecordSearchVO.getKeyWord());
             }).orderByDesc((v0) -> {
                 return v0.getRecordStatus();
-            }));
+            }));*/
         } else {
+        	list = list(Condition.getQueryWrapper(maintainRecordSearchVO.getParam(), MaintainRecord.class).lambda()
+        	          .in((maintainRecordSearchVO.getDeviceTypeId() != null), MaintainRecord::getDeviceTypeId, new Object[] { maintainRecordSearchVO.getDeviceTypeId() })
+        	          .eq(Func.isNotEmpty(maintainRecordSearchVO.getDeviceId()), MaintainRecord::getDeviceId, maintainRecordSearchVO.getDeviceId())
+        	          .eq(Func.isNotEmpty(maintainRecordSearchVO.getRecordStatus()), MaintainRecord::getRecordStatus, maintainRecordSearchVO.getRecordStatus())
+        	          .and(Func.isNotEmpty(maintainRecordSearchVO.getKeyWord()), i -> i.likeRight(MaintainRecord::getDeviceName, maintainRecordSearchVO.getKeyWord()).or().likeRight(MaintainRecord::getRecordCode, maintainRecordSearchVO.getKeyWord()).or().likeRight(MaintainRecord::getDeviceCode, maintainRecordSearchVO.getKeyWord()))
+        	          
+        	          .orderByDesc(MaintainRecord::getRecordStatus));
+        	/*
             list = list((Wrapper) Condition.getQueryWrapper(maintainRecordSearchVO.getParam(), MaintainRecord.class).lambda().in(maintainRecordSearchVO.getDeviceTypeId() != null, (v0) -> {
                 return v0.getDeviceTypeId();
             }, new Object[]{maintainRecordSearchVO.getDeviceTypeId()}).eq(Func.isNotEmpty(maintainRecordSearchVO.getDeviceId()), (v0) -> {
@@ -631,9 +295,9 @@
                 }, maintainRecordSearchVO.getKeyWord());
             }).orderByDesc((v0) -> {
                 return v0.getRecordStatus();
-            }));
+            }));*/
         }
-        List<MaintainRecordVO> result = MaintainRecordConvert.INSTANCE.convert((List) list);
+        List<MaintainRecordVO> result = MaintainRecordConvert.INSTANCE.convert(list);
         result.forEach(bean -> {
             bean.setRecordStatusName(MaintainRecordStatusEnum.getDescDetail(bean.getRecordStatus()));
             bean.setIsDelayName(PlanDelayStatusEnum.getDescDetail(bean.getIsDelay()));
@@ -646,6 +310,14 @@
     public IPage<MaintainRecordVO> queryMaintainRecordPage(MaintainRecordSearchVO maintainRecordSearchVO, Query query) {
         IPage<MaintainRecord> pages;
         if (!maintainRecordSearchVO.getFilterPlus().booleanValue()) {
+        	pages = page(Condition.getPage(query), Wrappers.<MaintainRecord>query().lambda()
+        	          .in((maintainRecordSearchVO.getDeviceTypeId() != null), MaintainRecord::getDeviceTypeId, new Object[] { maintainRecordSearchVO.getDeviceTypeId() })
+        	          .eq(Func.isNotEmpty(maintainRecordSearchVO.getDeviceId()), MaintainRecord::getDeviceId, maintainRecordSearchVO.getDeviceId())
+        	          .eq(Func.isNotEmpty(maintainRecordSearchVO.getRecordStatus()), MaintainRecord::getRecordStatus, maintainRecordSearchVO.getRecordStatus())
+        	          .and(Func.isNotEmpty(maintainRecordSearchVO.getKeyWord()), i -> i.likeRight(MaintainRecord::getDeviceName, maintainRecordSearchVO.getKeyWord()).or().likeRight(MaintainRecord::getRecordCode, maintainRecordSearchVO.getKeyWord()).or().likeRight(MaintainRecord::getDeviceCode, maintainRecordSearchVO.getKeyWord()))
+        	          
+        	          .orderByDesc(MaintainRecord::getCreateTime).orderByDesc(MaintainRecord::getId));
+        	/*
             pages = page(Condition.getPage(query), (Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().in(maintainRecordSearchVO.getDeviceTypeId() != null, (v0) -> {
                 return v0.getDeviceTypeId();
             }, new Object[]{maintainRecordSearchVO.getDeviceTypeId()}).eq(Func.isNotEmpty(maintainRecordSearchVO.getDeviceId()), (v0) -> {
@@ -664,8 +336,17 @@
                 return v0.getCreateTime();
             })).orderByDesc((v0) -> {
                 return v0.getId();
-            }));
+            }));*/
         } else {
+        	pages = page(Condition.getPage(query), Condition.getQueryWrapper(maintainRecordSearchVO.getParam(), MaintainRecord.class)
+        	          
+        	          .lambda().in((maintainRecordSearchVO.getDeviceTypeId() != null), MaintainRecord::getDeviceTypeId, new Object[] { maintainRecordSearchVO.getDeviceTypeId() })
+        	          .eq(Func.isNotEmpty(maintainRecordSearchVO.getDeviceId()), MaintainRecord::getDeviceId, maintainRecordSearchVO.getDeviceId())
+        	          .eq(Func.isNotEmpty(maintainRecordSearchVO.getRecordStatus()), MaintainRecord::getRecordStatus, maintainRecordSearchVO.getRecordStatus())
+        	          .and(Func.isNotEmpty(maintainRecordSearchVO.getKeyWord()), i -> i.likeRight(MaintainRecord::getDeviceName, maintainRecordSearchVO.getKeyWord()).or().likeRight(MaintainRecord::getRecordCode, maintainRecordSearchVO.getKeyWord()).or().likeRight(MaintainRecord::getDeviceCode, maintainRecordSearchVO.getKeyWord()))
+        	          
+        	          .orderByDesc(MaintainRecord::getCreateTime).orderByDesc(MaintainRecord::getId));
+        	/*
             pages = page(Condition.getPage(query), (Wrapper) ((LambdaQueryWrapper) Condition.getQueryWrapper(maintainRecordSearchVO.getParam(), MaintainRecord.class).lambda().in(maintainRecordSearchVO.getDeviceTypeId() != null, (v0) -> {
                 return v0.getDeviceTypeId();
             }, new Object[]{maintainRecordSearchVO.getDeviceTypeId()}).eq(Func.isNotEmpty(maintainRecordSearchVO.getDeviceId()), (v0) -> {
@@ -684,7 +365,7 @@
                 return v0.getCreateTime();
             })).orderByDesc((v0) -> {
                 return v0.getId();
-            }));
+            }));*/
         }
         IPage<MaintainRecordVO> result = MaintainRecordConvert.INSTANCE.convert((IPage) pages);
         result.getRecords().forEach(bean -> {
@@ -709,18 +390,22 @@
     @Transactional(rollbackFor = {Exception.class})
     public Boolean deleteMaintainRecord(MaintainRecordIdListVO maintainRecordIdListVO) {
         List<MaintainRecord> maintainRecordList = listByIds(maintainRecordIdListVO.getIdList());
+        List<MaintainRecord> notDeleteList = maintainRecordList.stream().filter(i -> (i.getRecordStatus().intValue() != MaintainRecordStatusEnum.T1.getType())).collect(Collectors.toList());
+        /*
         List<MaintainRecord> notDeleteList = (List) maintainRecordList.stream().filter(i -> {
             return i.getRecordStatus().intValue() != MaintainRecordStatusEnum.T1.getType();
-        }).collect(Collectors.toList());
+        }).collect(Collectors.toList());*/
         if (!notDeleteList.isEmpty()) {
             throw new ServiceException(MessageUtils.message("cps.tpm.maintain.record.have.been.confirmed.can.not.delete", new Object[0]));
         }
         removeByIds(maintainRecordIdListVO.getIdList());
+        this.maintainRecordItemService.remove(Wrappers.<MaintainRecordItem>query().lambda().in(MaintainRecordItem::getRecordId, maintainRecordIdListVO.getIdList()));
+        /*
         this.maintainRecordItemService.remove((Wrapper) Wrappers.query().lambda().in((v0) -> {
             return v0.getRecordId();
-        }, maintainRecordIdListVO.getIdList()));
+        }, maintainRecordIdListVO.getIdList()));*/
         this.deviceMaterialRecordService.deleteDeviceMaterialRecordByRecordId(maintainRecordIdListVO.getIdList());
-        List<Long> planIdList = (List) maintainRecordList.stream().map((v0) -> {
+        List<Long> planIdList = maintainRecordList.stream().map((v0) -> {
             return v0.getPlanId();
         }).distinct().collect(Collectors.toList());
         for (Long planId : planIdList) {
@@ -756,9 +441,12 @@
             if (maintainProject == null) {
                 return true;
             }
+            List<MaintainProjectItem> maintainProjectItemList = this.maintainProjectItemService.list(Wrappers.<MaintainProjectItem>query().lambda()
+            		.in(MaintainProjectItem::getProjectId, new Object[] { plan.getProjectId() }));
+            /*
             List<MaintainProjectItem> maintainProjectItemList = this.maintainProjectItemService.list((Wrapper) Wrappers.query().lambda().in((v0) -> {
                 return v0.getProjectId();
-            }, new Object[]{plan.getProjectId()}));
+            }, new Object[]{plan.getProjectId()}));*/
             if (CollectionUtil.isEmpty(maintainProjectItemList)) {
                 return true;
             }
@@ -792,17 +480,30 @@
         maintainStatisticsVo.setDelayNum(maintainPlanStatisticsNum.getDelayNum());
         maintainStatisticsVo.setTodayNum(maintainPlanStatisticsNum.getTodayNum());
         maintainStatisticsVo.setWarningNum(maintainPlanStatisticsNum.getWarningNum());
+        Long recordNum = Long.valueOf(count(Wrappers.<MaintainRecord>query().lambda().eq(MaintainRecord::getRecordStatus, Integer.valueOf(MaintainRecordStatusEnum.T1.getType()))
+                .eq(Func.isNotBlank(AuthUtil.getTenantId()), MaintainRecord::getTenantId, AuthUtil.getTenantId())));
+        /*
         Long recordNum = Long.valueOf(count(((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
             return v0.getRecordStatus();
         }, Integer.valueOf(MaintainRecordStatusEnum.T1.getType()))).eq(Func.isNotBlank(AuthUtil.getTenantId()), (v0) -> {
             return v0.getTenantId();
-        }, AuthUtil.getTenantId())));
+        }, AuthUtil.getTenantId())));*/
         maintainStatisticsVo.setRecordNum(recordNum);
         return maintainStatisticsVo;
     }
 
     @Override // org.springblade.modules.tpm.service.IMaintainRecordService
     public IPage<MaintainRecordVO> pageMaintainPlanConfirmed(Query query, MaintainPlanExpireQueryVO maintainPlanExpireQueryVO) {
+    	IPage<MaintainRecord> page = page(Condition.getPage(query), Wrappers.<MaintainRecord>lambdaQuery()
+    	        .eq(MaintainRecord::getTenantId, AuthUtil.getTenantId())
+    	        .eq(MaintainRecord::getRecordStatus, Integer.valueOf(MaintainRecordStatusEnum.T1.getType()))
+    	        .likeRight(Func.isNotBlank(maintainPlanExpireQueryVO.getCode()), MaintainRecord::getRecordCode, maintainPlanExpireQueryVO.getCode())
+    	        .likeRight(Func.isNotBlank(maintainPlanExpireQueryVO.getDeviceCode()), MaintainRecord::getDeviceCode, maintainPlanExpireQueryVO.getDeviceCode())
+    	        .likeRight(Func.isNotBlank(maintainPlanExpireQueryVO.getDeviceName()), MaintainRecord::getDeviceName, maintainPlanExpireQueryVO.getDeviceName())
+    	        .likeRight(Func.isNotBlank(maintainPlanExpireQueryVO.getProjectName()), MaintainRecord::getProjectName, maintainPlanExpireQueryVO.getProjectName())
+    	        .orderByDesc(MaintainRecord::getRecordStatus));
+    	
+    	/*
         IPage<MaintainRecord> page = page(Condition.getPage(query), (Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
             return v0.getTenantId();
         }, AuthUtil.getTenantId())).eq((v0) -> {
@@ -817,10 +518,10 @@
             return v0.getProjectName();
         }, maintainPlanExpireQueryVO.getProjectName()).orderByDesc((v0) -> {
             return v0.getRecordStatus();
-        }));
-        IPage<MaintainRecordVO> voiPage = MaintainRecordConvert.INSTANCE.convert((IPage) page);
+        }));*/
+        IPage<MaintainRecordVO> voiPage = MaintainRecordConvert.INSTANCE.convert(page);
         if (Func.isNotEmpty(voiPage.getRecords())) {
-            List<MaintainRecordVO> collect = (List) voiPage.getRecords().stream().map(o -> {
+            List<MaintainRecordVO> collect = voiPage.getRecords().stream().map(o -> {
                 o.setRecordStatusName(MaintainRecordStatusEnum.T1.getDesc());
                 o.setIsDelayName(PlanDelayStatusEnum.getDescDetail(o.getIsDelay()));
                 o.setMaintainNatureName(RepairNatureEnum.getDescDetail(o.getMaintainNature()));
@@ -836,11 +537,14 @@
         MaintainVO result = new MaintainVO();
         MaintainPlanVO maintainPlanVO = this.maintainPlanService.getMaintainPlan(Long.valueOf(id));
         result.setMaintainPlanVO(maintainPlanVO);
+        
+        MaintainRecord maintainRecord = getOne(Wrappers.<MaintainRecord>query().lambda().eq(Func.isNotEmpty(AuthUtil.getTenantId()), MaintainRecord::getTenantId, AuthUtil.getTenantId()).eq(MaintainRecord::getPlanId, id));
+        /*
         MaintainRecord maintainRecord = (MaintainRecord) getOne((Wrapper) Wrappers.query().lambda().eq(Func.isNotEmpty(AuthUtil.getTenantId()), (v0) -> {
             return v0.getTenantId();
         }, AuthUtil.getTenantId()).eq((v0) -> {
             return v0.getPlanId();
-        }, id));
+        }, id));*/
         if (maintainRecord != null) {
             MaintainRecordVO maintainRecordVO = getMaintainRecord(maintainRecord.getId());
             result.setMaintainRecordVO(maintainRecordVO);
@@ -849,13 +553,18 @@
     }
 
     private boolean checkCodeIsExist(String code, Long id) {
+    	List<MaintainRecord> maintainRecordList = this.baseMapper.selectList(Wrappers.<MaintainRecord>query().lambda()
+    			.eq(Func.isNotEmpty(AuthUtil.getTenantId()), MaintainRecord::getTenantId, AuthUtil.getTenantId())
+    			.in(MaintainRecord::getRecordCode, Func.toStrList(code))
+    			.notIn(Func.isNotEmpty(id), MaintainRecord::getId, new Object[] { id }));
+    	/*
         List<MaintainRecord> maintainRecordList = this.baseMapper.selectList(((LambdaQueryWrapper) Wrappers.query().lambda().eq(Func.isNotEmpty(AuthUtil.getTenantId()), (v0) -> {
             return v0.getTenantId();
         }, AuthUtil.getTenantId()).in((v0) -> {
             return v0.getRecordCode();
         }, Func.toStrList(code))).notIn(Func.isNotEmpty(id), (v0) -> {
             return v0.getId();
-        }, new Object[]{id}));
+        }, new Object[]{id}));*/
         return maintainRecordList != null && maintainRecordList.size() > 0;
     }
 
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()));
         }
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/RepairRecordServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/RepairRecordServiceImpl.java
index 0426b68..40a87d0 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/RepairRecordServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tpm/service/impl/RepairRecordServiceImpl.java
@@ -1,13 +1,6 @@
 package com.qianwen.smartman.modules.tpm.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import java.lang.invoke.SerializedLambda;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
@@ -15,16 +8,21 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.utils.MessageUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qianwen.core.log.exception.ServiceException;
 import com.qianwen.core.mp.support.Condition;
 import com.qianwen.core.mp.support.Query;
 import com.qianwen.core.secure.utils.AuthUtil;
 import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.utils.MessageUtils;
 import com.qianwen.smartman.modules.cps.service.IMachineService;
 import com.qianwen.smartman.modules.cps.vo.RepairRecordMaterialAddVO;
 import com.qianwen.smartman.modules.system.service.ICodeGeneratorService;
@@ -67,8 +65,6 @@
 import com.qianwen.smartman.modules.tpm.vo.RepairRecordUpdateVO;
 import com.qianwen.smartman.modules.tpm.vo.RepairRecordVO;
 import com.qianwen.smartman.modules.tpm.vo.excel.RepairRecordExcelVO;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 @Service
 /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tpm/service/impl/RepairRecordServiceImpl.class */
@@ -82,342 +78,6 @@
     private final RepairRecordMapper repairRecordMapper;
     private final ICodeGeneratorService codeGeneratorService;
 
-    private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
-        String implMethodName = lambda.getImplMethodName();
-        boolean z = true;
-        switch (implMethodName.hashCode()) {
-            case -2085769275:
-                if (implMethodName.equals("getApplyCode")) {
-                    z = false;
-                    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 98245393:
-                if (implMethodName.equals("getId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 436647380:
-                if (implMethodName.equals("getRecordCode")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 457411340:
-                if (implMethodName.equals("getRepairStartTime")) {
-                    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 1278665410:
-                if (implMethodName.equals("getRecordId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 1788066762:
-                if (implMethodName.equals("getApplyStatus")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 1916606703:
-                if (implMethodName.equals("getRepairRecordId")) {
-                    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/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();
-                    };
-                }
-                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/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/RepairRecord") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
-                    return (v0) -> {
-                        return v0.getRepairStartTime();
-                    };
-                }
-                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/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/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();
-                    };
-                }
-                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();
-                    };
-                }
-                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();
-                    };
-                }
-                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/modules/tpm/entity/RepairRecord") && 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/RepairRecord") && 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/RepairRecordFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getRepairRecordId();
-                    };
-                }
-                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/RepairRecordFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getRepairRecordId();
-                    };
-                }
-                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/RepairRecordFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getRepairRecordId();
-                    };
-                }
-                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/RepairRecordFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getRepairRecordId();
-                    };
-                }
-                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/String;")) {
-                    return (v0) -> {
-                        return v0.getRecordCode();
-                    };
-                }
-                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/String;")) {
-                    return (v0) -> {
-                        return v0.getRecordCode();
-                    };
-                }
-                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/String;")) {
-                    return (v0) -> {
-                        return v0.getRecordCode();
-                    };
-                }
-                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/String;")) {
-                    return (v0) -> {
-                        return v0.getRecordCode();
-                    };
-                }
-                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/String;")) {
-                    return (v0) -> {
-                        return v0.getRecordCode();
-                    };
-                }
-                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/DeviceMaterialRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getRecordId();
-                    };
-                }
-                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();
-                    };
-                }
-                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/Long;")) {
-                    return (v0) -> {
-                        return v0.getDeviceTypeId();
-                    };
-                }
-                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.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/RepairRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getRecordStatus();
-                    };
-                }
-                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();
-                    };
-                }
-                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();
-                    };
-                }
-                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();
-                    };
-                }
-                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();
-                    };
-                }
-                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();
-                    };
-                }
-                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/RepairRecord") && 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/RepairRecord") && 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/RepairRecord") && 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();
-                    };
-                }
-                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");
-    }
 
     public RepairRecordServiceImpl(final IRepairApplyService repairApplyService, final IRepairApplyFileService repairApplyFileService, final IRepairRecordFileService repairRecordFileService, final IDeviceMaterialRecordService deviceMaterialRecordService, final IMachineService machineService, final RepairRecordMapper repairRecordMapper, final ICodeGeneratorService codeGeneratorService) {
         this.repairApplyService = repairApplyService;
@@ -490,6 +150,8 @@
         RepairRecord repairRecord = RepairRecordConvert.INSTANCE.convert(repairRecordUpdateVO);
         updateById(repairRecord);
         if (Func.isNotEmpty(repairRecordUpdateVO.getRecordFileList())) {
+        	List<RepairRecordFile> oldFiles = this.repairRecordFileService.list(Wrappers.<RepairRecordFile>query().lambda().eq(RepairRecordFile::getRepairRecordId, repairRecordUpdateVO.getId()));
+        	/*
             List<RepairRecordFile> oldFiles = this.repairRecordFileService.list((Wrapper) Wrappers.query().lambda().eq((v0) -> {
                 return v0.getRepairRecordId();
             }, repairRecordUpdateVO.getId()));
@@ -497,23 +159,25 @@
                 this.repairRecordFileService.removeByIds((Collection) oldFiles.stream().map((v0) -> {
                     return v0.getId();
                 }).collect(Collectors.toList()));
-            }
+            }*/
             List<RepairRecordFile> newFiles = RepairRecordFileConvert.INSTANCE.convert(repairRecordUpdateVO.getRecordFileList());
             newFiles.forEach(s -> {
                 s.setRepairRecordId(repairRecord.getId());
             });
             this.repairRecordFileService.saveBatch(newFiles);
         } else {
+        	List<RepairRecordFile> oldFiles2 = this.repairRecordFileService.list(Wrappers.<RepairRecordFile>query().lambda().eq(RepairRecordFile::getRepairRecordId, repairRecordUpdateVO.getId()));
+        	/*
             List<RepairRecordFile> oldFiles2 = this.repairRecordFileService.list((Wrapper) Wrappers.query().lambda().eq((v0) -> {
                 return v0.getRepairRecordId();
-            }, repairRecordUpdateVO.getId()));
+            }, repairRecordUpdateVO.getId()));*/
             if (!Func.isNull(oldFiles2)) {
-                this.repairRecordFileService.removeByIds((Collection) oldFiles2.stream().map((v0) -> {
+                this.repairRecordFileService.removeByIds(oldFiles2.stream().map((v0) -> {
                     return v0.getId();
                 }).collect(Collectors.toList()));
             }
         }
-        RepairApply repairApply = (RepairApply) this.repairApplyService.getById(repairRecord.getRepairApplyId());
+        RepairApply repairApply = this.repairApplyService.getById(repairRecord.getRepairApplyId());
         if (Func.isNotEmpty(repairRecordUpdateVO.getMaterialVOList())) {
             List<RepairRecordMaterialAddVO> materialAddDTOList = repairRecordUpdateVO.getMaterialVOList();
             materialAddDTOList.forEach(i -> {
@@ -528,6 +192,13 @@
 
     @Override // org.springblade.modules.tpm.service.IRepairRecordService
     public IPage<RepairRecordVO> getPageRecord(RepairRecordSearchDTO repairRecordSearchDTO, Query query) {
+    	IPage<RepairRecord> pages = page(Condition.getPage(query), Wrappers.<RepairRecord>lambdaQuery()
+    	        .eq(Func.isNotEmpty(AuthUtil.getTenantId()), RepairRecord::getTenantId, AuthUtil.getTenantId())
+    	        .and(Func.isNotEmpty(repairRecordSearchDTO.getDeviceTypeId()), i -> i.eq(RepairRecord::getDeviceTypeId, repairRecordSearchDTO.getDeviceTypeId()))
+    	        .and(Func.isNotEmpty(repairRecordSearchDTO.getRecordStatus()), i -> i.eq(RepairRecord::getRecordStatus, repairRecordSearchDTO.getRecordStatus()))
+    	        .and(Func.isNotEmpty(repairRecordSearchDTO.getKeyWords()), i -> i.like(RepairRecord::getRecordCode, repairRecordSearchDTO.getKeyWords()).or().like(RepairRecord::getDeviceCode, repairRecordSearchDTO.getKeyWords()).or().like(RepairRecord::getRepairApplyId, getApplyId(repairRecordSearchDTO.getKeyWords())).or().like(RepairRecord::getDeviceName, repairRecordSearchDTO.getKeyWords())));
+    	
+    	/*
         IPage<RepairRecord> pages = page(Condition.getPage(query), Wrappers.lambdaQuery().eq(Func.isNotEmpty(AuthUtil.getTenantId()), (v0) -> {
             return v0.getTenantId();
         }, AuthUtil.getTenantId()).and(Func.isNotEmpty(repairRecordSearchDTO.getDeviceTypeId()), i -> {
@@ -548,8 +219,8 @@
             }, getApplyId(repairRecordSearchDTO.getKeyWords()))).or()).like((v0) -> {
                 return v0.getDeviceName();
             }, repairRecordSearchDTO.getKeyWords());
-        }));
-        IPage<RepairRecordVO> repairRecordVoIPage = RepairRecordConvert.INSTANCE.convert((IPage) pages);
+        }));*/
+        IPage<RepairRecordVO> repairRecordVoIPage = RepairRecordConvert.INSTANCE.convert( pages);
         repairRecordVoIPage.getRecords().forEach(i4 -> {
             if (Func.isNotEmpty(i4.getRepairApplyId())) {
                 Long repairApplyId = i4.getRepairApplyId();
@@ -564,6 +235,12 @@
             }
         });
         List<RepairRecordVO> records = repairRecordVoIPage.getRecords();
+        
+        records.sort(Comparator.comparing(RepairRecordVO::getRepairStartTime, Comparator.nullsFirst(Date::compareTo)).reversed());
+        records.sort(Comparator.comparing(RepairRecordVO::getUrgency, Comparator.nullsFirst(Integer::compareTo)).reversed());
+        records.sort(Comparator.comparing(RepairRecordVO::getRecordStatus, Comparator.nullsFirst(Integer::compareTo)));
+        
+        /*
         records.sort(Comparator.comparing((v0) -> {
             return v0.getRepairStartTime();
         }, Comparator.nullsFirst((v0, v1) -> {
@@ -578,7 +255,7 @@
             return v0.getRecordStatus();
         }, Comparator.nullsFirst((v0, v1) -> {
             return v0.compareTo(v1);
-        })));
+        })));*/
         repairRecordVoIPage.setRecords(records);
         return repairRecordVoIPage;
     }
@@ -594,9 +271,11 @@
     }
 
     private Long getApplyId(String applyCode) {
+    	RepairApply one = this.repairApplyService.getOne(Wrappers.<RepairApply>query().lambda().eq(RepairApply::getApplyCode, applyCode));
+    	/*
         RepairApply one = (RepairApply) this.repairApplyService.getOne((Wrapper) Wrappers.query().lambda().eq((v0) -> {
             return v0.getApplyCode();
-        }, applyCode));
+        }, applyCode));*/
         if (Func.isNotEmpty(one)) {
             return one.getId();
         }
@@ -619,19 +298,23 @@
         if (Func.isNotEmpty(recordByRecord)) {
             repairRecordDetailVo.setMaterialVOList(recordByRecord);
         } else {
-            repairRecordDetailVo.setMaterialVOList(new ArrayList());
+            repairRecordDetailVo.setMaterialVOList(new ArrayList<>());
         }
+        List<RepairRecordFile> fileList = this.repairRecordFileService.list(Wrappers.<RepairRecordFile>lambdaQuery().eq(RepairRecordFile::getRepairRecordId, id));
+        /*
         List<RepairRecordFile> fileList = this.repairRecordFileService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
             return v0.getRepairRecordId();
-        }, id));
+        }, id));*/
+        List<RepairRecordFileAddDTO> fileAddDtoList = fileList.stream().map(RepairRecordFileConvert.INSTANCE::convert).collect(Collectors.toList());
+        /*
         Stream<RepairRecordFile> stream = fileList.stream();
         RepairRecordFileConvert repairRecordFileConvert = RepairRecordFileConvert.INSTANCE;
         repairRecordFileConvert.getClass();
-        List<RepairRecordFileAddDTO> fileAddDtoList = (List) stream.map(this::convert).collect(Collectors.toList());
+        List<RepairRecordFileAddDTO> fileAddDtoList = (List) stream.map(this::convert).collect(Collectors.toList());*/
         if (Func.isNotEmpty(fileAddDtoList)) {
             repairRecordDetailVo.setRecordFileList(fileAddDtoList);
         } else {
-            repairRecordDetailVo.setRecordFileList(new ArrayList());
+            repairRecordDetailVo.setRecordFileList(new ArrayList<>());
         }
         return repairRecordDetailVo;
     }
@@ -656,6 +339,10 @@
             this.repairApplyService.updateById(repairApply);
         }
         boolean update = updateById(repairRecord);
+        List<RepairRecord> toBeConfirmedList = list(Wrappers.<RepairRecord>lambdaQuery().eq(RepairRecord::getDeviceId, repairRecord.getDeviceId()).eq(RepairRecord::getRecordStatus, Integer.valueOf(RepairRecordEnum.R1.getType())));
+        List<RepairApply> inMaintenanceList = this.repairApplyService.list(Wrappers.<RepairApply>lambdaQuery().eq(RepairApply::getDeviceId, repairRecord.getDeviceId()).eq(RepairApply::getApplyStatus, Integer.valueOf(RepairApplyStatusEnum.Y2.getType())));
+        List<RepairApply> toBeRepairedList = this.repairApplyService.list(Wrappers.<RepairApply>lambdaQuery().eq(RepairApply::getDeviceId, repairRecord.getDeviceId()).eq(RepairApply::getApplyStatus, Integer.valueOf(RepairApplyStatusEnum.Y1.getType())));
+        /*
         List<RepairRecord> toBeConfirmedList = list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
             return v0.getDeviceId();
         }, repairRecord.getDeviceId())).eq((v0) -> {
@@ -670,7 +357,7 @@
             return v0.getDeviceId();
         }, repairRecord.getDeviceId())).eq((v0) -> {
             return v0.getApplyStatus();
-        }, Integer.valueOf(RepairApplyStatusEnum.Y1.getType())));
+        }, Integer.valueOf(RepairApplyStatusEnum.Y1.getType())));*/
         this.machineService.updateMachineRepairPriority(repairRecord.getDeviceId(), toBeConfirmedList, inMaintenanceList, toBeRepairedList);
         this.machineService.renewMachineRepairTime(repairRecord.getDeviceId());
         return update;
@@ -678,11 +365,13 @@
 
     @Override // org.springblade.modules.tpm.service.IRepairRecordService
     public List<RepairRecordVO> getRecordByDeviceId(Long deviceId) {
+    	List<RepairRecord> list = list(Wrappers.<RepairRecord>query().lambda().eq(RepairRecord::getDeviceId, deviceId).orderByDesc(RepairRecord::getRepairStartTime));
+    	/*
         List<RepairRecord> list = list((Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
             return v0.getDeviceId();
         }, deviceId)).orderByDesc((v0) -> {
             return v0.getRepairStartTime();
-        }));
+        }));*/
         if (Func.isEmpty(list)) {
             throw new ServiceException(MessageUtils.message("cps.tpm.repair.record.not.exists", new Object[0]));
         }
@@ -695,6 +384,11 @@
                 i.setApplyUserName(repairApply.getApplyUserName());
             }
         });
+        
+        convert.sort(Comparator.comparing(RepairRecordVO::getRepairStartTime, Comparator.nullsFirst(Date::compareTo)).reversed());
+        convert.sort(Comparator.comparing(RepairRecordVO::getUrgency, Comparator.nullsFirst(Integer::compareTo)).reversed());
+        convert.sort(Comparator.comparing(RepairRecordVO::getRecordStatus, Comparator.nullsFirst(Integer::compareTo)));
+        /*
         convert.sort(Comparator.comparing((v0) -> {
             return v0.getRepairStartTime();
         }, Comparator.nullsFirst((v0, v1) -> {
@@ -709,7 +403,7 @@
             return v0.getRecordStatus();
         }, Comparator.nullsFirst((v0, v1) -> {
             return v0.compareTo(v1);
-        })));
+        })));*/
         return convert;
     }
 
@@ -719,48 +413,62 @@
         if (Func.isNull(repairRecord)) {
             throw new ServiceException(MessageUtils.message("cps.tpm.repair.record.not.exists", new Object[0]));
         }
+        List<RepairApplyFile> applyFileList = this.repairApplyFileService.list(Wrappers.<RepairApplyFile>query().lambda().eq(RepairApplyFile::getRepairApplyId, repairRecord.getRepairApplyId()));
+        /*
         List<RepairApplyFile> applyFileList = this.repairApplyFileService.list((Wrapper) Wrappers.query().lambda().eq((v0) -> {
             return v0.getRepairApplyId();
-        }, repairRecord.getRepairApplyId()));
+        }, repairRecord.getRepairApplyId()));*/
         ApplyRecordMaterialVO applyRecordMaterialVo = new ApplyRecordMaterialVO();
         if (Func.isNotEmpty(applyFileList)) {
+        	List<RepairApplyFileAddDTO> collect = applyFileList.stream().map(RepairApplyFileConvert.INSTANCE::convert).collect(Collectors.toList());
+        	/*
             Stream<RepairApplyFile> stream = applyFileList.stream();
             RepairApplyFileConvert repairApplyFileConvert = RepairApplyFileConvert.INSTANCE;
             repairApplyFileConvert.getClass();
-            List<RepairApplyFileAddDTO> collect = (List) stream.map(this::convert).collect(Collectors.toList());
+            List<RepairApplyFileAddDTO> collect = stream.map(this::convert).collect(Collectors.toList());
+            */
             if (Func.isNotEmpty(collect)) {
                 applyRecordMaterialVo.setRepairApplyFileAddDTOList(collect);
             }
         } else {
-            applyRecordMaterialVo.setRepairApplyFileAddDTOList(new ArrayList());
+            applyRecordMaterialVo.setRepairApplyFileAddDTOList(new ArrayList<>());
         }
+        List<RepairRecordFile> repairRecordFileList = this.repairRecordFileService.list(Wrappers.<RepairRecordFile>query().lambda().eq(RepairRecordFile::getRepairRecordId, id));
+        /*
         List<RepairRecordFile> repairRecordFileList = this.repairRecordFileService.list((Wrapper) Wrappers.query().lambda().eq((v0) -> {
             return v0.getRepairRecordId();
-        }, id));
+        }, id));*/
         if (Func.isNotEmpty(repairRecordFileList)) {
+        	List<RepairRecordFileAddDTO> collect2 = repairRecordFileList.stream().map(RepairRecordFileConvert.INSTANCE::convert).collect(Collectors.toList());
+        	/*
             Stream<RepairRecordFile> stream2 = repairRecordFileList.stream();
             RepairRecordFileConvert repairRecordFileConvert = RepairRecordFileConvert.INSTANCE;
             repairRecordFileConvert.getClass();
             List<RepairRecordFileAddDTO> collect2 = (List) stream2.map(this::convert).collect(Collectors.toList());
+            */
             if (Func.isNotEmpty(collect2)) {
                 applyRecordMaterialVo.setRepairRecordFileAddDTOList(collect2);
             }
         } else {
-            applyRecordMaterialVo.setRepairRecordFileAddDTOList(new ArrayList());
+            applyRecordMaterialVo.setRepairRecordFileAddDTOList(new ArrayList<>());
         }
+        List<DeviceMaterialRecord> deviceMaterialRecordList = this.deviceMaterialRecordService.list(Wrappers.<DeviceMaterialRecord>query().lambda().eq(DeviceMaterialRecord::getRecordId, id));
+        /*
         List<DeviceMaterialRecord> deviceMaterialRecordList = this.deviceMaterialRecordService.list((Wrapper) Wrappers.query().lambda().eq((v0) -> {
             return v0.getRecordId();
-        }, id));
+        }, id));*/
         if (Func.isNotEmpty(deviceMaterialRecordList)) {
+        	List<MaterialVO> collect3 = deviceMaterialRecordList.stream().map(MaterialRecordConvert.INSTANCE::convert).collect(Collectors.toList());
+        	/*
             Stream<DeviceMaterialRecord> stream3 = deviceMaterialRecordList.stream();
             MaterialRecordConvert materialRecordConvert = MaterialRecordConvert.INSTANCE;
             materialRecordConvert.getClass();
-            List<MaterialVO> collect3 = (List) stream3.map(this::convert).collect(Collectors.toList());
+            List<MaterialVO> collect3 = (List) stream3.map(this::convert).collect(Collectors.toList());*/
             if (Func.isNotEmpty(collect3)) {
                 applyRecordMaterialVo.setMaterialVoList(collect3);
             }
         } else {
-            applyRecordMaterialVo.setMaterialVoList(new ArrayList());
+            applyRecordMaterialVo.setMaterialVoList(new ArrayList<>());
         }
         return applyRecordMaterialVo;
     }
@@ -785,6 +493,10 @@
                     this.repairApplyService.updateById(repairApply);
                 }
             }
+            List<RepairRecord> r1List = list(Wrappers.<RepairRecord>lambdaQuery().eq(RepairRecord::getDeviceId, repairRecord.getDeviceId()).eq(RepairRecord::getRecordStatus, Integer.valueOf(RepairRecordEnum.R1.getType())));
+            List<RepairApply> y2List = this.repairApplyService.list(Wrappers.<RepairApply>query().lambda().eq(RepairApply::getDeviceId, repairRecord.getDeviceId()).eq(RepairApply::getApplyStatus, Integer.valueOf(RepairApplyStatusEnum.Y2.getType())));
+            List<RepairApply> y1List = this.repairApplyService.list(Wrappers.<RepairApply>query().lambda().eq(RepairApply::getDeviceId, repairRecord.getDeviceId()).eq(RepairApply::getApplyStatus, Integer.valueOf(RepairApplyStatusEnum.Y1.getType())));
+            /*
             List<RepairRecord> r1List = list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
                 return v0.getDeviceId();
             }, repairRecord.getDeviceId())).eq((v0) -> {
@@ -799,7 +511,7 @@
                 return v0.getDeviceId();
             }, repairRecord.getDeviceId())).eq((v0) -> {
                 return v0.getApplyStatus();
-            }, Integer.valueOf(RepairApplyStatusEnum.Y1.getType())));
+            }, Integer.valueOf(RepairApplyStatusEnum.Y1.getType())));*/
             this.machineService.updateMachineRepairPriority(repairRecord.getDeviceId(), r1List, y2List, y1List);
             return true;
         }
@@ -808,6 +520,13 @@
 
     @Override // org.springblade.modules.tpm.service.IRepairRecordService
     public List<RepairRecordVO> queryRecord(RepairRecordLookVO repairRecordLookVO) {
+    	List<RepairRecord> recordList = list(Wrappers.<RepairRecord>lambdaQuery()
+    	        .and(Func.isNotEmpty(repairRecordLookVO.getDeviceTypeId()), i -> i.eq(RepairRecord::getDeviceTypeId, repairRecordLookVO.getDeviceTypeId()))
+    	        .and(Func.isNotEmpty(repairRecordLookVO.getRecordStatus()), i -> i.eq(RepairRecord::getRecordStatus, repairRecordLookVO.getRecordStatus()))
+    	        .and(Func.isNotEmpty(repairRecordLookVO.getKeyWords()), i -> i.like(RepairRecord::getRecordCode, repairRecordLookVO.getKeyWords()).or().like(RepairRecord::getDeviceCode, repairRecordLookVO.getKeyWords()).or().like(RepairRecord::getRepairApplyId, getApplyId(repairRecordLookVO.getKeyWords())).or().like(RepairRecord::getDeviceName, repairRecordLookVO.getKeyWords()))
+    	        
+    	        .orderByDesc(RepairRecord::getRecordCode));
+    	/*
         List<RepairRecord> recordList = list((Wrapper) Wrappers.lambdaQuery().and(Func.isNotEmpty(repairRecordLookVO.getDeviceTypeId()), i -> {
             LambdaQueryWrapper lambdaQueryWrapper = (LambdaQueryWrapper) i.eq((v0) -> {
                 return v0.getDeviceTypeId();
@@ -828,18 +547,20 @@
             }, repairRecordLookVO.getKeyWords());
         }).orderByDesc((v0) -> {
             return v0.getRecordCode();
-        }));
+        }));*/
         List<RepairRecordVO> convert = RepairRecordConvert.INSTANCE.convert(recordList);
         return convert;
     }
 
     @Override // org.springblade.modules.tpm.service.IRepairRecordService
     public List<RepairRecord> getRecordByMalId(Long malId) {
+    	List<RepairRecord> repairRecordList = list(Wrappers.<RepairRecord>lambdaQuery().eq(RepairRecord::getRecordStatus, Integer.valueOf(RepairRecordEnum.R1.getType())).orderByDesc(RepairRecord::getRecordCode));
+    	/*
         List<RepairRecord> repairRecordList = list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
             return v0.getRecordStatus();
         }, Integer.valueOf(RepairRecordEnum.R1.getType()))).orderByDesc((v0) -> {
             return v0.getRecordCode();
-        }));
+        }));*/
         if (Func.isNull(repairRecordList)) {
             throw new ServiceException(MessageUtils.message("cps.tpm.repair.record.malfunction.not.exists", new Object[0]));
         }
@@ -853,13 +574,13 @@
         if (!Func.isNull(repairRecordList)) {
             List<RepairRecord> collect = null;
             if (action.equals(Integer.valueOf(ActionEnum.UPDATE_MAL.getType()))) {
-                collect = (List) repairRecordList.stream().peek(i -> {
+                collect = repairRecordList.stream().peek(i -> {
                     i.setMalfunctionId(malId);
                     i.setMalfunctionName(malName);
                     i.setMalfunctionCode(malCode);
                 }).collect(Collectors.toList());
             } else if (action.equals(Integer.valueOf(ActionEnum.DELETE_MAL.getType()))) {
-                collect = (List) repairRecordList.stream().peek(i2 -> {
+                collect = repairRecordList.stream().peek(i2 -> {
                     i2.setMalfunctionId(null);
                     i2.setMalfunctionName(null);
                     i2.setMalfunctionCode(null);
@@ -906,7 +627,7 @@
             });
             return repairRecordExcelVos;
         }
-        return new ArrayList();
+        return new ArrayList<>();
     }
 
     @Override // org.springblade.modules.tpm.service.IRepairRecordService
@@ -916,14 +637,16 @@
         if (Func.isNotEmpty(repairTodayRecordPages)) {
             return page.setRecords(repairTodayRecordPages);
         }
-        return page.setRecords(new ArrayList());
+        return page.setRecords(new ArrayList<>());
     }
 
     @Override // org.springblade.modules.tpm.service.IRepairRecordService
     public Long countRecord() {
+    	Long count = Long.valueOf(count(Wrappers.<RepairRecord>lambdaQuery().eq(RepairRecord::getRecordStatus, Integer.valueOf(RepairRecordEnum.R1.getType()))));
+    	/*
         Long count = Long.valueOf(count((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
             return v0.getRecordStatus();
-        }, Integer.valueOf(RepairRecordEnum.R1.getType()))));
+        }, Integer.valueOf(RepairRecordEnum.R1.getType()))));*/
         return (Long) Optional.of(count).orElse(0L);
     }
 
@@ -944,11 +667,13 @@
     }
 
     private boolean checkRecordConfirm(List<Long> ids) {
+    	List<RepairRecord> list = list(Wrappers.<RepairRecord>lambdaQuery().ne(RepairRecord::getRecordStatus, Integer.valueOf(RepairRecordEnum.R2.getType())).in(RepairRecord::getId, ids));
+    	/*
         List<RepairRecord> list = list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().ne((v0) -> {
             return v0.getRecordStatus();
         }, Integer.valueOf(RepairRecordEnum.R2.getType()))).in((v0) -> {
             return v0.getId();
-        }, ids));
+        }, ids));*/
         return Func.isNull(list);
     }
 
@@ -958,18 +683,22 @@
     }
 
     private boolean checkApplyCode(Long id) {
+    	RepairRecord repairRecord = this.baseMapper.selectOne(Wrappers.<RepairRecord>query().lambda().eq(RepairRecord::getRepairApplyId, id));
+    	/*
         RepairRecord repairRecord = (RepairRecord) this.baseMapper.selectOne((Wrapper) Wrappers.query().lambda().eq((v0) -> {
             return v0.getRepairApplyId();
-        }, id));
+        }, id));*/
         return Func.isNull(repairRecord);
     }
 
     private boolean checkRecordCode(String recordCode) {
+    	RepairRecord repairRecord = this.baseMapper.selectOne(Wrappers.<RepairRecord>query().lambda().eq(Func.isNotEmpty(AuthUtil.getTenantId()), RepairRecord::getTenantId, AuthUtil.getTenantId()).eq(RepairRecord::getRecordCode, recordCode));
+    	/*
         RepairRecord repairRecord = (RepairRecord) this.baseMapper.selectOne((Wrapper) Wrappers.query().lambda().eq(Func.isNotEmpty(AuthUtil.getTenantId()), (v0) -> {
             return v0.getTenantId();
         }, AuthUtil.getTenantId()).eq((v0) -> {
             return v0.getRecordCode();
-        }, recordCode));
+        }, recordCode));*/
         return repairRecord != null;
     }
 

--
Gitblit v1.9.3