From 257ab33f3c19325d07d08240404e34fd34c21bbe Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 25 二月 2025 03:04:26 +0800
Subject: [PATCH] 分页bug、多选修改不选时未清除数据库bug
---
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 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 a7fb97f..4f24ca5 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -323,6 +323,9 @@
if (query.getProjectEndTime() != null) {
query.setProjectEndTime(DateUtils.getDayEnd(query.getProjectEndTime()));
}
+ if (YesOrNo.YES.getCode().equals(query.getCenter())) {
+ query.setProjectPhase("6");
+ }
// 寮傚父椤圭洰鏆傛椂杩斿洖绌�
if (YesOrNo.YES.getCode().equals(query.getExe())) {
return Result.ok().data(new ArrayList<>()).total(0);
@@ -464,15 +467,22 @@
finish.add(item);
}
- if (ImportanceTypeEnum.PROVINCIAL_KEY.getType().equals(item.getImportanceType())) {
- province.add(item);
- } else if (ImportanceTypeEnum.SUINING_KEY.getType().equals(item.getImportanceType())) {
- city.add(item);
- } else if (ImportanceTypeEnum.SHEHONG_KEY.getType().equals(item.getImportanceType())) {
- county.add(item);
- } else // if (ImportanceTypeEnum.NORMAL.getType().equals(item.getImportanceType()))
- {
+ if (StringUtils.isBlank(item.getImportanceType())) {
normal.add(item);
+ // 浣跨敤contains锛屽洜涓洪噸鐐瑰垎绫诲彲澶氶�夛紝浣跨敤,鍒嗗壊瀛樺偍鐨�
+ } else {
+ if (item.getImportanceType().contains(ImportanceTypeEnum.PROVINCIAL_KEY.getType())) {
+ province.add(item);
+ }
+ if (item.getImportanceType().contains(ImportanceTypeEnum.SUINING_KEY.getType())) {
+ city.add(item);
+ }
+ if (item.getImportanceType().contains(ImportanceTypeEnum.SHEHONG_KEY.getType())) {
+ county.add(item);
+ }
+ if (item.getImportanceType().contains(ImportanceTypeEnum.NORMAL.getType())) {
+ normal.add(item);
+ }
}
});
//鍗曚綅鍏堥粯璁や负鍏�
--
Gitblit v1.8.0