Browse Source

2024-10-30

master
qiezi 1 year ago
parent
commit
fc988c0336
  1. 2
      src/main/java/com/spring/modules/proofing/vo/ProofingInformationVo.java
  2. 3
      src/main/java/com/spring/modules/quotation/vo/QuotationInformationVo.java
  3. 2
      src/main/java/com/spring/modules/test/vo/TestInformationVo.java
  4. 1
      src/main/resources/mapper/proofing/ProofingInformationMapper.xml
  5. 2
      src/main/resources/mapper/quotation/QuotationInformationMapper.xml
  6. 9
      src/main/resources/mapper/test/TestInformationMapper.xml

2
src/main/java/com/spring/modules/proofing/vo/ProofingInformationVo.java

@ -74,4 +74,6 @@ public class ProofingInformationVo extends ProofingInformationEntity {
private String finalPartNo;
private String customerPartNo;
private String nodeCreateBy;
}

3
src/main/java/com/spring/modules/quotation/vo/QuotationInformationVo.java

@ -86,4 +86,7 @@ public class QuotationInformationVo extends QuotationInformationEntity {
private String finalPartNo;
private String customerPartNo;
private String nodeCreateBy;
}

2
src/main/java/com/spring/modules/test/vo/TestInformationVo.java

@ -76,4 +76,6 @@ public class TestInformationVo extends TestInformationEntity {
private String finalPartNo;
private String customerPartNo;
private String nodeCreateBy;
}

1
src/main/resources/mapper/proofing/ProofingInformationMapper.xml

@ -51,6 +51,7 @@
d.is_reject,
d.node_id,
d.node_name,
dbo.plm_get_user_display(a.site, d.create_by) as nodeCreateBy,
vpp.bu_no,
b.bu_desc,
vpp.final_part_no,

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

@ -56,6 +56,7 @@
<result column="bu_desc" property="buDesc"/>
<result column="final_part_no" property="finalPartNo"/>
<result column="customer_part_no" property="customerPartNo"/>
<result column="node_create_by" property="nodeCreateBy"/>
</resultMap>
<!-- 报价信息列表 -->
<select id="quotationInformationSearch" resultMap="getQuotation" parameterType="com.spring.modules.quotation.vo.QuotationInformationVo">
@ -114,6 +115,7 @@
d.is_reject,
d.node_id,
d.node_name,
dbo.plm_get_user_display(d.site,d.create_by) as node_create_by,
</if>
vpp.bu_no,
b.bu_desc,

9
src/main/resources/mapper/test/TestInformationMapper.xml

@ -55,6 +55,7 @@
d.is_reject,
d.node_id,
d.node_name,
dbo.plm_get_user_display(a.site, d.create_by) as node_create_by,
vpp.bu_no,
b.bu_desc
FROM plm_test_information as a
@ -174,12 +175,18 @@
pti.print_type,
pti.product_name,
pcpi.customer_part_no,
vpp.final_part_no
vpp.final_part_no,
d.node_name,
dbo.plm_get_user_display(pti.site, d.create_by) as node_create_by
FROM plm_test_information pti
left join view_Project_Part vpp on pti.site = vpp.site and pti.test_part_no = vpp.test_part_no and
pti.project_id = vpp.project_id
left join plm_customer_part_info pcpi on pti.site = pcpi.site and pti.test_part_no = pcpi.part_no and
pti.customer_no = pcpi.customer_no
left join plm_request_header as prh on pti.site = prh.site and prh.menu_id = #{menuId}
left join plm_request_node as d
on pti.site = d.site and prh.classification_no = d.classification_no and
prh.workflow_id = d.workflow_id and pti.step_id = d.step_id
<where>
and pti.site = #{site}
<if test="projectId != null and projectId != ''">

Loading…
Cancel
Save