From 75339563cebc86759a1e8addab9ab5382b4fd1a1 Mon Sep 17 00:00:00 2001
From: 354798ggg <1074825718@qq.com>
Date: 星期五, 01 十二月 2023 10:34:57 +0800
Subject: [PATCH] 入库统计报表

---
 product-server-project-management/src/main/java/com/product/project/management/service/ProjectBudgetService.java |   19 +++++++------------
 1 files changed, 7 insertions(+), 12 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 ee6305f..12fd31d 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
@@ -1,6 +1,5 @@
 package com.product.project.management.service;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -33,8 +32,6 @@
 	 * @param headerDataList excel鏍囬鏁版嵁
 	 */
 	public DataTableEntity importBudget2(DataTableEntity dtParseData, List<List<String>> headerDataList) {
-		try {
-			
 		
 		//鍒ゆ柇鏄惁鏈夎В鏋怑XCEL鏁版嵁
 		if (BaseUtil.dataTableIsEmpty(dtParseData)) {
@@ -85,9 +82,6 @@
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
-		}
-		} catch (Exception e) {
-			e.printStackTrace();
 		}
 		return dtParseData;
 	}
@@ -191,20 +185,21 @@
 	 * @return
 	 */
 	public boolean clearBudget(String projectUUID, String itemizeCode) {
+		//鏌ヨ瀵瑰簲椤圭洰瀵瑰簲鍒嗛」鐨勫嚭搴撴暟鎹�
 		DataTableEntity dtOutbound;
 		if(BaseUtil.strIsNull(itemizeCode)) {
 			dtOutbound = baseDao.listTable(Cmnconst.PRODUCT_PROJECT_OUTBOUND, "project_uuid=?", new Object[] {projectUUID});
 		}else {
 			dtOutbound = baseDao.listTable(Cmnconst.PRODUCT_PROJECT_OUTBOUND, "project_uuid=? AND project_itemize IN (SELECT uuid FROM product_project_item WHERE project_uuid=? AND itemize_code LIKE ?)", new Object[] {projectUUID,projectUUID,itemizeCode+"%"});
 		}
+		//鍒ゅ畾鍑哄簱鏁版嵁鏄惁瀛樺湪
 		if (!BaseUtil.dataTableIsEmpty(dtOutbound)) {
 			throw new BaseException(SystemCode.PROJeCT_BUDGET_CLEAR_FAIL_HAS_OUTBOUND.getValue(), SystemCode.PROJeCT_BUDGET_CLEAR_FAIL_HAS_OUTBOUND.getText());
 		}
-		return false;
-//		if (BaseUtil.strIsNull(itemizeCode)) {
-//			return baseDao.executeUpdate("DELETE FROM product_project_budget WHERE project_itemize_uuid IN (SELECT uuid FROM product_project_item WHERE project_uuid=?)", new Object[] {projectUUID});
-//		}else {
-//			return baseDao.executeUpdate("DELETE FROM product_project_budget WHERE project_itemize_uuid IN (SELECT uuid FROM product_project_item WHERE project_uuid=? AND itemize_code LIKE ?)", new Object[] {projectUUID,itemizeCode+"%"});
-//		}
+		if (BaseUtil.strIsNull(itemizeCode)) {
+			return baseDao.executeUpdate("DELETE FROM product_project_budget WHERE project_itemize_uuid IN (SELECT uuid FROM product_project_item WHERE project_uuid=?)", new Object[] {projectUUID});
+		}else {
+			return baseDao.executeUpdate("DELETE FROM product_project_budget WHERE project_itemize_uuid IN (SELECT uuid FROM product_project_item WHERE project_uuid=? AND itemize_code LIKE ?)", new Object[] {projectUUID,itemizeCode+"%"});
+		}
 	}
 }

--
Gitblit v1.9.2