From 484c95944d569ca78e568b75be7ab573a0786f45 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Mon, 14 Oct 2024 18:17:41 +0800 Subject: [PATCH 1/4] 1127 --- .../data/PlmProjectToolApplyHeaderData.java | 5 ++++ .../PlmTechnicalSpecificationSheetData.java | 20 ++++++++++++++++ .../Tooling/ProjectToolingApplyMapper.xml | 24 ++++++++++++------- .../TechnicalSpecificationMapper.xml | 8 ++++++- 4 files changed, 47 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java b/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java index ca971bfd..7bda7b33 100644 --- a/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java +++ b/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java @@ -30,4 +30,9 @@ public class PlmProjectToolApplyHeaderData extends PlmProjectToolApplyHeader { private String tpName; private String purchaserName; + private String isReject; + private String nodeId; + private String nodeName; + + } diff --git a/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java b/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java index cf17f31d..2dad8b9b 100644 --- a/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java +++ b/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java @@ -59,6 +59,10 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio */ private String rejectOpinion; + + private String nodeId; + private String nodeName; + public String getRejectOpinion() { return rejectOpinion; } @@ -397,4 +401,20 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio public void setFinalCustomerId(String finalCustomerId) { this.finalCustomerId = finalCustomerId; } + + public String getNodeId() { + return nodeId; + } + + public void setNodeId(String nodeId) { + this.nodeId = nodeId; + } + + public String getNodeName() { + return nodeName; + } + + public void setNodeName(String nodeName) { + this.nodeName = nodeName; + } } diff --git a/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml b/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml index 8dfb43c1..f3bfd8b1 100644 --- a/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml +++ b/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml @@ -78,24 +78,30 @@ diff --git a/src/main/resources/mapper/change/ChangeManagementMapper.xml b/src/main/resources/mapper/change/ChangeManagementMapper.xml index 145a8511..a54abe9e 100644 --- a/src/main/resources/mapper/change/ChangeManagementMapper.xml +++ b/src/main/resources/mapper/change/ChangeManagementMapper.xml @@ -813,7 +813,8 @@ field_desc, workflow_id, plm_table, - field_type + field_type, + FROM plm_request_node_detail WHERE site = #{site} and workflow_id = #{workflowId} and node_id = #{nodeId} and classification_no = #{classificationNo} From 6e1be4a0b45c7d66f54aa9b906c141b4893e935d Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Mon, 14 Oct 2024 21:10:42 +0800 Subject: [PATCH 3/4] =?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 --- src/main/resources/mapper/change/ChangeManagementMapper.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/resources/mapper/change/ChangeManagementMapper.xml b/src/main/resources/mapper/change/ChangeManagementMapper.xml index a54abe9e..145a8511 100644 --- a/src/main/resources/mapper/change/ChangeManagementMapper.xml +++ b/src/main/resources/mapper/change/ChangeManagementMapper.xml @@ -813,8 +813,7 @@ field_desc, workflow_id, plm_table, - field_type, - + field_type FROM plm_request_node_detail WHERE site = #{site} and workflow_id = #{workflowId} and node_id = #{nodeId} and classification_no = #{classificationNo} 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 4/4] =?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().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);