From 5ad5aa0eb5e428320b14cb6aab209f3b1fc2f5fd Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Tue, 4 Jun 2024 10:09:26 +0800 Subject: [PATCH] =?UTF-8?q?2024-06-04=20=E6=9B=B4=E6=96=B03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/spring/modules/change/vo/ChangeRequestVo.java | 2 ++ .../spring/modules/proofing/vo/ProofingInformationVo.java | 4 ++++ .../spring/modules/quotation/vo/QuotationInformationVo.java | 4 ++++ .../java/com/spring/modules/test/vo/TestInformationVo.java | 4 ++++ src/main/resources/mapper/change/ChangeManagementMapper.xml | 4 +++- .../resources/mapper/proofing/ProofingInformationMapper.xml | 4 +++- .../mapper/quotation/QuotationInformationMapper.xml | 6 +++++- src/main/resources/mapper/test/TestInformationMapper.xml | 4 +++- 8 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/spring/modules/change/vo/ChangeRequestVo.java b/src/main/java/com/spring/modules/change/vo/ChangeRequestVo.java index 5197e4de..8f8bc041 100644 --- a/src/main/java/com/spring/modules/change/vo/ChangeRequestVo.java +++ b/src/main/java/com/spring/modules/change/vo/ChangeRequestVo.java @@ -52,6 +52,8 @@ public class ChangeRequestVo extends ChangeRequestEntity { private String rejectFlag; private String bu; private String isReject; + private String nodeId; + private String nodeName; private ChangeCostImpactEntity costImpactData; private ChangeExecutionInfoVo executionInfoData; 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 d6208e8b..8256bade 100644 --- a/src/main/java/com/spring/modules/proofing/vo/ProofingInformationVo.java +++ b/src/main/java/com/spring/modules/proofing/vo/ProofingInformationVo.java @@ -57,4 +57,8 @@ public class ProofingInformationVo extends ProofingInformationEntity { private String bu; private String isReject; + + private String nodeId; + + private String nodeName; } 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 71d60559..7952ac56 100644 --- a/src/main/java/com/spring/modules/quotation/vo/QuotationInformationVo.java +++ b/src/main/java/com/spring/modules/quotation/vo/QuotationInformationVo.java @@ -70,4 +70,8 @@ public class QuotationInformationVo extends QuotationInformationEntity { private String bu; private String isReject; + + private String nodeId; + + private String nodeName; } 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 424ac9be..52b9dfe8 100644 --- a/src/main/java/com/spring/modules/test/vo/TestInformationVo.java +++ b/src/main/java/com/spring/modules/test/vo/TestInformationVo.java @@ -60,4 +60,8 @@ public class TestInformationVo extends TestInformationEntity { private String bu; private String isReject; + + private String nodeId; + + private String nodeName; } diff --git a/src/main/resources/mapper/change/ChangeManagementMapper.xml b/src/main/resources/mapper/change/ChangeManagementMapper.xml index a0e102d7..26866284 100644 --- a/src/main/resources/mapper/change/ChangeManagementMapper.xml +++ b/src/main/resources/mapper/change/ChangeManagementMapper.xml @@ -145,7 +145,9 @@ a.step_id, a.reject_flag, a.reject_step_id, - d.is_reject + d.is_reject, + d.node_id, + d.node_name FROM plm_change_request a LEFT JOIN sys_user as b on a.site = b.site and a.applicant_id = b.username left join plm_request_header as prh on a.site = prh.site and prh.menu_id = #{query.menuId} diff --git a/src/main/resources/mapper/proofing/ProofingInformationMapper.xml b/src/main/resources/mapper/proofing/ProofingInformationMapper.xml index 9230f39f..7e1f14ee 100644 --- a/src/main/resources/mapper/proofing/ProofingInformationMapper.xml +++ b/src/main/resources/mapper/proofing/ProofingInformationMapper.xml @@ -48,7 +48,9 @@ a.step_id, reject_flag, reject_step_id, - d.is_reject + d.is_reject, + d.node_id, + d.node_name 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 ea59ff21..aa7a2a2f 100644 --- a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml +++ b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml @@ -50,6 +50,8 @@ + + @@ -111,7 +113,9 @@ a.step_id, a.reject_flag, a.reject_step_id, - d.is_reject + d.is_reject, + d.node_id, + d.node_name FROM plm_quotation_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/test/TestInformationMapper.xml b/src/main/resources/mapper/test/TestInformationMapper.xml index ae062287..afa9d6e8 100644 --- a/src/main/resources/mapper/test/TestInformationMapper.xml +++ b/src/main/resources/mapper/test/TestInformationMapper.xml @@ -53,7 +53,9 @@ a.step_id, a.reject_flag, a.reject_step_id, - d.is_reject + d.is_reject, + d.node_id, + d.node_name 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