From d4975504453fa566d82b24a9b96972b0faf99370 Mon Sep 17 00:00:00 2001 From: 354798ggg <1074825718@qq.com> Date: 星期日, 06 八月 2023 21:26:27 +0800 Subject: [PATCH] 预算材料分类调整 --- product-server-project-management/src/main/java/com/product/project/management/config/Cmnconst.java | 1 + product-server-project-management/src/main/java/com/product/project/management/service/ProjectStatisticAnalysisService.java | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/product-server-project-management/src/main/java/com/product/project/management/config/Cmnconst.java b/product-server-project-management/src/main/java/com/product/project/management/config/Cmnconst.java index e2c03df..f563d28 100644 --- a/product-server-project-management/src/main/java/com/product/project/management/config/Cmnconst.java +++ b/product-server-project-management/src/main/java/com/product/project/management/config/Cmnconst.java @@ -9,6 +9,7 @@ public static final String PRODUCT_PROJECT_ITEM="product_project_item"; //椤圭洰鍒嗛」 public static final String PRODUCT_PROJECT_BUDGET="product_project_budget"; //棰勭畻 public static final String PRODUCT_PROJECT_BASE_MATERIAL="product_project_base_material"; //鍩虹鏉愭枡 + public static final String PRODUCT_PROJECT_BASE_MATERIAL_TYPE="product_project_base_material_type"; public static final String PRODUCT_PROJECT_OUTBOUND="product_project_outbound"; //鍑哄簱淇℃伅涓昏〃 //瀛楁鍚� diff --git a/product-server-project-management/src/main/java/com/product/project/management/service/ProjectStatisticAnalysisService.java b/product-server-project-management/src/main/java/com/product/project/management/service/ProjectStatisticAnalysisService.java index 6e38828..3edb86c 100644 --- a/product-server-project-management/src/main/java/com/product/project/management/service/ProjectStatisticAnalysisService.java +++ b/product-server-project-management/src/main/java/com/product/project/management/service/ProjectStatisticAnalysisService.java @@ -223,8 +223,7 @@ * @return */ public List<List<String>> getReportMaterialType() { - - DataTableEntity dtMaterialType = baseDao.listTable("product_sys_dict", "dict_name = ?", new Object[] {Cmnconst.MATERIAL_TYPE}, new Object[] {"dict_value","dict_label"}); + DataTableEntity dtMaterialType = baseDao.listTable(Cmnconst.PRODUCT_PROJECT_BASE_MATERIAL_TYPE, null, new Object[] {}, new Object[] {"material_type_name","material_type_value"}); if (!BaseUtil.dataTableIsEmpty(dtMaterialType)) { List<List<String>> returnList = new ArrayList<>(); @@ -234,8 +233,8 @@ List<String> listNotShowMaterialCodeName = new ArrayList<>(); for (int i = 0; i < dtMaterialType.getRows(); i++) { - String dictValue = dtMaterialType.getFieldSetEntity(i).getString("dict_value"); - String dictLabel = dtMaterialType.getFieldSetEntity(i).getString("dict_label"); + String dictValue = dtMaterialType.getFieldSetEntity(i).getString("material_type_value"); + String dictLabel = dtMaterialType.getFieldSetEntity(i).getString("material_type_name"); if ("0".equals(dictValue)) { listSummary.add(dictValue); listShowMaterialCode.add(dictValue); -- Gitblit v1.9.2