diff --git a/src/main/java/com/spring/modules/proofing/vo/ProofingInformationVo.java b/src/main/java/com/spring/modules/proofing/vo/ProofingInformationVo.java index 6e73ff8f..7b9e0d8f 100644 --- a/src/main/java/com/spring/modules/proofing/vo/ProofingInformationVo.java +++ b/src/main/java/com/spring/modules/proofing/vo/ProofingInformationVo.java @@ -78,4 +78,6 @@ public class ProofingInformationVo extends ProofingInformationEntity { private String nodeCreateBy; private String processFlag; + + private String approvalUsername; } diff --git a/src/main/java/com/spring/modules/quotation/vo/QuotationInformationVo.java b/src/main/java/com/spring/modules/quotation/vo/QuotationInformationVo.java index 9e062b3c..26f5215d 100644 --- a/src/main/java/com/spring/modules/quotation/vo/QuotationInformationVo.java +++ b/src/main/java/com/spring/modules/quotation/vo/QuotationInformationVo.java @@ -92,4 +92,6 @@ public class QuotationInformationVo extends QuotationInformationEntity { private BigDecimal qty; + private String approvalUsername; + } diff --git a/src/main/java/com/spring/modules/test/vo/TestInformationVo.java b/src/main/java/com/spring/modules/test/vo/TestInformationVo.java index 9c8ec6bb..f2a74e54 100644 --- a/src/main/java/com/spring/modules/test/vo/TestInformationVo.java +++ b/src/main/java/com/spring/modules/test/vo/TestInformationVo.java @@ -78,4 +78,6 @@ public class TestInformationVo extends TestInformationEntity { private String customerPartNo; private String nodeCreateBy; + + private String approvalUsername; } diff --git a/src/main/resources/mapper/proofing/ProofingInformationMapper.xml b/src/main/resources/mapper/proofing/ProofingInformationMapper.xml index 9ec7fcd0..5d0f339e 100644 --- a/src/main/resources/mapper/proofing/ProofingInformationMapper.xml +++ b/src/main/resources/mapper/proofing/ProofingInformationMapper.xml @@ -8,17 +8,17 @@ a.site, a.proofing_no, a.project_id, - dbo.plm_get_project_name(a.site, a.project_id) as projectName, + dbo.plm_get_project_name(a.site, a.project_id) as projectName, a.test_part_no, - dbo.plm_get_test_part_desc(a.site, a.test_part_no) as partName, + dbo.plm_get_test_part_desc(a.site, a.test_part_no) as partName, a.customer_no, - dbo.plm_get_customer_desc(a.site, a.customer_no) as customerDesc, + dbo.plm_get_customer_desc(a.site, a.customer_no) as customerDesc, a.tracker, - dbo.plm_get_user_display(a.site, a.tracker) as trackerName, + dbo.plm_get_user_display(a.site, a.tracker) as trackerName, a.engineer, - dbo.plm_get_user_display(a.site, a.engineer) as engineerName, + dbo.plm_get_user_display(a.site, a.engineer) as engineerName, a.approver, - dbo.plm_get_user_display(a.site, a.approver) as approverName, + dbo.plm_get_user_display(a.site, a.approver) as approverName, a.priority_level, a.proofing_number, a.required_delivery_date, @@ -51,11 +51,12 @@ d.is_reject, d.node_id, d.node_name, - dbo.plm_get_user_display(a.site, d.create_by) as nodeCreateBy, + dbo.plm_get_user_display(a.site, d.create_by) as nodeCreateBy, vpp.bu_no, b.bu_desc, vpp.final_part_no, - pcpi.customer_part_no + pcpi.customer_part_no, + dbo.get_plm_Approval_username(a.site, d.workflow_id, d.node_id, a.proofing_no) as approvalUsername FROM plm_proofing_information as a left join plm_request_header as prh on a.site = prh.site and prh.menu_id = #{query.menuId} left join plm_request_node as d on a.site = d.site and prh.classification_no = d.classification_no and diff --git a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml index b169a814..4538ff09 100644 --- a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml +++ b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml @@ -116,6 +116,7 @@ d.node_id, d.node_name, dbo.plm_get_user_display(d.site, d.create_by) as node_create_by, + dbo.get_plm_Approval_username(a.site, d.workflow_id, d.node_id, a.quotation_batch_no) as approvalUsername, vpp.bu_no, b.bu_desc, diff --git a/src/main/resources/mapper/test/TestInformationMapper.xml b/src/main/resources/mapper/test/TestInformationMapper.xml index 5f3dc1cf..40151950 100644 --- a/src/main/resources/mapper/test/TestInformationMapper.xml +++ b/src/main/resources/mapper/test/TestInformationMapper.xml @@ -59,16 +59,14 @@ vpp.bu_no, b.bu_desc, final_part_no, - cp.customer_part_no + cp.customer_part_no, + dbo.get_plm_Approval_username(a.site,d.workflow_id,d.node_id,a.test_no) as approvalUsername FROM plm_test_information as a left join plm_request_header as prh on a.site = prh.site and prh.menu_id = #{query.menuId} - left join plm_request_node as d on a.site = d.site and prh.classification_no = d.classification_no and - prh.workflow_id = d.workflow_id and a.step_id = d.step_id - left join view_Project_Part vpp - on vpp.site = a.site and vpp.test_part_no = a.test_part_no and vpp.project_id = a.project_id + left join plm_request_node as d on a.site = d.site and prh.classification_no = d.classification_no and prh.workflow_id = d.workflow_id and a.step_id = d.step_id + left join view_Project_Part vpp on vpp.site = a.site and vpp.test_part_no = a.test_part_no and vpp.project_id = a.project_id left join BU b on vpp.bu_no = b.bu_no and a.site = b.site - left join plm_customer_part_info cp - on a.site = cp.site and a.customer_no = cp.customer_no and a.test_part_no = cp.part_no + left join plm_customer_part_info cp on a.site = cp.site and a.customer_no = cp.customer_no and a.test_part_no = cp.part_no a.site = #{query.site}