From 279bf485489806a40cf119f4558511fff80587eb Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 5 Aug 2024 15:03:55 +0800 Subject: [PATCH 01/37] =?UTF-8?q?fix=20=E8=B0=83=E6=95=B4=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E7=BB=84=E5=85=A8=E9=83=A8=E6=96=87=E4=BB=B6=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E7=9A=84=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/service/impl/PayWorkingGroupServiceImpl.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java index 2a50078e..6745a1b1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java @@ -978,16 +978,13 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(PayMeeting::getWorkingGroupId, projectId); lambdaQueryWrapper.eq(PayMeeting::getMeetingType, MeetingCommon.WORKING_GROUP_MEETING_INT); List list = payMeetingService.list(lambdaQueryWrapper); for (PayMeeting payMeeting : list) { String meetingName = payMeeting.getMeetingName(); - String meetingFolderPath = "会议资料/" + meetingName + "/"; + String meetingFolderPath = groupFolderPath + "会议资料/" + meetingName + "/"; String meetingMinutesFolderPath = meetingFolderPath + "会议纪要/"; String meetingDataFolderPath = meetingFolderPath + "上传文件/"; String meetingNoticeFilesPath = meetingFolderPath + "会议通知/"; From 6e898abf5074a8e2a1f232b59a58c59ae4735f5c Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 6 Aug 2024 10:52:57 +0800 Subject: [PATCH 02/37] =?UTF-8?q?fix=20=E4=BC=9A=E8=AE=AE=E6=8A=A5?= =?UTF-8?q?=E5=90=8D=E6=88=90=E5=8A=9F=E5=90=8E=E6=98=AF=E5=90=A6=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/service/impl/PayMeetingSituationServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 137a0bf0..82b4d7f0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -376,8 +376,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl Date: Tue, 6 Aug 2024 14:43:04 +0800 Subject: [PATCH 03/37] =?UTF-8?q?fix=2087946=20=E4=BC=81=E4=B8=9A=E6=9D=A5?= =?UTF-8?q?=E6=AC=BE=E7=BB=9F=E8=AE=A1--=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CompanyComeMoneyStatisticsController.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java index 99380ee4..cfa0a282 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java @@ -199,6 +199,10 @@ public class CompanyComeMoneyStatisticsController { if (StringUtils.isBlank(billMoney)) { s.setBillMoney(CommonConstant.ZERO); } + String finishRate = s.getFinishRate(); + if (StringUtils.isBlank(finishRate)) { + s.setFinishRate(CommonConstant.ZERO+"%"); + } } return AmountUtil.exportListXls(pageList, CompanyComeMoneyList.class, "企业来款统计"); From 49c8ce6ad3f228c66f3cea74b41e31ba90886abb Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 6 Aug 2024 14:45:15 +0800 Subject: [PATCH 04/37] =?UTF-8?q?fix=2087978=20=E5=B7=A5=E4=BD=9C=E7=BB=84?= =?UTF-8?q?=E6=9D=A5=E6=AC=BE=E8=AF=A6=E6=83=85-=E5=AF=BC=E5=87=BA-?= =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E4=BF=AE=E6=94=B9=E4=BB=A5=E4=B8=8B=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/project/entity/PayWorkGroupSubletStatistics.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkGroupSubletStatistics.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkGroupSubletStatistics.java index fe9e4c21..5ec3849c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkGroupSubletStatistics.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkGroupSubletStatistics.java @@ -20,16 +20,16 @@ public class PayWorkGroupSubletStatistics { @ApiModelProperty(value = "来款单位") private String chargeCompanyTemporaryName; - @Excel(name = "项目负责人", width = 15) - @ApiModelProperty(value = "项目负责人") - private String principalName; - @ApiModelProperty(value = "打包") private Integer pack; @Excel(name = "是否打包", width = 15) private String packText; + @Excel(name = "项目负责人", width = 15) + @ApiModelProperty(value = "项目负责人") + private String principalName; + @Excel(name = "年度待确收金额", width = 15) @ApiModelProperty(value = "应收总金额") private String allMoney; From c79478d8bf79884b0a968a3926bc7fc73415569c Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 6 Aug 2024 15:14:52 +0800 Subject: [PATCH 05/37] =?UTF-8?q?fix=20=E5=88=B0=E8=B4=A6=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/PayPaymentRecordMapper.xml | 64 ++++++++++--------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml index f2e488c9..6a92a389 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml @@ -279,37 +279,39 @@ AND tcp.affirm_income = #{payCommonProject.affirmIncome} - - UNION ALL - select ppc.id,ppc.company_temporary_name AS charge_project,22 AS charge_use,ppc.pack_principal_id as principal_id,su.realname AS principal_name,ppc.company_id as charge_company_id,ppc.company_temporary_name as charge_company_temporary_name,ppc.receivable_amount,ppc.paid_amount, - ppc.need_invoice,1 AS pack,ppc.in_account,ppc.make_invoice,NULL AS mail,ppc.create_time,8 AS projectType,ppc.invoice_amount,ppc.mail_contacts_id,'' AS register_check_result,ppc.pack_contact_temporary_name as contacts_temporary_name,NULL AS payment_status,ppc.company_temporary_id,ppc.confirm_amount,ppc.income_affirm AS affirm_income,0 AS admin_add_flag - from pay_pack_company ppc - left join sys_user su on ppc.pack_principal_id = su.id - left join pay_company_management on ppc.company_id = pay_company_management.id - where - ppc.receivable_amount ]]> 0 - and ppc.receivable_amount is not null - - AND pay_company_management.company_name like concat('%',#{payCommonProject.chargeCompanyTemporaryName},'%') - - - AND ppc.pack_principal_id = #{payCommonProject.principalId} - - - AND ppc.company_temporary_name like concat('%',concat(#{payCommonProject.chargeProject},'%')) - - - - AND (ppc.paid_amount ]]> ppc.invoice_amount or - (ppc.paid_amount is not null and ppc.paid_amount !=0 and ppc.invoice_amount is null)) - - - - AND (ppc.paid_amount ppc.invoice_amount or - (ppc.paid_amount is null and ppc.invoice_amount is not null and ppc.invoice_amount !=0)) - - - AND ppc.income_affirm = #{payCommonProject.affirmIncome} + + + UNION ALL + select ppc.id,ppc.company_temporary_name AS charge_project,22 AS charge_use,ppc.pack_principal_id as principal_id,su.realname AS principal_name,ppc.company_id as charge_company_id,ppc.company_temporary_name as charge_company_temporary_name,ppc.receivable_amount,ppc.paid_amount, + ppc.need_invoice,1 AS pack,ppc.in_account,ppc.make_invoice,NULL AS mail,ppc.create_time,8 AS projectType,ppc.invoice_amount,ppc.mail_contacts_id,'' AS register_check_result,ppc.pack_contact_temporary_name as contacts_temporary_name,NULL AS payment_status,ppc.company_temporary_id,ppc.confirm_amount,ppc.income_affirm AS affirm_income,0 AS admin_add_flag + from pay_pack_company ppc + left join sys_user su on ppc.pack_principal_id = su.id + left join pay_company_management on ppc.company_id = pay_company_management.id + where + ppc.receivable_amount ]]> 0 + and ppc.receivable_amount is not null + + AND pay_company_management.company_name like concat('%',#{payCommonProject.chargeCompanyTemporaryName},'%') + + + AND ppc.pack_principal_id = #{payCommonProject.principalId} + + + AND ppc.company_temporary_name like concat('%',concat(#{payCommonProject.chargeProject},'%')) + + + + AND (ppc.paid_amount ]]> ppc.invoice_amount or + (ppc.paid_amount is not null and ppc.paid_amount !=0 and ppc.invoice_amount is null)) + + + + AND (ppc.paid_amount ppc.invoice_amount or + (ppc.paid_amount is null and ppc.invoice_amount is not null and ppc.invoice_amount !=0)) + + + AND ppc.income_affirm = #{payCommonProject.affirmIncome} + )p LEFT JOIN pay_payment_record ppr ON ppr.project_id = p.id From c8bf5ed97d9af0611fffc0f51524c8ba0c20b6b0 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 6 Aug 2024 15:36:30 +0800 Subject: [PATCH 06/37] =?UTF-8?q?fix=2088057=20=E5=88=B0=E8=B4=A6=E5=BC=80?= =?UTF-8?q?=E7=A5=A8-=E6=9C=AA=E5=AE=A1=E6=A0=B8=E5=85=88=E6=9D=A5?= =?UTF-8?q?=E6=AC=BE=E5=90=8E=EF=BC=8C=E7=8A=B6=E6=80=81=E7=9A=84=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayPaymentRecordServiceImpl.java | 58 ++++++++++--------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java index a01a05a3..e122455e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java @@ -182,19 +182,20 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl Date: Tue, 6 Aug 2024 16:02:15 +0800 Subject: [PATCH 07/37] =?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 Date: Tue, 6 Aug 2024 16:26:15 +0800 Subject: [PATCH 08/37] =?UTF-8?q?fix=2088082=20=E5=B7=A5=E4=BD=9C=E7=BB=84?= =?UTF-8?q?--=E5=B7=A5=E4=BD=9C=E7=BB=84=E6=88=90=E5=91=98=E7=9A=84?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E5=87=AD=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayPaymentCheckController.java | 17 ++++++++++++++++- .../mapper/xml/PayWorkingGroupSubItemMapper.xml | 1 + 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java index d6ac0df4..1c81741b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java @@ -8,8 +8,8 @@ import com.jero.member.entity.TbCertificatePayment; import com.jero.member.entity.TbMemberProjectSubitem; import com.jero.member.service.ITbCertificatePaymentService; import com.jero.member.service.ITbMemberProjectSubitemService; -import com.jero.payment.entity.PayPaymentRecordSub; import com.jero.payment.entity.PayPaymentRecord; +import com.jero.payment.entity.PayPaymentRecordSub; import com.jero.payment.service.IPayPaymentCheckService; import com.jero.payment.service.IPayPaymentRecordService; import io.swagger.annotations.Api; @@ -130,6 +130,21 @@ public class PayPaymentCheckController extends JeroController getLastProof(String projectId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayPaymentRecordSub::getProjectId, projectId); + wrapper.isNotNull(PayPaymentRecordSub::getProof); + wrapper.orderByDesc(PayPaymentRecordSub::getCreateTime); + wrapper.last("limit 1"); + PayPaymentRecordSub sub = payPaymentCheckService.getOne(wrapper); + if (sub == null) { + return Result.OK("无数据"); + } + return Result.OK(sub); + } + @ApiOperation(value="标协会员项目详情", notes="标协会员项目详情") @GetMapping(value = "/getTbMemberProject") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml index f4beaba3..c1e5aaa6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml @@ -57,6 +57,7 @@ pwgs.label, pwgs.estimated_arrival_date, pwgs.check_payment_status, + pwgs.payment_status, pwgs.confirm_voucher FROM pay_working_group_subitem pwgs LEFT JOIN pay_payment_record ppr ON ppr.project_id = pwgs.id From 7d6e7cfa660eedcc2277a227530135e3b257d370 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 6 Aug 2024 16:45:17 +0800 Subject: [PATCH 09/37] =?UTF-8?q?fix=2088086=20=E4=BC=81=E4=B8=9A=E7=AB=AF?= =?UTF-8?q?--=E8=B5=84=E6=96=99=E7=BD=91=E9=A1=B5--=E7=BC=B4=E8=B4=B9?= =?UTF-8?q?=E5=87=AD=E8=AF=81=E7=8A=B6=E6=80=81=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/service/IPayMemberProjectSubitemService.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java index e59fbb62..53b1fade 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java @@ -27,6 +27,7 @@ import com.jero.member.mapper.PayMemberProjectMapper; import com.jero.member.mapper.PayMemberProjectSubitemMapper; import com.jero.pack.entity.PayPackCompanyProject; import com.jero.pack.service.IPayPackCompanyProjectService; +import com.jero.payment.service.IPayPaymentCheckService; import com.jero.project.common.PayProjectCommon; import com.jero.project.entity.AnnualDataLocking; import com.jero.project.service.AnnualDataLockingService; @@ -82,6 +83,8 @@ public class IPayMemberProjectSubitemService extends ServiceImpl0){ + payMemberProjectSubitem.setPaymentStatus(PayProjectCommon.PAYMENT_STATUS); + } save(payMemberProjectSubitem); // 来款方式为合同，校验合同编号 if(Objects.equals(payMemberProjectSubitem.getPaymentMethod(),PayProjectCommon.CHARGE_WAY2)){ @@ -145,7 +152,7 @@ public class IPayMemberProjectSubitemService extends ServiceImpl 0){ + if(amountReceivable.compareTo(new BigDecimal("0")) > 0){ paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1); } JSONObject json = new JSONObject(); From fcf643f45d9dbb4f1b13cadf329cfe26da8caddf Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 6 Aug 2024 17:34:21 +0800 Subject: [PATCH 10/37] =?UTF-8?q?fix=2088087=20=E4=BC=81=E4=B8=9A=E7=AB=AF?= =?UTF-8?q?--=E8=B5=84=E6=96=99=E7=BD=91=E5=85=83--=E5=B7=B2=E5=AE=8C?= =?UTF-8?q?=E7=BB=93=E5=90=8E=E5=9C=A8=E7=AE=A1=E7=90=86=E7=AB=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=87=91=E9=A2=9D=EF=BC=8C=E4=BC=81=E4=B8=9A=E7=AB=AF?= =?UTF-8?q?=E7=9A=84=E7=8A=B6=E6=80=81=E6=B2=A1=E6=9C=89=E6=94=B9=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/member/service/IPayMemberProjectSubitemService.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java index 53b1fade..96d32ceb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java @@ -250,6 +250,10 @@ public class IPayMemberProjectSubitemService extends ServiceImpl Date: Tue, 6 Aug 2024 18:01:55 +0800 Subject: [PATCH 11/37] =?UTF-8?q?fix=2088100=20=E4=BC=81=E4=B8=9A=E7=AB=AF?= =?UTF-8?q?--=E6=8A=A5=E5=90=8D=E5=90=8E=E7=BC=96=E8=BE=91=E7=BC=B4?= =?UTF-8?q?=E8=B4=B9=E6=96=B9=E5=BC=8F--=E5=A4=96=E5=B1=82=E7=9A=84?= =?UTF-8?q?=E6=8A=A5=E5=90=8D=E7=8A=B6=E6=80=81=E5=92=8C=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=B2=A1=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PayMeetingSituationServiceImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 82b4d7f0..9fdb2846 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -1329,8 +1329,14 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl Date: Wed, 7 Aug 2024 09:44:42 +0800 Subject: [PATCH 12/37] =?UTF-8?q?Revert=20"fix=20=E4=BC=9A=E8=AE=AE?= =?UTF-8?q?=E6=8A=A5=E5=90=8D=E6=88=90=E5=8A=9F=E5=90=8E=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=AE=A1=E6=A0=B8"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 6e898abf5074a8e2a1f232b59a58c59ae4735f5c. --- .../meeting/service/impl/PayMeetingSituationServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 9fdb2846..077b7c88 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -376,7 +376,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl Date: Wed, 7 Aug 2024 10:23:27 +0800 Subject: [PATCH 13/37] =?UTF-8?q?fix=2088139=20=E6=A0=87=E5=8D=8F=E4=BC=9A?= =?UTF-8?q?=E5=91=98=E7=BC=96=E8=BE=91=E9=87=91=E9=A2=9D=E6=AF=94=E5=AE=9E?= =?UTF-8?q?=E6=94=B6=E5=B0=8F=E6=97=B6=EF=BC=8C=E9=9C=80=E8=A6=81=E6=8A=A5?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=90=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/service/ITbMemberProjectSubitemService.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java index 2774ad6e..d7a4ad2b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java @@ -13,12 +13,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.common.ProjectCommon; import com.jero.common.enums.PaymentStatusEnum; import com.jero.common.exception.JeroBootException; +import com.jero.common.service.ProjectDetailService; import com.jero.common.service.RolePermissionService; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.ValidUtil; +import com.jero.common.vo.ProjectStatusVO; import com.jero.company.entity.PayCompanyManagement; import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayCompanyManagementService; @@ -122,6 +124,8 @@ public class ITbMemberProjectSubitemService extends ServiceImpl Date: Wed, 7 Aug 2024 10:46:58 +0800 Subject: [PATCH 14/37] =?UTF-8?q?fix=2088141=20=E6=A0=87=E5=8D=8F=E4=BC=9A?= =?UTF-8?q?=E5=91=98-=E7=BC=96=E8=BE=91=E9=87=91=E9=A2=9D=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E4=B8=8B=E7=8A=B6=E6=80=81=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/mapper/xml/ProjectDetailMapper.xml | 9 +++++++++ .../impl/ProjectDetailServiceImpl.java | 7 +++++++ .../com/jero/common/vo/ProjectStatusVO.java | 6 ++++++ .../ITbMemberProjectSubitemService.java | 20 ++++++++++++++++++- 4 files changed, 41 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml index e8c81344..9205abed 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml @@ -38,6 +38,7 @@ c.tax_rate as tax_rate, c.tax as tax, c.no_tax_amount as no_tax_amount, + c.confirm_amount as confirm_amount, c.affirm_income as affirm_income from pay_common_project c left join sys_user su on c.principal_id = su.id @@ -82,6 +83,7 @@ c.tax_rate as tax_rate, c.tax as tax, c.no_tax_amount as no_tax_amount, + c.confirm_amount as confirm_amount, affirm_income from pay_working_group g left join sys_user su on g.principal_id_a = su.id @@ -127,6 +129,7 @@ c.tax_rate as tax_rate, c.tax as tax, c.no_tax_amount as no_tax_amount, + c.confirm_amount as confirm_amount, affirm_income from pay_meeting meeting left join sys_user su on meeting.director_id = su.id @@ -172,6 +175,7 @@ c.tax_rate as tax_rate, c.tax as tax, c.no_tax_amount as no_tax_amount, + c.confirm_amount as confirm_amount, affirm_income from pay_member_project pmp left join sys_user su on pmp.director_id = su.id @@ -217,6 +221,7 @@ c.tax_rate as tax_rate, c.tax as tax, c.no_tax_amount as no_tax_amount, + c.confirm_amount as confirm_amount, affirm_income from tb_member_project tmember left join sys_user su on tmember.director_id = su.id @@ -264,6 +269,7 @@ c.tax_rate as tax_rate, c.tax as tax, c.no_tax_amount as no_tax_amount, + c.confirm_amount as confirm_amount, affirm_income from tb_member_project tmember left join sys_user su on tmember.director_id = su.id @@ -309,6 +315,7 @@ '' as tax_rate, '' as tax, '' as no_tax_amount, + '' as confirm_amount, '' FROM pay_drafting_group g @@ -357,6 +364,7 @@ c.tax_rate as tax_rate, c.tax as tax, c.no_tax_amount as no_tax_amount, + c.confirm_amount as confirm_amount, c.income_affirm AS affirm_income from pay_pack_company c left join sys_user su on c.pack_principal_id = su.id @@ -402,6 +410,7 @@ '' as tax_rate, '' as tax, '' as no_tax_amount, + '' as confirm_amount, '' FROM pay_functional_safety_center c diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java index 3dac76e0..7acbb801 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java @@ -37,6 +37,7 @@ import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import com.jero.payment.entity.PayPaymentRecord; import com.jero.payment.service.IPayPaymentRecordService; +import com.jero.payment.service.impl.PayConfirmPaymentRecordService; import com.jero.project.common.PayProjectCommon; import com.jero.project.entity.PayCommonProject; import com.jero.project.entity.PayWorkingGroupDistributionRecord; @@ -103,6 +104,8 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { private ITbMemberProjectSubitemService tbMemberProjectSubitemService; @Resource private SafetyCenterSubitemContactsService safetyCenterSubitemContactsService; + @Resource + private PayConfirmPaymentRecordService confirmPaymentRecordService; @Override public ProjectDetailVO getProjectDetail(String projectId) { @@ -512,6 +515,10 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { if(y > 0 && y <= c){ projectStatusVO.setMail(ProjectCommon.MAIL2); } + //确认收入 + BigDecimal confirmAmount = payCommonProject.getConfirmAmount(); + Integer affirmIncome = confirmPaymentRecordService.getAffirmIncome(receivableAmount, confirmAmount); + projectStatusVO.setAffirmIncome(affirmIncome); return projectStatusVO; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectStatusVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectStatusVO.java index aef080f5..172a4b81 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectStatusVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectStatusVO.java @@ -1,5 +1,6 @@ package com.jero.common.vo; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -18,4 +19,9 @@ public class ProjectStatusVO implements Serializable { * 邮寄（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志））） */ private Integer mail; + + /** + * 确认收入（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志））） + */ + private Integer affirmIncome; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java index d7a4ad2b..5c26bddf 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java @@ -47,6 +47,7 @@ import com.jero.pack.entity.PayPackCompanyProject; import com.jero.pack.service.IPayPackCompanyProjectService; import com.jero.payment.entity.PayConfirmPaymentRecord; import com.jero.payment.entity.PayPaymentRecord; +import com.jero.payment.service.IPayPaymentCheckService; import com.jero.payment.service.IPayPaymentRecordService; import com.jero.payment.service.impl.PayConfirmPaymentRecordService; import com.jero.project.common.PayProjectCommon; @@ -126,6 +127,8 @@ public class ITbMemberProjectSubitemService extends ServiceImpl Date: Wed, 7 Aug 2024 10:53:20 +0800 Subject: [PATCH 15/37] =?UTF-8?q?fix=2088142=20=E5=B7=A5=E4=BD=9C=E7=BB=84?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=88=90=E5=91=98=E5=8D=95=E4=BD=8D-?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=87=91=E9=A2=9D=E5=90=8E=EF=BC=8C=E4=BB=A5?= =?UTF-8?q?=E4=B8=8B=E7=8A=B6=E6=80=81=E6=B2=A1=E6=9C=89=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PayWorkingGroupSubItemServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java index 7b4de1c6..2708094b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java @@ -445,10 +445,12 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl Date: Wed, 7 Aug 2024 11:04:16 +0800 Subject: [PATCH 16/37] =?UTF-8?q?fix=2088147=20=E8=B5=84=E6=96=99=E7=BD=91?= =?UTF-8?q?=E5=85=83-=E7=BC=96=E8=BE=91=E9=87=91=E9=A2=9D=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E4=B8=8B=E7=8A=B6=E6=80=81=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/common/service/impl/ProjectDetailServiceImpl.java | 2 +- .../java/com/jero/meeting/entity/PayMeetingSituation.java | 2 +- .../java/com/jero/meeting/vo/MeetingSituationContractVO.java | 2 +- .../java/com/jero/member/entity/PayMemberProjectSubitem.java | 5 +---- .../jero/member/service/IPayMemberProjectSubitemService.java | 3 +++ 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java index 7acbb801..4b25a881 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java @@ -498,7 +498,7 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { projectStatusVO.setMakeInvoice(ProjectCommon.MAKE_INVOICE0); } // 开票金额 > 0 && 开票金额 < 待确收金额 = 2 - if(invoice.compareTo(new BigDecimal("0.00")) > 0 && invoice.compareTo(payCommonProject.getReceivableAmount()) < 0){ + if(invoice.compareTo(new BigDecimal("0.00")) > 0 && invoice.compareTo(receivableAmount) < 0){ projectStatusVO.setMakeInvoice(ProjectCommon.MAKE_INVOICE2); } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java index e4b99893..3ff61d6a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java @@ -353,7 +353,7 @@ public class PayMeetingSituation implements Serializable { @ApiModelProperty(value = "到账") private Integer inAccount; - /**开票*/ + /**开票（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志））*/ //@Excel(name = "开票", width = 15) @ApiModelProperty(value = "开票") private Integer makeInvoice; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MeetingSituationContractVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MeetingSituationContractVO.java index 5e52455b..2a4dfd0a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MeetingSituationContractVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MeetingSituationContractVO.java @@ -286,7 +286,7 @@ public class MeetingSituationContractVO { @ApiModelProperty(value = "到账") private Integer inAccount; - /**开票*/ + /**开票（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志））*/ @ApiModelProperty(value = "开票") private Integer makeInvoice; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java index 6846005f..b84dd976 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java @@ -251,11 +251,8 @@ public class PayMemberProjectSubitem implements Serializable { @ApiModelProperty(value = "到账") private Integer inAccount; - /** - * 开票 - */ + /**开票（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志））*/ @ApiModelProperty(value = "开票") - @Dict(dicCode = "yn") private Integer makeInvoice; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java index 96d32ceb..496bc406 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java @@ -234,6 +234,9 @@ public class IPayMemberProjectSubitemService extends ServiceImpl Date: Wed, 7 Aug 2024 11:07:29 +0800 Subject: [PATCH 17/37] =?UTF-8?q?fix=2088148=20=E6=99=AE=E9=80=9A=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=AE=A1=E7=90=86-=E7=BC=96=E8=BE=91=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E5=90=8E=EF=BC=8C=E4=BB=A5=E4=B8=8B=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/project/service/impl/PayCommonProjectServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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 bcbaedb0..1a20b4f0 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 @@ -256,6 +256,9 @@ public class PayCommonProjectServiceImpl extends ServiceImpl Date: Wed, 7 Aug 2024 11:21:44 +0800 Subject: [PATCH 18/37] =?UTF-8?q?fix=2088150=20=E6=89=93=E5=8C=85=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E7=BC=96=E8=BE=91=E9=87=91=E9=A2=9D=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E7=A1=AE=E6=94=B6=E7=8A=B6=E6=80=81=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayPackCompanyServiceImpl.java | 70 ++++--------------- 1 file changed, 14 insertions(+), 56 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java index 64a81c7f..fbbc9f58 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.common.ProjectCommon; import com.jero.common.exception.JeroBootException; +import com.jero.common.service.ProjectDetailService; +import com.jero.common.vo.ProjectStatusVO; import com.jero.mail.entity.PayMailBillProject; import com.jero.mail.service.IPayMailBillProjectService; import com.jero.mail.service.IPayMailBillService; @@ -58,7 +60,8 @@ public class PayPackCompanyServiceImpl extends ServiceImpl queryPageList(Page page, PayPackCompany payPackCompany) { return payPackCompanyMapper.queryPageList(page,payPackCompany); @@ -236,65 +239,20 @@ public class PayPackCompanyServiceImpl extends ServiceImpl queryPayMailBillProject = new LambdaQueryWrapper<>(); - queryPayMailBillProject.eq(PayMailBillProject::getProjectId, payPackCompanyOld.getId()); - List listPayMailBillProject = payMailBillProjectService.list(queryPayMailBillProject); - // 开票金额 - BigDecimal invoice = new BigDecimal("0.00"); - if (!CollectionUtils.isEmpty(listPayMailBillProject)) { - BigDecimal b = listPayMailBillProject.stream().map(PayMailBillProject::getInvoiceAmount).reduce(BigDecimal.ZERO, BigDecimal::add); - invoice = invoice.add(b); - if (receivableAmount.compareTo(invoice) < 0) { - throw new JeroBootException("待确收金额不可小于实收金额，请先修改实际来款后再来修改！"); + // 变更待确收金额，重新校验状态 + ProjectStatusVO projectStatusVO = projectDetailService.getStatus(payPackCompany.getId(), receivableAmount,needInvoice); + if(!Objects.isNull(projectStatusVO)){ + if(!Objects.isNull(projectStatusVO.getInAccount())){ + payPackCompany.setInAccount(projectStatusVO.getInAccount()); } - } - // 到账 - // 待确收金额 = 实收金额 = 1 - if (receivableAmount.compareTo(payPackCompanyOld.getPaidAmount()) == 0) { - payPackCompany.setInAccount(ProjectCommon.IN_ACCOUNT1); - } - // 0 = 实收金额 = 0 - if (payPackCompanyOld.getPaidAmount().compareTo(new BigDecimal("0.00")) == 0) { - payPackCompany.setInAccount(ProjectCommon.IN_ACCOUNT0); - } - // 0 < 实收金额 && 实收金额 < 待确收金额 = 2 - if (payPackCompanyOld.getPaidAmount().compareTo(new BigDecimal("0.00")) > 0 - && payPackCompanyOld.getPaidAmount().compareTo(receivableAmount) < 0) { - payPackCompany.setInAccount(ProjectCommon.IN_ACCOUNT2); - } - // 开票 - // 不需要开票 - if (Objects.equals(payPackCompanyOld.getNeedInvoice(), ProjectCommon.NEED_INVOICE0)) { - payPackCompany.setMakeInvoice(ProjectCommon.MAKE_INVOICE0); - } else { - // 开票金额 = 待确收金额 = 1 - if (invoice.compareTo(receivableAmount) == 0) { - payPackCompany.setMakeInvoice(ProjectCommon.MAKE_INVOICE1); + if(!Objects.isNull(projectStatusVO.getMakeInvoice())){ + payPackCompany.setMakeInvoice(projectStatusVO.getMakeInvoice()); } - // 开票金额 = 0 = 0 - if (invoice.compareTo(new BigDecimal("0.00")) == 0) { - payPackCompany.setMakeInvoice(ProjectCommon.MAKE_INVOICE0); - } - // 开票金额 > 0 && 开票金额 < 待确收金额 = 2 - if (invoice.compareTo(new BigDecimal("0.00")) > 0 && invoice.compareTo(receivableAmount) < 0) { - payPackCompany.setMakeInvoice(ProjectCommon.MAKE_INVOICE2); + if(!Objects.isNull(projectStatusVO.getAffirmIncome())){ + payPackCompany.setIncomeAffirm(projectStatusVO.getAffirmIncome()); } } + return payPackCompany; } } From 7fa91ed9b91d1eb3a2440616b923a471aeaf5125 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 7 Aug 2024 14:03:06 +0800 Subject: [PATCH 19/37] =?UTF-8?q?update=20=E4=BC=9A=E8=AE=AE=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=A2=9E=E5=8A=A0=E5=88=B0=E8=B4=A6=E7=8A=B6=E6=80=81?= =?UTF-8?q?=EF=BC=8C=E4=BC=81=E4=B8=9A=E7=BC=B4=E8=B4=B9=E5=87=AD=E8=AF=81?= =?UTF-8?q?=EF=BC=88=E6=9C=80=E6=96=B0=E4=B8=8A=E4=BC=A0=E7=9A=84=E7=BC=B4?= =?UTF-8?q?=E8=B4=B9=E5=87=AD=E8=AF=81=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PayMeetingSituationServiceImpl.java | 5 +++++ .../jero/meeting/vo/excel/CommitteeSituationExcel.java | 10 ++++++++++ .../jero/meeting/vo/excel/CouncilSituationExcel.java | 10 ++++++++++ .../meeting/vo/excel/DraftingGroupSituationExcel.java | 10 ++++++++++ .../meeting/vo/excel/InternationalSituationExcel.java | 9 +++++++++ .../com/jero/meeting/vo/excel/SituationBaseExcel.java | 4 ++-- .../java/com/jero/meeting/vo/excel/SituationExcel.java | 10 ++++++++++ .../jero/meeting/vo/excel/StandardsSituationExcel.java | 9 +++++++++ .../meeting/vo/excel/WorkingGroupSituationExcel.java | 10 ++++++++++ 9 files changed, 75 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 077b7c88..96d660ff 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -1792,6 +1792,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl Date: Wed, 7 Aug 2024 14:08:32 +0800 Subject: [PATCH 20/37] =?UTF-8?q?update=20=E8=B5=B7=E8=8D=89=E7=BB=84?= =?UTF-8?q?=E5=8F=82=E4=BC=9A=E4=BA=BA=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/excel/DraftingGroupSituationExcel.java | 33 ------------------- 1 file changed, 33 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/DraftingGroupSituationExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/DraftingGroupSituationExcel.java index b4a38fdd..5ace9bb8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/DraftingGroupSituationExcel.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/DraftingGroupSituationExcel.java @@ -49,37 +49,4 @@ public class DraftingGroupSituationExcel extends SituationBaseExcel { @Excel(name = "离开时间", width = 20, format = "yyyy-MM-dd") private java.util.Date departureTime; - /**邮寄联系人*/ - @Excel(name = "邮寄联系人", width = 15, dictTable = "pay_contacts_management", dicText = "name", dicCode = "id") - private String postContactId; - - /**邮寄联系人地址*/ - @Excel(name = "邮寄联系人地址", width = 15) - private String postContactAddress; - - /**邮编*/ - @Excel(name = "邮编", width = 15) - private String postCode; - - /**缴费方式*/ - @Excel(name = "缴费方式", width = 15,dicCode = "meeting_pay_type") - private Integer payMode; - - /**需要发票*/ - @Excel(name = "需要发票", width = 15,dicCode = "invoice_type") - private Integer needInvoice; - - /**缴费凭证*/ - @Excel(name = "缴费凭证", type = 2 ,width = 40 , height = 20) - private String paymentRecord; - - /**到账*/ - @ApiModelProperty(value = "到账") - @Excel(name = "是否到账", width = 15, dicCode = "account_type") - private Integer inAccount; - - /**订单后4位编码*/ - @Excel(name = "订单后4位编码", width = 15) - private String orderCode; - } From a323f1489361a8008ef30aff92e0e87e6a317135 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 7 Aug 2024 14:37:07 +0800 Subject: [PATCH 21/37] =?UTF-8?q?update=20=E5=B7=A5=E4=BD=9C=E7=BB=84?= =?UTF-8?q?=E6=88=90=E5=91=98=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E7=BC=B4=E8=B4=B9=E5=87=AD=E8=AF=81=EF=BC=88=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E4=B8=8A=E4=BC=A0=E7=9A=84=E7=BC=B4=E8=B4=B9=E5=87=AD?= =?UTF-8?q?=E8=AF=81=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayPaymentCheckController.java | 7 +------ .../service/IPayPaymentCheckService.java | 7 +++++++ .../impl/PayPaymentCheckServiceImpl.java | 10 ++++++++++ .../PayWorkingGroupSubItemController.java | 18 ++++++++++++++++++ .../project/entity/PayWorkingGroupSubItem.java | 2 +- .../vo/excel/PayWorkingGroupSubItemExcel.java | 9 +++++++++ 6 files changed, 46 insertions(+), 7 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java index 1c81741b..e9c4c544 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java @@ -133,12 +133,7 @@ public class PayPaymentCheckController extends JeroController getLastProof(String projectId) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PayPaymentRecordSub::getProjectId, projectId); - wrapper.isNotNull(PayPaymentRecordSub::getProof); - wrapper.orderByDesc(PayPaymentRecordSub::getCreateTime); - wrapper.last("limit 1"); - PayPaymentRecordSub sub = payPaymentCheckService.getOne(wrapper); + PayPaymentRecordSub sub = payPaymentCheckService.getLastProof(projectId); if (sub == null) { return Result.OK("无数据"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentCheckService.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentCheckService.java index 6e11d349..54d6e2e3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentCheckService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentCheckService.java @@ -55,4 +55,11 @@ public interface IPayPaymentCheckService extends IService { * @return */ String getPaymentStatus(BigDecimal amountReceivable, BigDecimal paidAmount, String paymentStatus, boolean changeReceivableAmountFlag); + + /** + * 获取最新一条缴费凭证 + * @param projectId + * @return + */ + PayPaymentRecordSub getLastProof(String projectId); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java index 092d640b..be52d209 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java @@ -782,4 +782,14 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayPaymentRecordSub::getProjectId, projectId); + wrapper.isNotNull(PayPaymentRecordSub::getProof); + wrapper.orderByDesc(PayPaymentRecordSub::getCreateTime); + wrapper.last("limit 1"); + return payPaymentCheckService.getOne(wrapper); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index 8684763f..f38cdfba 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -26,12 +26,16 @@ import com.jero.mail.entity.PayMailBill; import com.jero.mail.entity.PayMailBillProject; import com.jero.mail.service.IPayMailBillProjectService; import com.jero.mail.service.IPayMailBillService; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import com.jero.pack.entity.PayPackCompany; import com.jero.pack.entity.PayPackCompanyProject; import com.jero.pack.service.IPayPackCompanyProjectService; import com.jero.pack.service.IPayPackCompanyService; +import com.jero.payment.entity.PayPaymentRecordSub; +import com.jero.payment.service.IPayPaymentCheckService; import com.jero.project.common.PayProjectCommon; import com.jero.project.entity.AnnualDataLocking; import com.jero.project.entity.PayWorkingGroup; @@ -54,6 +58,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -108,6 +113,10 @@ public class PayWorkingGroupSubItemController extends JeroController listPayWorkingGroupSubItemContacts = payWorkingGroupSubItemContactsList.stream().filter(o->Objects.equals(workingGroupSubItem.getId(),o.getWorkingGroupSubId())).collect(Collectors.toList()); if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){ listPayWorkingGroupSubItemContacts.sort(Comparator.comparing(PayWorkingGroupSubItemContacts::getOrderNum)); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java index d54c5cb7..0a06a4fe 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java @@ -618,6 +618,6 @@ public class PayWorkingGroupSubItem implements Serializable { @ApiModelProperty(value = "是否审核（1：是，0：否") private Integer checkPaymentStatus; - @ApiModelProperty(value = "是否确认凭证（1：是，0：否") + @ApiModelProperty(value = "是否查看凭证（1：是，0：否") private Integer confirmVoucher; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java index a0c45376..d525679e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java @@ -40,6 +40,11 @@ public class PayWorkingGroupSubItemExcel implements Serializable { @Excel(name = "来款方式", width = 15, dicCode = "payment_type") @ApiModelProperty(value = "来款方式（1：无，2：合同，3：收费通知）") private Integer chargeWay; + + /**缴费凭证*/ + @Excel(name = "缴费凭证", type = 2 ,width = 40 , height = 20) + private String paymentRecord; + /** * 待确收金额（元） */ @@ -86,6 +91,10 @@ public class PayWorkingGroupSubItemExcel implements Serializable { @Excel(name = "需要发票", width = 15, dicCode = "invoice_type") @ApiModelProperty(value = "需要发票（1：增值税普通发票，2：增值税专用发票，0：否）") private Integer needInvoice; + + @ApiModelProperty(value = "是否查看凭证（1：是，0：否") + @Excel(name = "是否查看凭证", width = 15, dicCode = "yn") + private Integer confirmVoucher; /** * 备注 */ From 9db82c0b4dc684bd6b3fbaf7ed4e04945872fe45 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 7 Aug 2024 14:44:56 +0800 Subject: [PATCH 22/37] =?UTF-8?q?fix=2088082=20=E5=B7=A5=E4=BD=9C=E7=BB=84?= =?UTF-8?q?--=E5=B7=A5=E4=BD=9C=E7=BB=84=E6=88=90=E5=91=98=E7=9A=84?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E5=87=AD=E8=AF=81=E9=80=BB=E8=BE=91=E4=B8=8E?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E7=BC=B4=E8=B4=B9=E5=92=8C=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E6=B2=A1=E6=9C=89=E8=81=94=E5=8A=A8=EF=BC=8C=E8=AF=B7?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/common/constant/CommonConstant.java | 3 +++ .../jero/payment/service/impl/PayPaymentCheckServiceImpl.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/CommonConstant.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/CommonConstant.java index 9770c289..83d43329 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/CommonConstant.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/CommonConstant.java @@ -311,4 +311,7 @@ public interface CommonConstant { public final static String THIRD_LOGIN_CODE = "third_login_code"; public final static String ZERO = "0.00"; + + Integer YES = 1; + Integer NO = 0; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java index be52d209..e39f90ff 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.common.ProjectCommon; import com.jero.common.common.RoleCommon; +import com.jero.common.constant.CommonConstant; import com.jero.common.dto.SendMessageDTO; import com.jero.common.enums.CompanyMessageEnums; import com.jero.common.enums.LastSignEnum; @@ -237,6 +238,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl Date: Wed, 7 Aug 2024 14:56:52 +0800 Subject: [PATCH 23/37] =?UTF-8?q?=E3=80=90update=E3=80=91-=20=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E5=87=AD=E8=AF=81=20=E6=8C=89=E9=92=AEsql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/24年6月变更.sql | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/db/24年6月变更.sql b/db/24年6月变更.sql index a9a5c297..1452e152 100644 --- a/db/24年6月变更.sql +++ b/db/24年6月变更.sql @@ -225,4 +225,15 @@ alter table tb_member_project_subitem add post_contact_temporary_id varchar(150) null comment '邮寄联系人临时id' after post_contact_id; # 标协会员项目增加临时id alter table pay_pack_company - add mail_contact_temporary_id varchar(150) null comment '邮寄联系人临时id' after mail_contacts_id; \ No newline at end of file + add mail_contact_temporary_id varchar(150) null comment '邮寄联系人临时id' after mail_contacts_id; + +-- 20240807 工作组成员单位 审核凭证修改成查看凭证 +UPDATE sys_permission SET parent_id='1431167539278086146', name='查看凭证' WHERE id='1808440661174550530' +-- 20240807 会议 查看凭证 按钮 +INSERT INTO `income_payments_test`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808440661174550530', '1431167539278086146', '查看凭证', NULL, NULL, NULL, NULL, 2, 'workingGroupMember:confirmVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-03 18:00:27', 'LKGLZ', '2024-08-07 14:45:43', 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1821076019175383042', '1443460205023940610', '查看凭证', NULL, NULL, NULL, NULL, 2, 'otherMeetingSituation:lookVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-08-07 14:48:52', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1821076182862290946', '1443461591480487938', '查看凭证', NULL, NULL, NULL, NULL, 2, 'committeeMeetingSituation:lookVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-08-07 14:49:31', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1821076336449314817', '1433322232030777345', '查看凭证', NULL, NULL, NULL, NULL, 2, 'internalMeetingSituation:lookVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-08-07 14:50:07', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1821076500849254402', '1470954992463327234', '查看凭证', NULL, NULL, NULL, NULL, 2, 'councilMeetingSituation:lookVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-08-07 14:50:46', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1821077226275102721', '1443470901166039042', '查看凭证', NULL, NULL, NULL, NULL, 2, 'standardsMeetingSituation:lookVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-08-07 14:53:39', NULL, NULL, 0, 0, '1', 0, 1); + From bf56171083a499e70482c18323d2c661cbb8edd8 Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Wed, 7 Aug 2024 15:26:12 +0800 Subject: [PATCH 24/37] =?UTF-8?q?=E3=80=90update=E3=80=91-=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E6=B1=87=E6=80=BB=E6=94=B9=E5=90=8D=E4=B8=BA=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E4=BF=A1=E6=81=AF=E7=BB=9F=E8=AE=A1=EF=BC=8C=E6=94=BE?= =?UTF-8?q?=E5=9C=A8=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E4=B8=AD=EF=BC=8C?= =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E9=85=92=E5=BA=97=E6=8E=A8=E8=8D=90=E5=8D=95?= =?UTF-8?q?=E7=8B=AC=E5=87=BA=E8=8F=9C=E5=8D=95sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/24年6月变更.sql | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/db/24年6月变更.sql b/db/24年6月变更.sql index 1452e152..621beffe 100644 --- a/db/24年6月变更.sql +++ b/db/24年6月变更.sql @@ -237,3 +237,7 @@ INSERT INTO `income_payments_test`.`sys_permission`(`id`, `parent_id`, `name`, ` INSERT INTO `income_payments_test`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1821076500849254402', '1470954992463327234', '查看凭证', NULL, NULL, NULL, NULL, 2, 'councilMeetingSituation:lookVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-08-07 14:50:46', NULL, NULL, 0, 0, '1', 0, 1); INSERT INTO `income_payments_test`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1821077226275102721', '1443470901166039042', '查看凭证', NULL, NULL, NULL, NULL, 2, 'standardsMeetingSituation:lookVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-08-07 14:53:39', NULL, NULL, 0, 0, '1', 0, 1); +-- 会议酒店推荐调整菜单层级 增加菜单。会议汇总 修改成 会议信息统计 +DELETE FROM sys_permission where id = '1812785413516914690'; +UPDATE sys_permission SET menu_type = 0 , parent_id = NULL, sort_no = 4.2, icon = 'fund',hidden = 0 WHERE id = '1808757213186904065'; +UPDATE sys_permission SET `name`= '会议信息统计', menu_type = 1 , parent_id = '1437320526513905666', icon = NULL, sort_no = 14.00 WHERE id = '1626061755230580738'; From dbc5cdb12f30827bdd1d4a0f1c287b59d7840e00 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 7 Aug 2024 15:47:34 +0800 Subject: [PATCH 25/37] =?UTF-8?q?fix=20=E5=A4=84=E7=90=86=E6=A0=87?= =?UTF-8?q?=E5=8D=8F=E4=BC=9A=E5=91=98=E6=9C=AA=E7=BC=B4=E8=B4=B9=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/24年6月变更.sql | 3 +++ .../jero/payment/service/impl/PayPaymentCheckServiceImpl.java | 2 ++ .../jero/payment/service/impl/PayPaymentRecordServiceImpl.java | 2 ++ 3 files changed, 7 insertions(+) diff --git a/db/24年6月变更.sql b/db/24年6月变更.sql index 621beffe..a274ad40 100644 --- a/db/24年6月变更.sql +++ b/db/24年6月变更.sql @@ -241,3 +241,6 @@ INSERT INTO `income_payments_test`.`sys_permission`(`id`, `parent_id`, `name`, ` DELETE FROM sys_permission where id = '1812785413516914690'; UPDATE sys_permission SET menu_type = 0 , parent_id = NULL, sort_no = 4.2, icon = 'fund',hidden = 0 WHERE id = '1808757213186904065'; UPDATE sys_permission SET `name`= '会议信息统计', menu_type = 1 , parent_id = '1437320526513905666', icon = NULL, sort_no = 14.00 WHERE id = '1626061755230580738'; + +-- 处理标协会员未缴费历史数据 +update tb_member_project_subitem set member_status = 3 where member_status != 3 and payment_status = 'completed'; \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java index e39f90ff..70b444d2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java @@ -24,6 +24,7 @@ import com.jero.config.StaticConfig; import com.jero.contract.common.PayIncomeContractCommon; import com.jero.meeting.mapper.PayMeetingSituationMapper; import com.jero.member.entity.*; +import com.jero.member.enums.MemberStatusEnum; import com.jero.member.mapper.PayMemberProjectSubitemMapper; import com.jero.member.mapper.TbCertificatePaymentMapper; import com.jero.member.mapper.TbMemberProjectSubitemMapper; @@ -269,6 +270,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl Date: Wed, 7 Aug 2024 15:47:49 +0800 Subject: [PATCH 26/37] =?UTF-8?q?=E3=80=90update=E3=80=91-=20=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=89=E5=85=A8=E4=B8=AD=E5=BF=83=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E4=B8=AD=E5=A2=9E=E5=8A=A0=20=E6=B1=BD=E8=BD=A62=E5=AD=97sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/24年6月变更.sql | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/db/24年6月变更.sql b/db/24年6月变更.sql index a274ad40..b4c3f596 100644 --- a/db/24年6月变更.sql +++ b/db/24年6月变更.sql @@ -237,10 +237,16 @@ INSERT INTO `income_payments_test`.`sys_permission`(`id`, `parent_id`, `name`, ` INSERT INTO `income_payments_test`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1821076500849254402', '1470954992463327234', '查看凭证', NULL, NULL, NULL, NULL, 2, 'councilMeetingSituation:lookVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-08-07 14:50:46', NULL, NULL, 0, 0, '1', 0, 1); INSERT INTO `income_payments_test`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1821077226275102721', '1443470901166039042', '查看凭证', NULL, NULL, NULL, NULL, 2, 'standardsMeetingSituation:lookVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-08-07 14:53:39', NULL, NULL, 0, 0, '1', 0, 1); --- 会议酒店推荐调整菜单层级 增加菜单。会议汇总 修改成 会议信息统计 +-- 20240807 会议酒店推荐调整菜单层级 增加菜单。会议汇总 修改成 会议信息统计 DELETE FROM sys_permission where id = '1812785413516914690'; UPDATE sys_permission SET menu_type = 0 , parent_id = NULL, sort_no = 4.2, icon = 'fund',hidden = 0 WHERE id = '1808757213186904065'; UPDATE sys_permission SET `name`= '会议信息统计', menu_type = 1 , parent_id = '1437320526513905666', icon = NULL, sort_no = 14.00 WHERE id = '1626061755230580738'; +-- 20240807 功能安全中心菜单中增加 汽车2字 +UPDATE sys_permission SET `name`= '汽车功能安全中心' WHERE id = '1802631077112610817'; +UPDATE sys_permission SET `name`= '汽车功能安全中心成员维护' WHERE id = '1802967227660554241'; +UPDATE sys_permission SET `name`= '汽车功能安全中心参会情况' WHERE id = '1802969401866113025'; +UPDATE sys_permission SET `name`= '汽车功能安全中心会议维护' WHERE id = '1802970571397451777'; +UPDATE sys_permission SET `name`= '汽车功能安全中心会议' WHERE id = '1808094888670056450'; -- 处理标协会员未缴费历史数据 -update tb_member_project_subitem set member_status = 3 where member_status != 3 and payment_status = 'completed'; \ No newline at end of file +update tb_member_project_subitem set member_status = 3 where member_status != 3 and payment_status = 'completed'; From e2964901ccd34eae27c9a276bcf1dd1c9609bda5 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 7 Aug 2024 15:53:59 +0800 Subject: [PATCH 27/37] =?UTF-8?q?Revert=20"Revert=20"fix=20=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E6=8A=A5=E5=90=8D=E6=88=90=E5=8A=9F=E5=90=8E=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E9=9C=80=E8=A6=81=E5=AE=A1=E6=A0=B8""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 029c617aba483f2be0132f62b72816d5432f981b. --- .../meeting/service/impl/PayMeetingSituationServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 96d660ff..371909ac 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -376,8 +376,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl Date: Wed, 7 Aug 2024 16:30:44 +0800 Subject: [PATCH 28/37] =?UTF-8?q?update=20=E6=A0=87=E5=8D=8F=E4=BC=9A?= =?UTF-8?q?=E5=91=98=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=80=9F=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TbMemberProjectSubitemController.java | 10 ++++++++++ .../com/jero/member/entity/TbMemberProjectSubitem.java | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java index 9cdce667..4a681a14 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java @@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.vo.Result; +import com.jero.common.constant.CommonConstant; import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.query.QueryGenerator; @@ -27,6 +28,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.member.vo.*; +import com.jero.project.common.PayProjectCommon; import com.jero.temporary.entity.PayCompanyManagementTemporary; import com.jero.temporary.entity.PayContactsManagementTemporary; import com.jero.temporary.service.IPayCompanyManagementTemporaryService; @@ -325,6 +327,14 @@ public class TbMemberProjectSubitemController extends JeroController Date: Wed, 7 Aug 2024 17:29:08 +0800 Subject: [PATCH 29/37] =?UTF-8?q?update=20=E8=B5=B7=E8=8D=89=E7=BB=84?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0=E5=88=B0?= =?UTF-8?q?20=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayDraftingGroupSubItemController.java | 66 ++++- .../entity/PayDraftingGroupSubItem.java | 251 ++++++++++++++++++ .../PayDraftingGroupSubItemServiceImpl.java | 101 +++++++ .../vo/PayDraftingGroupSubItemExcel.java | 202 ++++++++++++++ ...PayContactsManagementTemporaryService.java | 2 + ...ontactsManagementTemporaryServiceImpl.java | 11 + 6 files changed, 625 insertions(+), 8 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java index 2577bfab..ef596a62 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java @@ -431,22 +431,21 @@ public class PayDraftingGroupSubItemController extends JeroController listIds = listPayDraftingGroupSubItemContacts.stream().map(PayDraftingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); // 拿到所有联系人信息对应的详情信息 - List listPayContactsManagementTemporary = payContactsManagementTemporaryService.listByIds(listIds); for (int i = 0; i < listPayDraftingGroupSubItemContacts.size(); i++) { - PayDraftingGroupSubItemContacts payDraftingGroupSubItemContacts = listPayDraftingGroupSubItemContacts.get(i); + PayDraftingGroupSubItemContacts contacts = listPayDraftingGroupSubItemContacts.get(i); // 拿到该联系人的详情信息 - List temporary = listPayContactsManagementTemporary.stream().filter(s->Objects.equals(s.getId(),payDraftingGroupSubItemContacts.getContactsTemporaryId())).collect(Collectors.toList()); + PayContactsManagementTemporary temporary = payContactsManagementTemporaryService.getByAllTable(contacts.getContactsId(), contacts.getContactsTemporaryId()); String email = ""; String phone = ""; - String name = payDraftingGroupSubItemContacts.getContactsTemporaryName(); - String remark = payDraftingGroupSubItemContacts.getRemarks(); - if(!CollectionUtils.isEmpty(temporary)){ - email = temporary.get(0).getEmail(); + String name = contacts.getContactsTemporaryName(); + String remark = contacts.getRemarks(); + if(temporary != null){ + email = temporary.getEmail(); // 解密 if (StringUtils.isNotBlank(email)){ email = PasswordUtil.decrypt(email); } - phone = temporary.get(0).getPhone(); + phone = temporary.getPhone(); if (StringUtils.isNotBlank(phone)){ phone = PasswordUtil.decrypt(phone); } @@ -512,6 +511,57 @@ public class PayDraftingGroupSubItemController extends JeroController listContactsName11 = list.stream().map(PayDraftingGroupSubItem::getContactsName11).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName11)){ + listContactsName.addAll(listContactsName11); + } + // 获取excel中联系人12名称 + List listContactsName12 = list.stream().map(PayDraftingGroupSubItem::getContactsName12).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName12)){ + listContactsName.addAll(listContactsName12); + } + // 获取excel中联系人13名称 + List listContactsName13 = list.stream().map(PayDraftingGroupSubItem::getContactsName13).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName13)){ + listContactsName.addAll(listContactsName13); + } + // 获取excel中联系人14名称 + List listContactsName14 = list.stream().map(PayDraftingGroupSubItem::getContactsName14).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName14)){ + listContactsName.addAll(listContactsName14); + } + // 获取excel中联系人15名称 + List listContactsName15 = list.stream().map(PayDraftingGroupSubItem::getContactsName15).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName15)){ + listContactsName.addAll(listContactsName15); + } + // 获取excel中联系人16名称 + List listContactsName16 = list.stream().map(PayDraftingGroupSubItem::getContactsName16).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName16)){ + listContactsName.addAll(listContactsName16); + } + // 获取excel中联系人17名称 + List listContactsName17 = list.stream().map(PayDraftingGroupSubItem::getContactsName17).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName17)){ + listContactsName.addAll(listContactsName17); + } + // 获取excel中联系人18名称 + List listContactsName18 = list.stream().map(PayDraftingGroupSubItem::getContactsName18).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName18)){ + listContactsName.addAll(listContactsName18); + } + // 获取excel中联系人19名称 + List listContactsName19 = list.stream().map(PayDraftingGroupSubItem::getContactsName19).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName19)){ + listContactsName.addAll(listContactsName19); + } + // 获取excel中联系人20名称 + List listContactsName20 = list.stream().map(PayDraftingGroupSubItem::getContactsName20).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName20)){ + listContactsName.addAll(listContactsName20); + } // 获取excel联系人信息 LambdaQueryWrapper contactsWrapper = new LambdaQueryWrapper<>(); contactsWrapper.in(PayContactsManagement::getName,listContactsName); @@ -686,6 +737,16 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl listByIds (List contactsId); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayContactsManagementTemporaryServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayContactsManagementTemporaryServiceImpl.java index 94070164..8ad15004 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayContactsManagementTemporaryServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayContactsManagementTemporaryServiceImpl.java @@ -101,4 +101,15 @@ public class PayContactsManagementTemporaryServiceImpl extends ServiceImpl listByIds(List contactsId) { + List temporaryList = super.listByIds(contactsId); + List payContactsManagements = payContactsManagementService.listByIds(contactsId); + for (PayContactsManagement contactsManagement : payContactsManagements) { + String str = JSONObject.toJSONString(contactsManagement); + temporaryList.add(JSON.parseObject(str, PayContactsManagementTemporary.class)); + } + return temporaryList; + } } From 9a8347fe3a657fb4263e8ca25d2347188f2bd98e Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 7 Aug 2024 17:44:48 +0800 Subject: [PATCH 30/37] =?UTF-8?q?update=20=E5=B7=A5=E4=BD=9C=E7=BB=84?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0=E5=88=B0?= =?UTF-8?q?20=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayWorkingGroupSubItemController.java | 50 ++++ .../entity/PayWorkingGroupSubItem.java | 251 ++++++++++++++++++ .../PayWorkingGroupSubItemServiceImpl.java | 95 +++++++ .../vo/excel/PayWorkingGroupSubItemExcel.java | 201 ++++++++++++++ 4 files changed, 597 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index f38cdfba..5f6f7065 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -915,6 +915,56 @@ public class PayWorkingGroupSubItemController extends JeroController listContactsName11 = list.stream().map(PayWorkingGroupSubItem::getContactsName11).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName11)){ + listContactsName.addAll(listContactsName11); + } + // 获取excel中联系人12名称 + List listContactsName12 = list.stream().map(PayWorkingGroupSubItem::getContactsName12).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName12)){ + listContactsName.addAll(listContactsName12); + } + // 获取excel中联系人13名称 + List listContactsName13 = list.stream().map(PayWorkingGroupSubItem::getContactsName13).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName13)){ + listContactsName.addAll(listContactsName13); + } + // 获取excel中联系人14名称 + List listContactsName14 = list.stream().map(PayWorkingGroupSubItem::getContactsName14).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName14)){ + listContactsName.addAll(listContactsName14); + } + // 获取excel中联系人15名称 + List listContactsName15 = list.stream().map(PayWorkingGroupSubItem::getContactsName15).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName15)){ + listContactsName.addAll(listContactsName15); + } + // 获取excel中联系人16名称 + List listContactsName16 = list.stream().map(PayWorkingGroupSubItem::getContactsName16).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName16)){ + listContactsName.addAll(listContactsName16); + } + // 获取excel中联系人17名称 + List listContactsName17 = list.stream().map(PayWorkingGroupSubItem::getContactsName17).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName17)){ + listContactsName.addAll(listContactsName17); + } + // 获取excel中联系人18名称 + List listContactsName18 = list.stream().map(PayWorkingGroupSubItem::getContactsName18).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName18)){ + listContactsName.addAll(listContactsName18); + } + // 获取excel中联系人19名称 + List listContactsName19 = list.stream().map(PayWorkingGroupSubItem::getContactsName19).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName19)){ + listContactsName.addAll(listContactsName19); + } + // 获取excel中联系人20名称 + List listContactsName20 = list.stream().map(PayWorkingGroupSubItem::getContactsName20).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName20)){ + listContactsName.addAll(listContactsName20); + } // 获取excel中邮寄联系人名称 List listContactsNameMail = list.stream().map(PayWorkingGroupSubItem::getMailContactsTemporaryName).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(listContactsNameMail)) { @@ -905,6 +958,8 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl Date: Thu, 8 Aug 2024 09:41:15 +0800 Subject: [PATCH 31/37] =?UTF-8?q?fix=2088102=20=E4=BC=81=E4=B8=9A=E7=AB=AF?= =?UTF-8?q?--=E6=8A=A5=E5=90=8D=E5=90=8E=E7=BC=96=E8=BE=91=E7=BC=B4?= =?UTF-8?q?=E8=B4=B9=E6=96=B9=E5=BC=8F--=E5=88=B0=E8=B4=A6=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=E7=9A=84=E7=BC=B4=E8=B4=B9=E5=87=AD=E8=AF=81=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/service/impl/PayMeetingSituationServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 371909ac..c797ac3c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -1438,8 +1438,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl Date: Thu, 8 Aug 2024 15:35:10 +0800 Subject: [PATCH 32/37] =?UTF-8?q?update=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83=E7=9A=84=E5=AF=BC=E5=85=A5=E3=80=81?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E3=80=81=E4=B8=8B=E8=BD=BD=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=92=8C=E8=B5=B7=E8=8D=89=E7=BB=84=E4=B8=80?= =?UTF-8?q?=E8=87=B4=EF=BC=8C=E4=BC=81=E4=B8=9A=E8=81=94=E7=B3=BB=E4=BA=BA?= =?UTF-8?q?=E6=9C=80=E5=A4=9A=E5=8F=AF=E4=BB=A5=E5=A2=9E=E5=8A=A020?= =?UTF-8?q?=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SafetyCenterSubitemController.java | 48 +- .../service/SafetyCenterSubitemService.java | 36 +- .../vo/SafetyCenterSubitemExcel.java | 441 ++++++++++++++++++ .../vo/SafetyCenterSubitemImport.java | 404 +++++++++++++++- 4 files changed, 909 insertions(+), 20 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/vo/SafetyCenterSubitemExcel.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java index 532f9091..281e6650 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java @@ -1,5 +1,12 @@ package com.jero.functionalsafetycenter.controller; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import cn.hutool.core.collection.CollStreamUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.collection.IterUtil; +import cn.hutool.core.collection.ListUtil; +import cn.hutool.core.util.ObjUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -11,11 +18,16 @@ import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; +import com.jero.common.util.PasswordUtil; import com.jero.common.util.oConvertUtils; +import com.jero.company.entity.PayContactsManagement; +import com.jero.company.service.IPayContactsManagementService; import com.jero.functionalsafetycenter.entity.SafetyCenter; import com.jero.functionalsafetycenter.entity.SafetyCenterSubitem; +import com.jero.functionalsafetycenter.entity.SafetyCenterSubitemContacts; import com.jero.functionalsafetycenter.service.SafetyCenterService; import com.jero.functionalsafetycenter.service.SafetyCenterSubitemService; +import com.jero.functionalsafetycenter.vo.SafetyCenterSubitemExcel; import com.jero.functionalsafetycenter.vo.SafetyCenterSubitemImport; import com.jero.project.entity.PayWorkingGroup; import com.jero.project.entity.PayWorkingGroupSubItem; @@ -25,6 +37,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -32,9 +45,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; /** @@ -55,6 +66,8 @@ public class SafetyCenterSubitemController extends JeroController list = new ArrayList<>(); + + for (SafetyCenterSubitem subitem : exportList) { + Map map = new HashMap<>(); + map.put("companyId",subitem.getCompanyId()); + map.put("remarks",subitem.getRemarks()); + List contactsList = subitem.getContactsList(); + List contactsIdList = contactsList.stream().map(SafetyCenterSubitemContacts::getContactsId).collect(Collectors.toList()); + List contactsManagementList = contactsManagementService.listByIds(contactsIdList); + Map stringPayContactsManagementMap = CollStreamUtil.toIdentityMap(contactsManagementList, PayContactsManagement::getId); + int i = 1; + for (SafetyCenterSubitemContacts contacts : contactsList) { + String contactsId = contacts.getContactsId(); + PayContactsManagement contactsManagement = stringPayContactsManagementMap.get(contactsId); + map.put("contactsName"+i, contactsManagement.getName()); + map.put("contactsPhone"+i, PasswordUtil.decrypt(contactsManagement.getPhone())); + map.put("contactsEmail"+i, PasswordUtil.decrypt(contactsManagement.getEmail())); + map.put("remarks"+i,contacts.getRemarks()); + i++; + } + CopyOptions copyOptions = new CopyOptions(); + SafetyCenterSubitemExcel safetyCenterSubitemExcel = BeanUtil.mapToBean(map, SafetyCenterSubitemExcel.class, false, copyOptions); + list.add(safetyCenterSubitemExcel); + } + return super.exportListXls(list, SafetyCenterSubitemExcel.class, "功能安全中心成员"); } /** @@ -226,7 +264,7 @@ public class SafetyCenterSubitemController extends JeroController errorMessage = new ArrayList<>(); List companyNameList = new ArrayList<>(); - int errorRowNum = 3; - int errorRowNum2 = 3; + int errorRowNum = 2; for (Object obj : excelData) { errorRowNum += 1; SafetyCenterSubitemImport subitemImport = (SafetyCenterSubitemImport) obj; String companyName = subitemImport.getCompanyName(); - List contactsList = subitemImport.getContactsList(); + Map map = BeanUtil.beanToMap(subitemImport); + List contactsList = new ArrayList<>(); + for (int i = 1; i < 21; i++) { + SafetyCenterSubitemContactsImport contactsImport = new SafetyCenterSubitemContactsImport(); + String s = (String) map.get("contactsName" + i); + if (s == null){ + continue; + } + String s1 = (String) map.get("remarks"+i); + contactsImport.setContacts(s); + contactsImport.setRemarks(s1); + contactsList.add(contactsImport); + } PayCompanyManagement company = null; if (StringUtils.isBlank(companyName)){ @@ -318,12 +332,10 @@ public class SafetyCenterSubitemService extends ServiceImpl parentContactList = contactsService.listBySubitemId(parentCenterSubitemId); parentContactIdList = parentContactList.stream().map(SafetyCenterSubitemContacts::getContactsId).distinct().collect(Collectors.toList()); } - errorRowNum += contactsList.size() -1; - List distinctContactsList = new ArrayList<>(); List subitemContactsList = new ArrayList<>(); for (SafetyCenterSubitemContactsImport contactsImport : contactsList) { - errorRowNum2 += 1; String contacts = contactsImport.getContacts(); if (StringUtils.isBlank(contacts)){ - errorMessage.add("第" + errorRowNum2 + "行：企业联系人不能为空"); + errorMessage.add("第" + errorRowNum + "行：企业联系人不能为空"); continue; } PayContactsManagement payContactsManagement = payContactsManagementService.checkByCompanyIdAndName(contacts, companyId); if (payContactsManagement == null){ - errorMessage.add("第" + errorRowNum2 + "行：企业联系人不存在"); + errorMessage.add("第" + errorRowNum + "行：企业联系人"+contacts+"不存在"); continue; } if (distinctContactsList.contains(contacts)){ - errorMessage.add("第" + errorRowNum2 + "行：企业联系人重复"); + errorMessage.add("第" + errorRowNum + "行：企业联系人"+contacts+"重复"); continue; }else { distinctContactsList.add(contacts); @@ -383,13 +391,13 @@ public class SafetyCenterSubitemService extends ServiceImpl 50){ - errorMessage.add("第" + errorRowNum2 + "行：企业联系人备注最长为50字符"); + errorMessage.add("第" + errorRowNum + "行：企业联系人"+contacts+"备注最长为50字符"); continue; } SafetyCenterSubitemContacts contacts1 = new SafetyCenterSubitemContacts(); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/vo/SafetyCenterSubitemExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/vo/SafetyCenterSubitemExcel.java new file mode 100644 index 00000000..c3790e81 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/vo/SafetyCenterSubitemExcel.java @@ -0,0 +1,441 @@ +package com.jero.functionalsafetycenter.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @Description: pay_working_group_subitem + * @Author: jeecg-boot + * @Date: 2021-08-27 + * @Version: V1.0 + */ +@Data +public class SafetyCenterSubitemExcel implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 成员单位id + */ + @TableField(value = "company_id") + @ApiModelProperty(value = "成员单位id") + @Excel(name = "成员单位", width = 15, dictTable = "pay_company_management", dicText = "company_name", dicCode = "id", needMerge = true) + @Dict(dictTable = "pay_company_management", dicText = "company_name", dicCode = "id") + private String companyId; + + /** + * 备注 + */ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private String remarks; + /** + * 企业联系人名称1 + */ + @Excel(name = "企业联系人1", width = 15) + private String contactsName1; + /** + * 企业联系人手机号1 + */ + @Excel(name = "企业联系人手机号1", width = 17) + private String contactsPhone1; + /** + * 企业联系人邮箱1 + */ + @Excel(name = "企业联系人邮箱1", width = 15) + private String contactsEmail1; + /** + * 联系人备注1 + */ + @Excel(name = "联系人备注1", width = 15) + private String remarks1; + /** + * 企业联系人名称2 + */ + @Excel(name = "企业联系人2", width = 15) + private String contactsName2; + /** + * 企业联系人手机号2 + */ + @Excel(name = "企业联系人手机号2", width = 17) + private String contactsPhone2; + /** + * 企业联系人邮箱2 + */ + @Excel(name = "企业联系人邮箱2", width = 15) + private String contactsEmail2; + /** + * 联系人备注2 + */ + @Excel(name = "联系人备注2", width = 15) + private String remarks2; + /** + * 企业联系人名称3 + */ + @Excel(name = "企业联系人3", width = 15) + private String contactsName3; + /** + * 企业联系人手机号3 + */ + @Excel(name = "企业联系人手机号3", width = 17) + private String contactsPhone3; + /** + * 企业联系人邮箱3 + */ + @Excel(name = "企业联系人邮箱3", width = 15) + private String contactsEmail3; + /** + * 联系人备注3 + */ + @Excel(name = "联系人备注3", width = 15) + private String remarks3; + /** + * 企业联系人名称4 + */ + @Excel(name = "企业联系人4", width = 15) + private String contactsName4; + /** + * 企业联系人手机号4 + */ + @Excel(name = "企业联系人手机号4", width = 17) + private String contactsPhone4; + /** + * 企业联系人邮箱4 + */ + @Excel(name = "企业联系人邮箱4", width = 15) + private String contactsEmail4; + /** + * 联系人备注4 + */ + @Excel(name = "联系人备注4", width = 15) + private String remarks4; + /** + * 企业联系人名称5 + */ + @Excel(name = "企业联系人5", width = 15) + private String contactsName5; + /** + * 企业联系人手机号5 + */ + @Excel(name = "企业联系人手机号5", width = 17) + private String contactsPhone5; + /** + * 企业联系人邮箱5 + */ + @Excel(name = "企业联系人邮箱5", width = 15) + private String contactsEmail5; + /** + * 联系人备注5 + */ + @Excel(name = "联系人备注5", width = 15) + private String remarks5; + /** + * 企业联系人名称6 + */ + @Excel(name = "企业联系人6", width = 15) + private String contactsName6; + /** + * 企业联系人手机号6 + */ + @Excel(name = "企业联系人手机号6", width = 17) + private String contactsPhone6; + /** + * 企业联系人邮箱6 + */ + @Excel(name = "企业联系人邮箱6", width = 15) + private String contactsEmail6; + /** + * 联系人备注6 + */ + @Excel(name = "联系人备注6", width = 15) + private String remarks6; + /** + * 企业联系人名称7 + */ + @Excel(name = "企业联系人7", width = 15) + private String contactsName7; + /** + * 企业联系人手机号7 + */ + @Excel(name = "企业联系人手机号7", width = 17) + private String contactsPhone7; + /** + * 企业联系人邮箱7 + */ + @Excel(name = "企业联系人邮箱7", width = 15) + private String contactsEmail7; + /** + * 联系人备注7 + */ + @Excel(name = "联系人备注7", width = 15) + private String remarks7; + /** + * 企业联系人名称8 + */ + @Excel(name = "企业联系人8", width = 15) + private String contactsName8; + /** + * 企业联系人手机号8 + */ + @Excel(name = "企业联系人手机号8", width = 17) + private String contactsPhone8; + /** + * 企业联系人邮箱8 + */ + @Excel(name = "企业联系人邮箱8", width = 15) + private String contactsEmail8; + /** + * 联系人备注8 + */ + @Excel(name = "联系人备注8", width = 15) + private String remarks8; + /** + * 企业联系人名称9 + */ + @Excel(name = "企业联系人9", width = 15) + private String contactsName9; + /** + * 企业联系人手机号9 + */ + @Excel(name = "企业联系人手机号9", width = 17) + private String contactsPhone9; + /** + * 企业联系人邮箱9 + */ + @Excel(name = "企业联系人邮箱9", width = 15) + private String contactsEmail9; + /** + * 联系人备注9 + */ + @Excel(name = "联系人备注9", width = 15) + private String remarks9; + /** + * 企业联系人名称10 + */ + @Excel(name = "企业联系人10", width = 15) + private String contactsName10; + /** + * 企业联系人手机号10 + */ + @Excel(name = "企业联系人手机号10", width = 17) + private String contactsPhone10; + /** + * 企业联系人邮箱10 + */ + @Excel(name = "企业联系人邮箱10", width = 15) + private String contactsEmail10; + /** + * 联系人备注10 + */ + @Excel(name = "联系人备注10", width = 15) + private String remarks10; + + /** + * 企业联系人名称11 + */ + @Excel(name = "企业联系人11", width = 15) + private String contactsName11; + /** + * 企业联系人手机号11 + */ + @Excel(name = "企业联系人手机号11", width = 17) + private String contactsPhone11; + /** + * 企业联系人邮箱11 + */ + @Excel(name = "企业联系人邮箱11", width = 15) + private String contactsEmail11; + /** + * 联系人备注11 + */ + @Excel(name = "联系人备注11", width = 15) + private String remarks11; + /** + * 企业联系人名称12 + */ + @Excel(name = "企业联系人12", width = 15) + private String contactsName12; + /** + * 企业联系人手机号12 + */ + @Excel(name = "企业联系人手机号12", width = 17) + private String contactsPhone12; + /** + * 企业联系人邮箱12 + */ + @Excel(name = "企业联系人邮箱12", width = 15) + private String contactsEmail12; + /** + * 联系人备注12 + */ + @Excel(name = "联系人备注12", width = 15) + private String remarks12; + /** + * 企业联系人名称13 + */ + @Excel(name = "企业联系人13", width = 15) + private String contactsName13; + /** + * 企业联系人手机号13 + */ + @Excel(name = "企业联系人手机号13", width = 17) + private String contactsPhone13; + /** + * 企业联系人邮箱13 + */ + @Excel(name = "企业联系人邮箱13", width = 15) + private String contactsEmail13; + /** + * 联系人备注13 + */ + @Excel(name = "联系人备注13", width = 15) + private String remarks13; + /** + * 企业联系人名称14 + */ + @Excel(name = "企业联系人14", width = 15) + private String contactsName14; + /** + * 企业联系人手机号14 + */ + @Excel(name = "企业联系人手机号14", width = 17) + private String contactsPhone14; + /** + * 企业联系人邮箱14 + */ + @Excel(name = "企业联系人邮箱14", width = 15) + private String contactsEmail14; + /** + * 联系人备注14 + */ + @Excel(name = "联系人备注14", width = 15) + private String remarks14; + /** + * 企业联系人名称15 + */ + @Excel(name = "企业联系人15", width = 15) + private String contactsName15; + /** + * 企业联系人手机号15 + */ + @Excel(name = "企业联系人手机号15", width = 17) + private String contactsPhone15; + /** + * 企业联系人邮箱15 + */ + @Excel(name = "企业联系人邮箱15", width = 15) + private String contactsEmail15; + /** + * 联系人备注15 + */ + @Excel(name = "联系人备注15", width = 15) + private String remarks15; + /** + * 企业联系人名称16 + */ + @Excel(name = "企业联系人16", width = 15) + private String contactsName16; + /** + * 企业联系人手机号16 + */ + @Excel(name = "企业联系人手机号16", width = 17) + private String contactsPhone16; + /** + * 企业联系人邮箱16 + */ + @Excel(name = "企业联系人邮箱16", width = 15) + private String contactsEmail16; + /** + * 联系人备注16 + */ + @Excel(name = "联系人备注16", width = 15) + private String remarks16; + /** + * 企业联系人名称17 + */ + @Excel(name = "企业联系人17", width = 15) + private String contactsName17; + /** + * 企业联系人手机号17 + */ + @Excel(name = "企业联系人手机号17", width = 17) + private String contactsPhone17; + /** + * 企业联系人邮箱17 + */ + @Excel(name = "企业联系人邮箱17", width = 15) + private String contactsEmail17; + /** + * 联系人备注17 + */ + @Excel(name = "联系人备注17", width = 15) + private String remarks17; + /** + * 企业联系人名称18 + */ + @Excel(name = "企业联系人18", width = 15) + private String contactsName18; + /** + * 企业联系人手机号18 + */ + @Excel(name = "企业联系人手机号18", width = 17) + private String contactsPhone18; + /** + * 企业联系人邮箱18 + */ + @Excel(name = "企业联系人邮箱18", width = 15) + private String contactsEmail18; + /** + * 联系人备注18 + */ + @Excel(name = "联系人备注18", width = 15) + private String remarks18; + /** + * 企业联系人名称19 + */ + @Excel(name = "企业联系人19", width = 15) + private String contactsName19; + /** + * 企业联系人手机号19 + */ + @Excel(name = "企业联系人手机号19", width = 17) + private String contactsPhone19; + /** + * 企业联系人邮箱19 + */ + @Excel(name = "企业联系人邮箱19", width = 15) + private String contactsEmail19; + /** + * 联系人备注19 + */ + @Excel(name = "联系人备注19", width = 15) + private String remarks19; + /** + * 企业联系人名称20 + */ + @Excel(name = "企业联系人20", width = 15) + private String contactsName20; + /** + * 企业联系人手机号20 + */ + @Excel(name = "企业联系人手机号20", width = 17) + private String contactsPhone20; + /** + * 企业联系人邮箱20 + */ + @Excel(name = "企业联系人邮箱20", width = 15) + private String contactsEmail20; + /** + * 联系人备注20 + */ + @Excel(name = "联系人备注20", width = 15) + private String remarks20; + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/vo/SafetyCenterSubitemImport.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/vo/SafetyCenterSubitemImport.java index db9326c8..d557946a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/vo/SafetyCenterSubitemImport.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/vo/SafetyCenterSubitemImport.java @@ -35,8 +35,410 @@ public class SafetyCenterSubitemImport { * 企业联系人列表 */ @ApiModelProperty(value = "企业联系人列表") - @ExcelCollection(name = "企业联系人列表") private List contactsList; + /** + * 企业联系人名称1 + */ + @Excel(name = "企业联系人1", width = 15) + private String contactsName1; + /** + * 企业联系人手机号1 + */ + @Excel(name = "企业联系人手机号1", width = 17) + private String contactsPhone1; + /** + * 企业联系人邮箱1 + */ + @Excel(name = "企业联系人邮箱1", width = 15) + private String contactsEmail1; + /** + * 联系人备注1 + */ + @Excel(name = "联系人备注1", width = 15) + private String remarks1; + /** + * 企业联系人名称2 + */ + @Excel(name = "企业联系人2", width = 15) + private String contactsName2; + /** + * 企业联系人手机号2 + */ + @Excel(name = "企业联系人手机号2", width = 17) + private String contactsPhone2; + /** + * 企业联系人邮箱2 + */ + @Excel(name = "企业联系人邮箱2", width = 15) + private String contactsEmail2; + /** + * 联系人备注2 + */ + @Excel(name = "联系人备注2", width = 15) + private String remarks2; + /** + * 企业联系人名称3 + */ + @Excel(name = "企业联系人3", width = 15) + private String contactsName3; + /** + * 企业联系人手机号3 + */ + @Excel(name = "企业联系人手机号3", width = 17) + private String contactsPhone3; + /** + * 企业联系人邮箱3 + */ + @Excel(name = "企业联系人邮箱3", width = 15) + private String contactsEmail3; + /** + * 联系人备注3 + */ + @Excel(name = "联系人备注3", width = 15) + private String remarks3; + /** + * 企业联系人名称4 + */ + @Excel(name = "企业联系人4", width = 15) + private String contactsName4; + /** + * 企业联系人手机号4 + */ + @Excel(name = "企业联系人手机号4", width = 17) + private String contactsPhone4; + /** + * 企业联系人邮箱4 + */ + @Excel(name = "企业联系人邮箱4", width = 15) + private String contactsEmail4; + /** + * 联系人备注4 + */ + @Excel(name = "联系人备注4", width = 15) + private String remarks4; + /** + * 企业联系人名称5 + */ + @Excel(name = "企业联系人5", width = 15) + private String contactsName5; + /** + * 企业联系人手机号5 + */ + @Excel(name = "企业联系人手机号5", width = 17) + private String contactsPhone5; + /** + * 企业联系人邮箱5 + */ + @Excel(name = "企业联系人邮箱5", width = 15) + private String contactsEmail5; + /** + * 联系人备注5 + */ + @Excel(name = "联系人备注5", width = 15) + private String remarks5; + /** + * 企业联系人名称6 + */ + @Excel(name = "企业联系人6", width = 15) + private String contactsName6; + /** + * 企业联系人手机号6 + */ + @Excel(name = "企业联系人手机号6", width = 17) + private String contactsPhone6; + /** + * 企业联系人邮箱6 + */ + @Excel(name = "企业联系人邮箱6", width = 15) + private String contactsEmail6; + /** + * 联系人备注6 + */ + @Excel(name = "联系人备注6", width = 15) + private String remarks6; + /** + * 企业联系人名称7 + */ + @Excel(name = "企业联系人7", width = 15) + private String contactsName7; + /** + * 企业联系人手机号7 + */ + @Excel(name = "企业联系人手机号7", width = 17) + private String contactsPhone7; + /** + * 企业联系人邮箱7 + */ + @Excel(name = "企业联系人邮箱7", width = 15) + private String contactsEmail7; + /** + * 联系人备注7 + */ + @Excel(name = "联系人备注7", width = 15) + private String remarks7; + /** + * 企业联系人名称8 + */ + @Excel(name = "企业联系人8", width = 15) + private String contactsName8; + /** + * 企业联系人手机号8 + */ + @Excel(name = "企业联系人手机号8", width = 17) + private String contactsPhone8; + /** + * 企业联系人邮箱8 + */ + @Excel(name = "企业联系人邮箱8", width = 15) + private String contactsEmail8; + /** + * 联系人备注8 + */ + @Excel(name = "联系人备注8", width = 15) + private String remarks8; + /** + * 企业联系人名称9 + */ + @Excel(name = "企业联系人9", width = 15) + private String contactsName9; + /** + * 企业联系人手机号9 + */ + @Excel(name = "企业联系人手机号9", width = 17) + private String contactsPhone9; + /** + * 企业联系人邮箱9 + */ + @Excel(name = "企业联系人邮箱9", width = 15) + private String contactsEmail9; + /** + * 联系人备注9 + */ + @Excel(name = "联系人备注9", width = 15) + private String remarks9; + /** + * 企业联系人名称10 + */ + @Excel(name = "企业联系人10", width = 15) + private String contactsName10; + /** + * 企业联系人手机号10 + */ + @Excel(name = "企业联系人手机号10", width = 17) + private String contactsPhone10; + /** + * 企业联系人邮箱10 + */ + @Excel(name = "企业联系人邮箱10", width = 15) + private String contactsEmail10; + /** + * 联系人备注10 + */ + @Excel(name = "联系人备注10", width = 15) + private String remarks10; + + /** + * 企业联系人名称11 + */ + @Excel(name = "企业联系人11", width = 15) + private String contactsName11; + /** + * 企业联系人手机号11 + */ + @Excel(name = "企业联系人手机号11", width = 17) + private String contactsPhone11; + /** + * 企业联系人邮箱11 + */ + @Excel(name = "企业联系人邮箱11", width = 15) + private String contactsEmail11; + /** + * 联系人备注11 + */ + @Excel(name = "联系人备注11", width = 15) + private String remarks11; + /** + * 企业联系人名称12 + */ + @Excel(name = "企业联系人12", width = 15) + private String contactsName12; + /** + * 企业联系人手机号12 + */ + @Excel(name = "企业联系人手机号12", width = 17) + private String contactsPhone12; + /** + * 企业联系人邮箱12 + */ + @Excel(name = "企业联系人邮箱12", width = 15) + private String contactsEmail12; + /** + * 联系人备注12 + */ + @Excel(name = "联系人备注12", width = 15) + private String remarks12; + /** + * 企业联系人名称13 + */ + @Excel(name = "企业联系人13", width = 15) + private String contactsName13; + /** + * 企业联系人手机号13 + */ + @Excel(name = "企业联系人手机号13", width = 17) + private String contactsPhone13; + /** + * 企业联系人邮箱13 + */ + @Excel(name = "企业联系人邮箱13", width = 15) + private String contactsEmail13; + /** + * 联系人备注13 + */ + @Excel(name = "联系人备注13", width = 15) + private String remarks13; + /** + * 企业联系人名称14 + */ + @Excel(name = "企业联系人14", width = 15) + private String contactsName14; + /** + * 企业联系人手机号14 + */ + @Excel(name = "企业联系人手机号14", width = 17) + private String contactsPhone14; + /** + * 企业联系人邮箱14 + */ + @Excel(name = "企业联系人邮箱14", width = 15) + private String contactsEmail14; + /** + * 联系人备注14 + */ + @Excel(name = "联系人备注14", width = 15) + private String remarks14; + /** + * 企业联系人名称15 + */ + @Excel(name = "企业联系人15", width = 15) + private String contactsName15; + /** + * 企业联系人手机号15 + */ + @Excel(name = "企业联系人手机号15", width = 17) + private String contactsPhone15; + /** + * 企业联系人邮箱15 + */ + @Excel(name = "企业联系人邮箱15", width = 15) + private String contactsEmail15; + /** + * 联系人备注15 + */ + @Excel(name = "联系人备注15", width = 15) + private String remarks15; + /** + * 企业联系人名称16 + */ + @Excel(name = "企业联系人16", width = 15) + private String contactsName16; + /** + * 企业联系人手机号16 + */ + @Excel(name = "企业联系人手机号16", width = 17) + private String contactsPhone16; + /** + * 企业联系人邮箱16 + */ + @Excel(name = "企业联系人邮箱16", width = 15) + private String contactsEmail16; + /** + * 联系人备注16 + */ + @Excel(name = "联系人备注16", width = 15) + private String remarks16; + /** + * 企业联系人名称17 + */ + @Excel(name = "企业联系人17", width = 15) + private String contactsName17; + /** + * 企业联系人手机号17 + */ + @Excel(name = "企业联系人手机号17", width = 17) + private String contactsPhone17; + /** + * 企业联系人邮箱17 + */ + @Excel(name = "企业联系人邮箱17", width = 15) + private String contactsEmail17; + /** + * 联系人备注17 + */ + @Excel(name = "联系人备注17", width = 15) + private String remarks17; + /** + * 企业联系人名称18 + */ + @Excel(name = "企业联系人18", width = 15) + private String contactsName18; + /** + * 企业联系人手机号18 + */ + @Excel(name = "企业联系人手机号18", width = 17) + private String contactsPhone18; + /** + * 企业联系人邮箱18 + */ + @Excel(name = "企业联系人邮箱18", width = 15) + private String contactsEmail18; + /** + * 联系人备注18 + */ + @Excel(name = "联系人备注18", width = 15) + private String remarks18; + /** + * 企业联系人名称19 + */ + @Excel(name = "企业联系人19", width = 15) + private String contactsName19; + /** + * 企业联系人手机号19 + */ + @Excel(name = "企业联系人手机号19", width = 17) + private String contactsPhone19; + /** + * 企业联系人邮箱19 + */ + @Excel(name = "企业联系人邮箱19", width = 15) + private String contactsEmail19; + /** + * 联系人备注19 + */ + @Excel(name = "联系人备注19", width = 15) + private String remarks19; + /** + * 企业联系人名称20 + */ + @Excel(name = "企业联系人20", width = 15) + private String contactsName20; + /** + * 企业联系人手机号20 + */ + @Excel(name = "企业联系人手机号20", width = 17) + private String contactsPhone20; + /** + * 企业联系人邮箱20 + */ + @Excel(name = "企业联系人邮箱20", width = 15) + private String contactsEmail20; + /** + * 联系人备注20 + */ + @Excel(name = "联系人备注20", width = 15) + private String remarks20; + + } \ No newline at end of file From 929e7fec9d52ac9eb9ffa1dde438ff3fc948837e Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 9 Aug 2024 10:55:12 +0800 Subject: [PATCH 33/37] =?UTF-8?q?fix=2088141=20=E6=A0=87=E5=8D=8F=E4=BC=9A?= =?UTF-8?q?=E5=91=98-=E7=BC=96=E8=BE=91=E9=87=91=E9=A2=9D=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E4=B8=8B=E7=8A=B6=E6=80=81=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/member/service/ITbMemberProjectSubitemService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java index 5c26bddf..43950c87 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java @@ -462,7 +462,7 @@ public class ITbMemberProjectSubitemService extends ServiceImpl Date: Fri, 9 Aug 2024 14:20:46 +0800 Subject: [PATCH 34/37] =?UTF-8?q?fix=2088309=20=E3=80=90=E6=89=80=E6=9C=89?= =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E3=80=91=E4=BC=81=E4=B8=9A=E7=AB=AF--?= =?UTF-8?q?=E6=8A=A5=E5=90=8D=E5=90=8E=E7=BC=B4=E8=B4=B9=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E4=BB=8E=E6=89=93=E5=8C=85=E5=88=87=E6=8D=A2=E6=88=90=E6=B1=87?= =?UTF-8?q?=E6=AC=BE/=E9=9C=80=E8=A6=81=E7=BC=B4=E8=B4=B9--=E5=88=B0?= =?UTF-8?q?=E8=B4=A6=E5=BC=80=E7=A5=A8=E7=9A=84=E7=8A=B6=E6=80=81=E5=92=8C?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=8C=89=E9=92=AE=E6=B2=A1=E6=9C=89=E5=90=8C?= =?UTF-8?q?=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/common/MeetingSubitemCommon.java | 14 ++++---- .../controller/PayMeetingController.java | 12 ++++--- .../impl/PayMeetingSituationServiceImpl.java | 34 ++++++++++++++----- 3 files changed, 39 insertions(+), 21 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingSubitemCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingSubitemCommon.java index 0ad21af2..cbb39e6e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingSubitemCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingSubitemCommon.java @@ -94,7 +94,7 @@ public class MeetingSubitemCommon { */ public static final Integer SIGNUP_STATUS_2 = 2; /** - * 需要缴费-非成员已报名审核 + * 需要缴费-非成员已报名待审核 */ public static final Integer REGISTER_PROCESS_1 = 1; /** @@ -102,7 +102,7 @@ public class MeetingSubitemCommon { */ public static final Integer REGISTER_PROCESS_2 = 2; /** - * 需要缴费-付款方式为汇款现场缴费 + * 需要缴费-付款方式为汇款现场缴费 待上传凭证 */ public static final Integer REGISTER_PROCESS_3 = 3; /** @@ -122,23 +122,23 @@ public class MeetingSubitemCommon { */ public static final Integer REGISTER_PROCESS_7 = 7; /** - * 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到 + * 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到-待上传凭证 */ public static final Integer REGISTER_PROCESS_8 = 8; /** - * 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到 + * 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到-凭证待审核 */ public static final Integer REGISTER_PROCESS_9 = 9; /** - * 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到 + * 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到-凭证被拒绝 */ public static final Integer REGISTER_PROCESS_10 = 10; /** - * 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到 + * 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到-缴费成功 */ public static final Integer REGISTER_PROCESS_11 = 11; /** - * 不需要缴费-非成员已报名审核 + * 不需要缴费-非成员已报名待审核 */ public static final Integer REGISTER_PROCESS_12 = 12; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java index 86034ccb..64aa8746 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java @@ -29,6 +29,7 @@ import com.jero.data.service.IPayCaseCommitteeService; import com.jero.data.service.IPayCaseCommitteeSubitemService; import com.jero.data.service.IPayCaseCouncilSubitemService; import com.jero.meeting.common.MeetingCommon; +import com.jero.meeting.common.MeetingSubitemCommon; import com.jero.meeting.entity.*; import com.jero.meeting.mapper.PayMeetingGuestsFileMapper; import com.jero.meeting.service.*; @@ -184,6 +185,7 @@ public class PayMeetingController extends JeroController updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(PayMeetingSituation::getId,situationId); + updateWrapper.set(PayMeetingSituation::getPaymentStatus,null); + this.update(updateWrapper); }else { - if (payMeetingSituation.getId() == null){ + if (situationId == null){ payMeetingSituation1.setPaymentStatus(PaymentStatusEnum.TO_BE_UPLOADED.getCode()); + }else { + PayMeetingSituation old = this.getById(situationId); + Integer oldPayMode = old.getPayMode(); + if (MeetingSubitemCommon.PAY_MODE_3.equals(oldPayMode)){ + payMeetingSituation1.setPaymentStatus(PaymentStatusEnum.TO_BE_UPLOADED.getCode()); + } } if (Objects.equals(payMeetingSituation1.getRegisterCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){ payMeetingSituation1.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_3); From 3b9b2b92be889ab1a84d0093f4fa2c9cab0b8050 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 9 Aug 2024 16:42:21 +0800 Subject: [PATCH 35/37] =?UTF-8?q?update=2088309=20=E3=80=90=E6=89=80?= =?UTF-8?q?=E6=9C=89=E4=BC=9A=E8=AE=AE=E3=80=91=E4=BC=81=E4=B8=9A=E7=AB=AF?= =?UTF-8?q?--=E6=8A=A5=E5=90=8D=E5=90=8E=E7=BC=B4=E8=B4=B9=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E4=BB=8E=E6=89=93=E5=8C=85=E5=88=87=E6=8D=A2=E6=88=90?= =?UTF-8?q?=E6=B1=87=E6=AC=BE/=E9=9C=80=E8=A6=81=E7=BC=B4=E8=B4=B9--?= =?UTF-8?q?=E5=88=B0=E8=B4=A6=E5=BC=80=E7=A5=A8=E7=9A=84=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=92=8C=E5=AE=A1=E6=A0=B8=E6=8C=89=E9=92=AE=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/service/impl/PayMeetingSituationServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index c9bdff50..67091017 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -1451,7 +1451,10 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.select(PayMeetingSituation::getPayMode); + wrapper.eq(PayMeetingSituation::getId,situationId); + PayMeetingSituation old = this.getOne(wrapper); Integer oldPayMode = old.getPayMode(); if (MeetingSubitemCommon.PAY_MODE_3.equals(oldPayMode)){ payMeetingSituation1.setPaymentStatus(PaymentStatusEnum.TO_BE_UPLOADED.getCode()); From d255313c51ec070fc6e2fdb2477975106c2110eb Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Fri, 9 Aug 2024 16:45:18 +0800 Subject: [PATCH 36/37] =?UTF-8?q?=E3=80=90update=E3=80=91-=20=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E5=87=AD=E8=AF=81=20=E6=8C=89=E9=92=AEsql=E7=9A=84?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/24年6月变更.sql | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/db/24年6月变更.sql b/db/24年6月变更.sql index b4c3f596..c67ae74f 100644 --- a/db/24年6月变更.sql +++ b/db/24年6月变更.sql @@ -230,12 +230,12 @@ alter table pay_pack_company -- 20240807 工作组成员单位 审核凭证修改成查看凭证 UPDATE sys_permission SET parent_id='1431167539278086146', name='查看凭证' WHERE id='1808440661174550530' -- 20240807 会议 查看凭证 按钮 -INSERT INTO `income_payments_test`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808440661174550530', '1431167539278086146', '查看凭证', NULL, NULL, NULL, NULL, 2, 'workingGroupMember:confirmVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-03 18:00:27', 'LKGLZ', '2024-08-07 14:45:43', 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1821076019175383042', '1443460205023940610', '查看凭证', NULL, NULL, NULL, NULL, 2, 'otherMeetingSituation:lookVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-08-07 14:48:52', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1821076182862290946', '1443461591480487938', '查看凭证', NULL, NULL, NULL, NULL, 2, 'committeeMeetingSituation:lookVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-08-07 14:49:31', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1821076336449314817', '1433322232030777345', '查看凭证', NULL, NULL, NULL, NULL, 2, 'internalMeetingSituation:lookVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-08-07 14:50:07', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1821076500849254402', '1470954992463327234', '查看凭证', NULL, NULL, NULL, NULL, 2, 'councilMeetingSituation:lookVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-08-07 14:50:46', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1821077226275102721', '1443470901166039042', '查看凭证', NULL, NULL, NULL, NULL, 2, 'standardsMeetingSituation:lookVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-08-07 14:53:39', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1821076019175383042', '1443460205023940610', '查看凭证', NULL, NULL, NULL, NULL, 2, 'otherMeetingSituation:lookVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-08-07 14:48:52', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1821076182862290946', '1443461591480487938', '查看凭证', NULL, NULL, NULL, NULL, 2, 'committeeMeetingSituation:lookVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-08-07 14:49:31', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1821076336449314817', '1433322232030777345', '查看凭证', NULL, NULL, NULL, NULL, 2, 'internalMeetingSituation:lookVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-08-07 14:50:07', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1821076500849254402', '1470954992463327234', '查看凭证', NULL, NULL, NULL, NULL, 2, 'councilMeetingSituation:lookVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-08-07 14:50:46', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1821077226275102721', '1443470901166039042', '查看凭证', NULL, NULL, NULL, NULL, 2, 'standardsMeetingSituation:lookVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-08-07 14:53:39', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1821829573108494337', '1443462660843458561', '查看凭证', NULL, NULL, NULL, NULL, 2, 'workGroupMeetingSituation:lookVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-08-09 16:43:13', NULL, NULL, 0, 0, '1', 0, 1); -- 20240807 会议酒店推荐调整菜单层级 增加菜单。会议汇总 修改成 会议信息统计 DELETE FROM sys_permission where id = '1812785413516914690'; From bd5c3e6c9875cfe7949e22a9e4290ef69b087995 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 9 Aug 2024 16:55:35 +0800 Subject: [PATCH 37/37] =?UTF-8?q?update=2024=E5=B9=B46=E6=9C=88=E5=8F=98?= =?UTF-8?q?=E6=9B=B4.sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/24年6月变更.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/24年6月变更.sql b/db/24年6月变更.sql index c67ae74f..60befdd1 100644 --- a/db/24年6月变更.sql +++ b/db/24年6月变更.sql @@ -228,7 +228,7 @@ alter table pay_pack_company add mail_contact_temporary_id varchar(150) null comment '邮寄联系人临时id' after mail_contacts_id; -- 20240807 工作组成员单位 审核凭证修改成查看凭证 -UPDATE sys_permission SET parent_id='1431167539278086146', name='查看凭证' WHERE id='1808440661174550530' +UPDATE sys_permission SET parent_id='1431167539278086146', name='查看凭证' WHERE id='1808440661174550530'; -- 20240807 会议 查看凭证 按钮 INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1821076019175383042', '1443460205023940610', '查看凭证', NULL, NULL, NULL, NULL, 2, 'otherMeetingSituation:lookVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-08-07 14:48:52', NULL, NULL, 0, 0, '1', 0, 1); INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1821076182862290946', '1443461591480487938', '查看凭证', NULL, NULL, NULL, NULL, 2, 'committeeMeetingSituation:lookVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-08-07 14:49:31', NULL, NULL, 0, 0, '1', 0, 1);