fix: 养护提交后可以直接审批

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;
+    }
 }

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();
     }
 }