From d72227151e64c11e9cf99ba7fd206063a8594b3d Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Mon, 14 Oct 2024 20:30:25 +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 --- .../Tooling/service/impl/ProjectToolingApplyServiceImpl.java | 5 +++++ .../resources/mapper/Tooling/ProjectToolingApplyMapper.xml | 2 +- src/main/resources/mapper/change/ChangeManagementMapper.xml | 3 ++- 3 files 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 e91282bb..12b155e2 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 @@ -38,6 +38,7 @@ import com.spring.modules.request.vo.PlmRequestDetailVo; import com.spring.modules.request.vo.PlmRequestHeaderVo; import com.spring.modules.sys.dao.SysUserDao; import com.spring.modules.sys.entity.SysUserEntity; +import com.spring.modules.test.entity.TestSoBom; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -340,6 +341,10 @@ public class ProjectToolingApplyServiceImpl implements ProjectToolingApplyServic } md.setFieldValue(oaIds.get(0).getId()); } + } else if ("C".equals(nodeDetail.getFieldType())) { // 判断是否为金额 + BigDecimal v = (BigDecimal) getPropertyValue(changeRequest, nodeDetail.getPlmField()); + fieldValue = v == null ? "" : v.toString(); + md.setFieldValue(fieldValue); } else { md.setFieldValue(fieldValue); } diff --git a/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml b/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml index f3bfd8b1..d22bf801 100644 --- a/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml +++ b/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml @@ -156,7 +156,7 @@ a.orderRef5,dbo.plm_get_toolDesc(a.site,a.tool_id) toolDesc,a.orderRef6,b.operat step_id, reject_flag, reject_step_id - ,tp,dbo.get_userDisPlay(tp) tpName ,quoter,dbo.get_userDisPlay(quoter) quoterName ,purchaser,dbo.get_userDisPlay(purchaser) purchaserName + ,tp,dbo.get_userDisPlay(tp) tpName ,quoter,dbo.get_userDisPlay(quoter) quoterName ,purchaser,dbo.get_userDisPlay(purchaser) purchaserName,totalCost FROM plm_project_tool_applyHeader where site = #{site} and apply_no = #{applyNo} 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}