From 4894ff5d3dded33b4d50c5cba7c3659f340ae9a7 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 24 二月 2025 23:06:48 +0800
Subject: [PATCH] 下面阶段查询bug
---
business/src/main/resources/mapper/ProjectInfoMapper.xml | 4 ++--
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 4 ++--
2 files changed, 4 insertions(+), 4 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 677b8b7..eccefb1 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -818,7 +818,7 @@
entity.setCreateBy(userId);
entity.setUpdateBy(userId);
//濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
- if ("0".equals(entity.getProjectPhase())) {
+ if (ProjectCategoryEnum.RESERVE.getType().equals(entity.getProjectPhase())) {
entity.setUsedStatus(ProjectConstant.PASS);
}
// 绠＄悊鍛樹慨鏀圭殑鐩存帴閫氳繃
@@ -863,7 +863,7 @@
Long userId = SecurityUtils.getUserId();
entity.setUpdateBy(userId);
//濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
- if (ProjectConstant.COMMIT.equals(entity.getUsedStatus()) && ProjectStatusEnum.PENDDING.getType().equals(entity.getProjectStatus())) {
+ if (ProjectCategoryEnum.RESERVE.getType().equals(entity.getProjectPhase())) {
entity.setUsedStatus(ProjectConstant.PASS);
}
// 绠＄悊鍛樹慨鏀圭殑鐩存帴閫氳繃
diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml
index 6140854..5694ac9 100644
--- a/business/src/main/resources/mapper/ProjectInfoMapper.xml
+++ b/business/src/main/resources/mapper/ProjectInfoMapper.xml
@@ -135,7 +135,7 @@
<if test="query.projectPhase !=null and query.projectPhase!='' and query.projectPhase!=6 and query.projectPhase!=5">
and TPI.project_phase = #{query.projectPhase}
</if>
- <if test="query.projectPhase != 6 and query.projectPhase != 5 ">
+ <if test="query.projectPhase != null and query.projectPhase != 5 ">
and TPI.used_status = 2
</if>
<if test="query.fundType !=null and query.fundType!=''">
@@ -159,7 +159,7 @@
<if test="query.projectPhase == 3">
and (TPI.project_status = 'working' or TPI.project_status = 'stop')
</if>
- <if test="query.projectPhase == 6">
+ <if test="query.projectPhase == null">
<if test="query.role != null and query.role == 1">
and TPI.used_status = 1 and FIND_IN_SET(#{query.competentDepartment}, TPI.competent_department) > 0
</if>
--
Gitblit v1.8.0