From 5041e1691397344f4bd8d79b34c74df512b69881 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期五, 29 十一月 2024 12:57:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
index 060e8cf..6227d4e 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -1,5 +1,6 @@
package com.ycl.service.impl;
+
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -156,13 +157,14 @@
query.setProjectEndTime(DateUtils.getDayEnd(query.getProjectEndTime()));
}
String projectCategory = query.getProjectCategory();
+ //瀹炴柦闃舵鏈変袱涓�兼斁鍦╯ql澶勭悊
if (ProjectCategoryEnum.RESERVE.getType().equals(projectCategory)) {
query.setProjectStatus(ProjectCategoryEnum.RESERVE.getStatus());
query.setReserveOrPrevious(ProjectCategoryEnum.RESERVE.getCode());
} else if (ProjectCategoryEnum.PREVIOUS.getType().equals(projectCategory)) {
query.setProjectStatus(ProjectCategoryEnum.PREVIOUS.getStatus());
query.setReserveOrPrevious(ProjectCategoryEnum.PREVIOUS.getCode());
- } else if (ProjectCategoryEnum.FINISH.getType().equals(projectCategory)) {
+ } else if (ProjectCategoryEnum.FINISH.getType().equals(projectCategory)) {
query.setProjectStatus(ProjectCategoryEnum.FINISH.getStatus());
} else if (ProjectCategoryEnum.EXCEPTION.getType().equals(projectCategory)) {
//TODO
--
Gitblit v1.8.0