Browse Source

2024-06-04 更新3

master
fengyuan_yang 2 years ago
parent
commit
5ad5aa0eb5
  1. 2
      src/main/java/com/spring/modules/change/vo/ChangeRequestVo.java
  2. 4
      src/main/java/com/spring/modules/proofing/vo/ProofingInformationVo.java
  3. 4
      src/main/java/com/spring/modules/quotation/vo/QuotationInformationVo.java
  4. 4
      src/main/java/com/spring/modules/test/vo/TestInformationVo.java
  5. 4
      src/main/resources/mapper/change/ChangeManagementMapper.xml
  6. 4
      src/main/resources/mapper/proofing/ProofingInformationMapper.xml
  7. 6
      src/main/resources/mapper/quotation/QuotationInformationMapper.xml
  8. 4
      src/main/resources/mapper/test/TestInformationMapper.xml

2
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;

4
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;
}

4
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;
}

4
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;
}

4
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}

4
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

6
src/main/resources/mapper/quotation/QuotationInformationMapper.xml

@ -50,6 +50,8 @@
<result column="quotation_amount" property="quotationAmount"/>
<result column="customer_quote_no" property="customerQuoteNo"/>
<result column="is_reject" property="isReject"/>
<result column="node_id" property="nodeId"/>
<result column="node_name" property="nodeName"/>
<!-- <association property="priceCheckDetail" javaType="com.spring.modules.quotation.entity.PriceCheckDetail">-->
<!-- <result column="site" property="site"/>-->
<!-- <result column="quotation_no" property="quotationNo"/>-->
@ -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

4
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

Loading…
Cancel
Save