diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java index 6910e647..01276058 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.mail.PayMailBillVO; import com.jero.mail.entity.PayMailBill; import com.jero.mail.entity.PayMailBillSearch; import io.lettuce.core.dynamic.annotation.Param; @@ -29,6 +30,8 @@ public interface PayMailBillMapper extends BaseMapper { */ List selectCommonProjectMailBillVO(@Param("projectId") String projectId); + List selectInvoicingStage(@Param("projectId")String projectId); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml index 166d80f4..974a10b9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml @@ -13,8 +13,9 @@ - - + + + @@ -32,8 +33,8 @@ pmb.post_status, pmb.send_method, pmb.post_no, - pmb.liaison_man, - pmb.mobile, + pmb.contact_name, + pmb.contact_mobile, pmb.bill_date, pmb.send_date, pmb.remark, @@ -42,5 +43,12 @@ WHERE pmb.id IN (SELECT bill_id FROM pay_mail_bill_project WHERE project_id=#{projectId}) + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java index 5b65d5d0..644acc57 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java @@ -30,6 +30,13 @@ public interface IPayMailBillService extends IService { */ List selectMailBillVO(String projectId); + /** + * 查询开票阶段 + * @param projectId + * @return + */ + List selectInvoicingStage(String projectId); + /** * 添加开票 * @param payMailBill diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java index 19c9d1b5..7c34364f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java @@ -82,6 +82,8 @@ public class PayMailBillServiceImpl extends ServiceImpl selectMailBillVO(String projectId) { @@ -101,6 +103,12 @@ public class PayMailBillServiceImpl extends ServiceImpl selectInvoicingStage(String projectId) { + + return payMailBillMapper.selectInvoicingStage(projectId); + } + /** * 添加开票 * @@ -135,13 +143,30 @@ public class PayMailBillServiceImpl extends ServiceImpl payBillList(String id) { - return Result.OK(payMailBillService.selectMailBillVO(id)); + return Result.OK(payMailBillService.selectInvoicingStage(id)); } /**