From 6cc57fe0770c24e70af151b59a6e65034a280b05 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 6 Aug 2024 16:02:15 +0800 Subject: [PATCH] =?UTF-8?q?fix=2088069=20=E9=A1=B9=E7=9B=AE=E8=B4=B9?= =?UTF-8?q?=E7=94=A80=E5=85=83=E6=97=B6=EF=BC=8C=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E7=AB=AF=E7=BC=B4=E8=B4=B9=E5=87=AD=E8=AF=81=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=EF=BC=8C=E8=B4=B9=E7=94=A8=E6=94=B9=E6=88=90?= =?UTF-8?q?1=E5=86=8D=E6=94=B9=E6=88=900=E5=90=8E=EF=BC=8C=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E7=AB=AF=E7=BC=B4=E8=B4=B9=E5=87=AD=E8=AF=81=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=B2=A1=E6=9C=89=E9=87=8D=E6=96=B0=E5=8F=98=E6=88=90?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/mail/mapper/PayMailBillMapper.java | 2 +- .../mail/mapper/PayMailBillProjectMapper.java | 15 ++++++++++++--- .../jero/mail/mapper/xml/PayMailBillMapper.xml | 9 ++++----- .../mail/service/impl/PayMailBillServiceImpl.java | 6 +++++- .../service/impl/PayCommonProjectServiceImpl.java | 15 ++++++++++++--- 5 files changed, 34 insertions(+), 13 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 def5eaab..c40dcbfc 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 @@ -72,7 +72,7 @@ public interface PayMailBillMapper extends BaseMapper { PayContactsManagement print(@Param("id") String id); - Integer updateByProjectId(@Param("updated") PayMailBill payMailBill, @Param("projectId") String projectId); + Integer updateByProjectId(@Param("updated") PayMailBill payMailBill, @Param("idList") List idList); Integer updateTax(@Param("id") String id); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillProjectMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillProjectMapper.java index 62793c85..fdf266a2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillProjectMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillProjectMapper.java @@ -1,17 +1,26 @@ package com.jero.mail.mapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import java.util.List; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jero.mail.entity.PayMailBillProject; -import io.lettuce.core.dynamic.annotation.Param; -import java.math.BigDecimal; +import java.util.stream.Collectors; /** * @Description: pay_mail_bill_project * @Author: jeecg-boot - * @Date: 2021-08-31 + * @Date: 2021-08-31 * @Version: V1.0 */ public interface PayMailBillProjectMapper extends BaseMapper { + default List selectBillIdByProjectId(String projectId) { + LambdaQueryWrapper myQuery = Wrappers.lambdaQuery(PayMailBillProject.class); + myQuery.eq(PayMailBillProject::getProjectId, projectId); + myQuery.select(PayMailBillProject::getBillId); + return selectList(myQuery).stream().map(PayMailBillProject::getBillId).collect(Collectors.toList()); + } + } 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 bd583184..7ec1be6a 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 @@ -197,11 +197,10 @@ - id in ( - select bill_id - from pay_mail_bill_project - where project_id = #{projectId} - ) + id in + + #{item} + and post_status = 0 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 4b089794..806041ed 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 @@ -1,5 +1,6 @@ package com.jero.mail.service.impl; +import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -604,7 +605,10 @@ public class PayMailBillServiceImpl extends ServiceImpl idList = payMailBillProjectMapper.selectBillIdByProjectId(projectId); + if (CollectionUtil.isNotEmpty(idList)){ + payMailBillMapper.updateByProjectId(mailBill,idList); + } } @Override diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java index 2db6ed68..bcbaedb0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java @@ -244,7 +244,8 @@ public class PayCommonProjectServiceImpl extends ServiceImpl updatePayCommonProject = new LambdaUpdateWrapper<>(); @@ -277,6 +277,15 @@ public class PayCommonProjectServiceImpl extends ServiceImpl