From 8b23e9e8aee1e533dac755efe572b657583c46d6 Mon Sep 17 00:00:00 2001
From: 354798ggg <1074825718@qq.com>
Date: 星期四, 13 七月 2023 10:22:33 +0800
Subject: [PATCH] 项目数据统计分析调整
---
product-server-project-management/src/main/java/com/product/project/management/service/ProjectBudgetService.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/product-server-project-management/src/main/java/com/product/project/management/service/ProjectBudgetService.java b/product-server-project-management/src/main/java/com/product/project/management/service/ProjectBudgetService.java
index 3bc336b..535162e 100644
--- a/product-server-project-management/src/main/java/com/product/project/management/service/ProjectBudgetService.java
+++ b/product-server-project-management/src/main/java/com/product/project/management/service/ProjectBudgetService.java
@@ -41,17 +41,35 @@
List<Object> params = new ArrayList<>();
String projectItem = autoCreateFilter(params, fseParseData);
+ //鏍规嵁妯℃澘椤圭洰鍒嗛」鏌ヨ鏁版嵁搴撻」鐩垎椤�
FieldSetEntity fseProjectItem = baseDao.getFieldSetEntityByFilter(Cmnconst.PRODUCT_PROJECT_ITEM, "project_uuid IN (SELECT uuid FROM product_project_qxlw WHERE project_name=?) AND itemize_full_name=?", params.toArray(), false);
if(fseProjectItem==null) {
sbError.append(String.format("绗� %s 琛岄」鐩垎椤� '%s' 涓嶅瓨鍦ㄤ簬绯荤粺涓��", fseParseData.getString("~row~"), projectItem));
continue;
}
+ //璁剧疆鍏宠仈椤圭洰鍒嗛」
fseParseData.setValue("project_itemize_uuid", fseProjectItem.getUUID());
+
+ //鑾峰彇缂栫爜鐢熸垚鏉愭枡绫诲瀷
+ String budgetCode = fseParseData.getString(Cmnconst.BUDGET_CODE);
+ Integer materialType = 0;
+ if("鏋剁珛绛�".equals(budgetCode)) {
+ materialType = 1;
+ }else if("澹版祴绠�".equals(budgetCode)) {
+ materialType = 2;
+ }else {
+ //缃戠墖
+ FieldSetEntity materialInfo = baseDao.getFieldSetEntityByFilter(Cmnconst.PRODUCT_PROJECT_BASE_MATERIAL, "material_type=3 AND material_name like ?", new Object[] {fseParseData.getString(Cmnconst.MATERIAL_CODE)+"%"}, false);
+ if (materialInfo!=null) {
+ materialType = 3;
+ }
+ }
+ fseParseData.setValue(Cmnconst.MATERIAL_TYPE, materialType);
}
+ //鍒ゆ柇鏄惁鍖呭惈閿欒淇℃伅
if (!BaseUtil.strIsNull(sbError.toString())) {
throw new BaseException(SystemCode.PROJECT_BUDGET_IMPORT_FAIL.getValue(), sbError.toString());
}
-// baseDao.add(dtParseData);
return dtParseData;
}
--
Gitblit v1.9.2