From 9c666e02966e623d2d648a77d598b61c1329d77b Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 14 Oct 2024 22:08:41 +0800
Subject: [PATCH] =?UTF-8?q?2024-10-13=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectToolingApplyServiceImpl.java   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/spring/modules/Tooling/service/impl/ProjectToolingApplyServiceImpl.java b/src/main/java/com/spring/modules/Tooling/service/impl/ProjectToolingApplyServiceImpl.java
index 12b155e2..f48a0454 100644
--- a/src/main/java/com/spring/modules/Tooling/service/impl/ProjectToolingApplyServiceImpl.java
+++ b/src/main/java/com/spring/modules/Tooling/service/impl/ProjectToolingApplyServiceImpl.java
@@ -214,8 +214,8 @@ public class ProjectToolingApplyServiceImpl implements ProjectToolingApplyServic
             // 获取指定属性值
             if ("plm_project_tool_applyHeader".equals(nodeDetail.getPlmTable())) { // 主信息字段
                 String fieldValue = "";
-                fieldValue = (String) getPropertyValue(toolApplyHeaderData, nodeDetail.getPlmField());
                 if ("A".equals(nodeDetail.getFieldType())) { // 判断是否为人员
+                    fieldValue = (String) getPropertyValue(toolApplyHeaderData, nodeDetail.getPlmField());
                     // 判断是否有值
                     if (StringUtils.hasText(fieldValue)) {
                         String account = sysUserDao.selectOne(new QueryWrapper<SysUserEntity>().eq("username", fieldValue)).getDomainControlAccount();
@@ -226,7 +226,12 @@ public class ProjectToolingApplyServiceImpl implements ProjectToolingApplyServic
                         }
                         md.setFieldValue(oaIds.get(0).getId());
                     }
+                } else if ("C".equals(nodeDetail.getFieldType())) { // 判断是否为金额
+                    BigDecimal v = (BigDecimal) getPropertyValue(toolApplyHeaderData, nodeDetail.getPlmField());
+                    fieldValue = v == null ? "" : v.toString();
+                    md.setFieldValue(fieldValue);
                 } else {
+                    fieldValue = (String) getPropertyValue(toolApplyHeaderData, nodeDetail.getPlmField());
                     md.setFieldValue(fieldValue);
                 }
             }
@@ -329,8 +334,8 @@ public class ProjectToolingApplyServiceImpl implements ProjectToolingApplyServic
                 // 获取指定属性值
                 if ("plm_project_tool_applyHeader".equals(nodeDetail.getPlmTable())) { // 主信息字段
                     String fieldValue = "";
-                    fieldValue = (String) getPropertyValue(changeRequest, nodeDetail.getPlmField());
                     if ("A".equals(nodeDetail.getFieldType())) { // 判断是否为人员
+                        fieldValue = (String) getPropertyValue(changeRequest, nodeDetail.getPlmField());
                         // 判断是否有值
                         if (StringUtils.hasText(fieldValue)) {
                             String account = sysUserDao.selectOne(new LambdaQueryWrapper<SysUserEntity>().eq(SysUserEntity::getUsername, fieldValue)).getDomainControlAccount();
@@ -346,6 +351,7 @@ public class ProjectToolingApplyServiceImpl implements ProjectToolingApplyServic
                         fieldValue = v == null ? "" : v.toString();
                         md.setFieldValue(fieldValue);
                     } else {
+                        fieldValue = (String) getPropertyValue(changeRequest, nodeDetail.getPlmField());
                         md.setFieldValue(fieldValue);
                     }
                     mainData.add(md);