From 0c0f1fb68b93095c43d4b714f03fd156c3578dfb Mon Sep 17 00:00:00 2001
From: 2369059705@qq.com <2369059705@qq.com>
Date: 星期三, 28 六月 2023 16:56:43 +0800
Subject: [PATCH] 项目预警
---
product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 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 ef04c1d..e414305 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
@@ -6,6 +6,7 @@
import java.util.Map;
import com.alibaba.fastjson.JSONArray;
+import com.product.core.websocket.config.CmnConst;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -198,18 +199,33 @@
return dtItemizeBudget;
}
+ /**
+ * 鏇村叿椤圭洰鍒嗛」uuid鑾峰彇椤圭洰鍒嗛」涓嬬殑鏉愭枡
+ * @param uuid
+ * @param capge
+ * @param pageSize
+ * @return
+ */
+ public DataTableEntity listMaterialV(String uuid, Integer capge, Integer pageSize) {
+ return baseDao.listTable("product_project_base_material_v","project_itemize_uuid=?",new String[]{uuid},null,null,pageSize, capge);
+ }
+
+ /**
+ * 鏍规嵁椤圭洰uuid鑾峰彇椤圭洰鍒嗛」鏍戠粨鏋�
+ * @param uuid
+ * @return
+ */
+
public JSONArray getTreeProjectItem(String uuid) {
- FieldSetEntity fseProject = baseDao.getFieldSetEntity(Cmnconst.PRODUCT_PROJECT_QXLW, uuid, true);
- DataTableEntity newDtProjectItem = BaseUtil.dataTableToTreeTable(fseProject.getSubDataTable(Cmnconst.PRODUCT_PROJECT_ITEM), Cmnconst.ITEMIZE_CODE, Cmnconst.ITEMIZE_PARENT_CODE, null);
+ DataTableEntity dtProjectItemize = baseDao.listTable(Cmnconst.PRODUCT_PROJECT_ITEM, "project_uuid=?", new Object[]{uuid}, new Object[]{CoreConst.UUID, Cmnconst.ITEMIZE, Cmnconst.ITEMIZE_CODE, Cmnconst.ITEMIZE_PARENT_CODE});
+ DataTableEntity newDtProjectItem = BaseUtil.dataTableToTreeTable(dtProjectItemize, Cmnconst.ITEMIZE_CODE, Cmnconst.ITEMIZE_PARENT_CODE, null);
JSONArray objects = BaseUtil.dataTableEntityToJson(newDtProjectItem);
JSONObject json = new JSONObject();
- json.put("itemize", "椤圭洰鍒嗛儴鍒嗛」");
- json.put("children", objects);
- json.put("type", 1);
-
+ json.set("itemize", "椤圭洰鍒嗛儴鍒嗛」");
+ json.set("children", objects);
+ json.set("type", 1);
JSONArray array = new JSONArray();
array.add(json);
-
return array;
}
}
--
Gitblit v1.9.2