From e0556b5d2389bd9bfc96316b2ddc1e92b1b2dc11 Mon Sep 17 00:00:00 2001
From: 2369059705@qq.com <2369059705@qq.com>
Date: 星期二, 01 八月 2023 17:28:14 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/project/qxlw
---
product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java | 33 ++++++++++-----------------------
1 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java b/product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java
index bc24ed8..21dd0f8 100644
--- a/product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java
+++ b/product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java
@@ -1,8 +1,5 @@
package com.product.project.management.service;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import com.alibaba.fastjson.JSONArray;
@@ -97,30 +94,20 @@
/**
* 鑾峰彇鍒嗛」棰勭畻淇℃伅
*
- * @param projectUUID 椤圭洰UUID
- * @param itemizeCode 鍒嗛」缂栫爜
+ * @param itemizeUUID 鍒嗛」UUID
* @param capge 褰撳墠椤�
* @param pageSize 椤靛ぇ灏�
* @return
*/
- public DataTableEntity listItemizeBudget(String projectUUID, String itemizeCode, Integer capge, Integer pageSize) {
-
-
- String filter;
- List<String> params = new ArrayList<>();
- if (BaseUtil.strIsNull(itemizeCode)) {
- filter = "project_itemize_uuid IN (SELECT uuid FROM product_project_item WHERE project_uuid=?)";
- params.add(projectUUID);
- } else {
- filter = "project_itemize_uuid IN (SELECT uuid FROM product_project_item WHERE project_uuid=? AND itemize_code like ?)";
- params.add(projectUUID);
- params.add(itemizeCode + "%");
- }
- DataTableEntity dtItemizeBudget = baseDao.listTable(Cmnconst.PRODUCT_PROJECT_BUDGET, filter, params.toArray(), null, null, pageSize, capge);
- if (!BaseUtil.dataTableIsEmpty(dtItemizeBudget)) {
- baseDao.loadPromptData(dtItemizeBudget);
- }
- return dtItemizeBudget;
+ public DataTableEntity listItemizeBudget(String itemizeUUID, Integer capge, Integer pageSize) {
+ if (!BaseUtil.strIsNull(itemizeUUID)) {
+ DataTableEntity dtItemizeBudget = baseDao.listTable(Cmnconst.PRODUCT_PROJECT_BUDGET, "project_itemize_uuid = ?", new Object[] {itemizeUUID}, null, null, pageSize, capge);
+ if (!BaseUtil.dataTableIsEmpty(dtItemizeBudget)) {
+ baseDao.loadPromptData(dtItemizeBudget);
+ }
+ return dtItemizeBudget;
+ }
+ return null;
}
/**
--
Gitblit v1.9.2