From e19208f6b500fa459be56b8d3f0217eded48bf91 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 11 Aug 2022 14:55:15 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=99=AE=E9=80=9A=EF=BC=8C=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E7=BB=84=EF=BC=8C=E8=B5=84=E6=96=99=E7=BD=91=E5=91=98?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=97=B6=E4=BF=AE=E6=94=B9=E9=82=AE=E5=AF=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=AD=E5=85=B3=E8=81=94=E7=9A=84=E8=81=94?= =?UTF-8?q?=E7=B3=BB=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/mail/mapper/PayMailBillMapper.java | 6 +- .../mail/mapper/xml/PayMailBillMapper.xml | 84 ++++++++++++++++++- .../mail/service/IPayMailBillService.java | 7 ++ .../service/impl/PayMailBillServiceImpl.java | 17 ++++ ...PayPayMemberProjectSubitemServiceImpl.java | 6 ++ .../impl/PayCommonProjectServiceImpl.java | 12 ++- .../PayWorkingGroupSubItemServiceImpl.java | 6 ++ 7 files changed, 134 insertions(+), 4 deletions(-) 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 3bb20b2c..83d8b7c3 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 @@ -10,7 +10,7 @@ import com.jero.company.entity.PayContactsManagement; import com.jero.mail.PayMailBillVO; import com.jero.mail.entity.PayMailBill; import com.jero.mail.entity.PayMailBillSearch; -import io.lettuce.core.dynamic.annotation.Param; +import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; import java.util.List; @@ -51,7 +51,7 @@ public interface PayMailBillMapper extends BaseMapper { * @return */ - IPage pageList(Page page, @org.apache.ibatis.annotations.Param(Constants.WRAPPER) QueryWrapper queryWrapper); + IPage pageList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); List pageListss(@Param("payMailBillSearch") PayMailBillSearch payMailBillSearch); @@ -73,4 +73,6 @@ public interface PayMailBillMapper extends BaseMapper { PayContactsManagement print(@Param("id") String id); + Integer updateByProjectId(@Param("updated") PayMailBill payMailBill, @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 d8ca5ae0..5e7eff7b 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 @@ -1,6 +1,25 @@ + + id, + create_by, + create_time, + update_by, + update_time, + bill_no, + invoice_amount, + post_status, + send_method, + post_no, + contact_id, + contact_name, + contact_mobile, + bill_date, + send_date, + remark, + project_name + @@ -149,5 +168,68 @@ - + + + update pay_mail_bill + + + id = #{updated.id}, + + + create_by = #{updated.createBy}, + + + create_time = #{updated.createTime}, + + + update_by = #{updated.updateBy}, + + + update_time = #{updated.updateTime}, + + + bill_no = #{updated.billNo}, + + + invoice_amount = #{updated.invoiceAmount}, + + + post_status = #{updated.postStatus}, + + + send_method = #{updated.sendMethod}, + + + post_no = #{updated.postNo}, + + + contact_id = #{updated.contactId}, + + + contact_name = #{updated.contactName}, + + + contact_mobile = #{updated.contactMobile}, + + + bill_date = #{updated.billDate}, + + + send_date = #{updated.sendDate}, + + + remark = #{updated.remark}, + + + project_name = #{updated.projectName}, + + + + 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 814aad64..5a1b6b92 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 @@ -88,4 +88,11 @@ public interface IPayMailBillService extends IService { PayContactsManagement print(String id); + /** + * 如果有邮寄信息更新邮寄联系人信息 + * @param ContactId 邮寄联系人id + * @param projectId 项目id + */ + void updateContactByProjectId(String ContactId,String projectId); + } 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 9f8f0164..208a0784 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 @@ -565,6 +565,23 @@ public class PayMailBillServiceImpl extends ServiceImpl bmpList) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java index c810ff64..960b6e49 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java @@ -20,6 +20,7 @@ import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayContactsManagementService; import com.jero.contract.entity.PayIncomeContract; import com.jero.contract.service.IPayIncomeContractService; +import com.jero.mail.service.IPayMailBillService; import com.jero.member.entity.PayMemberProject; import com.jero.member.entity.PayMemberProjectSubitem; import com.jero.member.mapper.PayMemberProjectMapper; @@ -77,6 +78,8 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl