diff --git a/db/23年10月23日变更.sql b/db/23年10月23日变更.sql index fd9e4386..131bd67c 100644 --- a/db/23年10月23日变更.sql +++ b/db/23年10月23日变更.sql @@ -3,6 +3,7 @@ alter table pay_meeting add link_topics varchar(50) null comment '关联课题', add meeting_costs_two_topic decimal(12, 2) null comment '会议费用(2个课题)', add meeting_costs_three_topic decimal(12, 2) null comment '会议费用(3个及以上)'; +update pay_meeting set is_wasic = 0 where meeting_type = 3 and is_wasic is null; alter table pay_meeting_situation add choice_topic varchar(50) null comment '选择课题'; 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 9df722ba..d0a75d62 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 @@ -177,36 +177,6 @@ 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}, @@ -216,17 +186,14 @@ contact_mobile = #{updated.contactMobile}, - - bill_date = #{updated.billDate}, + + email = #{updated.email}, - - send_date = #{updated.sendDate}, + + postal_code = #{updated.postalCode}, - - remark = #{updated.remark}, - - - project_name = #{updated.projectName}, + + contact_address = #{updated.contactAddress}, 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 f7fdd5ed..109726f4 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 @@ -92,8 +92,9 @@ public interface IPayMailBillService extends IService { * 如果有邮寄信息更新邮寄联系人信息 * @param ContactId 邮寄联系人id * @param projectId 项目id + * @param payMailBill */ - void updateContactByProjectId(String ContactId,String projectId); + void updateContactByProjectId(String ContactId, String projectId, PayMailBill payMailBill); IPage contactsSearchPageList(Page page, String userId, QueryWrapper queryWrapper); 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 75a78a92..2968b578 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 @@ -173,6 +173,7 @@ public class PayMailBillServiceImpl extends ServiceImpl addPayBill(PayMailBillVO payMailBill) { //票据关联项目表 @@ -212,7 +213,16 @@ public class PayMailBillServiceImpl extends ServiceImpl