From 45721a3d84618f3ed5fc14d9afd35c16186986cf Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Thu, 31 Oct 2024 14:06:26 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E6=94=B6=E5=85=A5=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E8=A1=A8:=201:=E4=BA=A7=E5=93=81=E5=A4=A7=E7=B1=BB=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=AD=97=E7=AC=A6=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/backend/ProjectController.java | 43 +++++++++++--------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
index 8a6c589..be0e6ea 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
@@ -9,6 +9,7 @@ import cn.palmte.work.utils.excel.ExcelLogs;
 import cn.palmte.work.utils.excel.ExcelUtil;
 import cn.palmte.work.utils.excel.ExportExcelUtils;
 import cn.palmte.work.utils.excel.ExportUtils;
+import com.alibaba.druid.util.StringUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -18,6 +19,7 @@ import org.activiti.engine.task.Task;
 import org.apache.poi.EncryptedDocumentException;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.poifs.filesystem.OfficeXmlFileException;
+import org.apache.poi.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -549,27 +551,32 @@ public class ProjectController extends BaseController {
         List<ProjectBudgetCostProjectManageDetailTemp> detailList = new ArrayList<>(details.size());
         for (int i = 0; i < details.size(); i++) {
             ProjectBudgetCostProjectManageDetailTemp detail = details.getObject(i, ProjectBudgetCostProjectManageDetailTemp.class);
-            if(detail.getType() == 3 || "3".equals(detail.getName1()) || "8".equals(detail.getName1())) {
-                detail.setName(detail.getName2());
+            if (!StringUtils.isEmpty(detail.getName()) && detail.getName().length()>1){
                 detail.setIsDiy(1);
-            } else {
-                if ("1".equals(detail.getName1())) {
-                    detail.setName("人工费");
-                } else if ("2".equals(detail.getName1())) {
-                    detail.setName("总部支撑人力费用");
-                } else if ("4".equals(detail.getName1())) {
-                    detail.setName("人员差旅费");
-                } else if ("5".equals(detail.getName1())) {
-                    detail.setName("业务费用");
-                } else if ("6".equals(detail.getName1())) {
-                    detail.setName("商务及专项验收费用");
-                } else if ("7".equals(detail.getName1())) {
-                    detail.setName("办公费用");
-                } else if ("9".equals(detail.getName1())) {
-                    detail.setName("保证金");
-                }
+            }else{
                 detail.setIsDiy(0);
             }
+            // if(detail.getType() == 3 || "3".equals(detail.getName1()) || "8".equals(detail.getName1())) {
+            //     // detail.setName(detail.getName2());
+            //     detail.setIsDiy(1);
+            // } else {
+            //     if ("1".equals(detail.getName1())) {
+            //         detail.setName("人工费");
+            //     } else if ("2".equals(detail.getName1())) {
+            //         detail.setName("总部支撑人力费用");
+            //     } else if ("4".equals(detail.getName1())) {
+            //         detail.setName("人员差旅费");
+            //     } else if ("5".equals(detail.getName1())) {
+            //         detail.setName("业务费用");
+            //     } else if ("6".equals(detail.getName1())) {
+            //         detail.setName("商务及专项验收费用");
+            //     } else if ("7".equals(detail.getName1())) {
+            //         detail.setName("办公费用");
+            //     } else if ("9".equals(detail.getName1())) {
+            //         detail.setName("保证金");
+            //     }
+            //     detail.setIsDiy(0);
+            // }
             detailList.add(detail);
         }