diff --git a/src/main/java/com/spring/modules/proofing/entity/ProofingInformationEntity.java b/src/main/java/com/spring/modules/proofing/entity/ProofingInformationEntity.java index e4738f69..c717aeb4 100644 --- a/src/main/java/com/spring/modules/proofing/entity/ProofingInformationEntity.java +++ b/src/main/java/com/spring/modules/proofing/entity/ProofingInformationEntity.java @@ -3,11 +3,11 @@ package com.spring.modules.proofing.entity; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import com.spring.common.utils.QueryPage; -import com.spring.modules.quotation.entity.QuotationInformationEntity; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -178,6 +178,8 @@ public class ProofingInformationEntity extends QueryPage implements Serializable private Integer rejectStepId; + private BigDecimal proofingAmount; + @TableField(exist = false) private List delegateAccessList; } diff --git a/src/main/resources/mapper/proofing/ProofingInformationMapper.xml b/src/main/resources/mapper/proofing/ProofingInformationMapper.xml index 226458c4..64322c20 100644 --- a/src/main/resources/mapper/proofing/ProofingInformationMapper.xml +++ b/src/main/resources/mapper/proofing/ProofingInformationMapper.xml @@ -57,7 +57,8 @@ vpp.final_part_no, pcpi.customer_part_no, dbo.get_plm_Approval_username(a.site, d.workflow_id, d.node_id, a.proofing_no) as approvalUsername, - vpp.plm_part_no + vpp.plm_part_no, + a.proofing_amount 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