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/MaintainRecordServiceImpl.java | 503 +++++++++++--------------------------------------------
1 files changed, 106 insertions(+), 397 deletions(-)
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;
}
--
Gitblit v1.9.3