From 4674ab150f7fad2d2db84bf197a938f5cff358f3 Mon Sep 17 00:00:00 2001
From: hxh <hxh@datametatech.com>
Date: Tue, 11 Mar 2025 21:44:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=BB=E6=8A=A4=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=90=8E=E5=8F=AF=E4=BB=A5=E7=9B=B4=E6=8E=A5=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kms/yxgh/common/enums/DfYhV2StatusEnum.java  |  9 +++++++++
 .../com/kms/yxgh/df/service/DfYhV2Service.java   | 16 +++++-----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/enums/DfYhV2StatusEnum.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/DfYhV2StatusEnum.java
index 85a54655..4cfe6dbf 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/common/enums/DfYhV2StatusEnum.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/DfYhV2StatusEnum.java
@@ -21,4 +21,13 @@ public enum DfYhV2StatusEnum {
         this.name = name;
         this.value = value;
     }
+
+    public static DfYhV2StatusEnum getDfYhV2StatusEnum(String value) {
+        for (DfYhV2StatusEnum statusEnum : DfYhV2StatusEnum.values()) {
+            if (statusEnum.getValue().equals(value)) {
+                return statusEnum;
+            }
+        }
+        return null;
+    }
 }
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java
index d38af6a4..cbc80c92 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java
@@ -17,7 +17,10 @@ import com.kms.yxgh.common.enums.DfYhV2StatusEnum;
 import com.kms.yxgh.common.service.ApprovalService;
 import com.kms.yxgh.common.service.DefaultApprovalBusinessService;
 import com.kms.yxgh.df.domain.DfYhV2;
-import com.kms.yxgh.df.dto.v2.*;
+import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto;
+import com.kms.yxgh.df.dto.v2.DfYhApproveDto;
+import com.kms.yxgh.df.dto.v2.DfYhDetailV2Dto;
+import com.kms.yxgh.df.dto.v2.DfYhListV2Dto;
 import com.kms.yxgh.df.mapper.DfYhV2Mapper;
 import com.shuili.common.core.domain.SearchParam;
 import com.shuili.common.utils.BeanUtils;
@@ -70,11 +73,9 @@ public class DfYhV2Service extends DefaultApprovalBusinessService<DfYhV2Mapper,
                     .ifPresent(status -> queryWrapper.like(DfYhV2::getStatus, status));
 
             Optional.ofNullable(data.getStartDate())
-                    .filter(startDate -> startDate != null)
                     .ifPresent(startDate -> queryWrapper.ge(DfYhV2::getStartDate, startDate));
 
             Optional.ofNullable(data.getEndDate())
-                    .filter(endDate -> endDate != null)
                     .ifPresent(endDate -> queryWrapper.ge(DfYhV2::getEndDate, endDate));
 
             Optional.ofNullable(data.getProblemLevel())
@@ -183,14 +184,7 @@ public class DfYhV2Service extends DefaultApprovalBusinessService<DfYhV2Mapper,
 
     @Override
     public String formStatus(String formId) {
-        Wrapper<DfYhV2> wp = Wrappers.<DfYhV2>lambdaQuery()
-                .eq(DfYhV2::getId, formId)
-                .select(DfYhV2::getStatus);
-        List<DfYhV2> list = this.list(wp);
-        if (list != null && !list.isEmpty()) {
-            return list.get(0).getStatus();
-        }
-        return "";
+        return ApprovalStatusEnum.WAITING.getValue();
     }
 }