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().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().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);