From ba28e7a111c23c2e8f7b6d3f56b8cba37920e851 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 29 Jul 2024 16:21:07 +0800 Subject: [PATCH] =?UTF-8?q?fix=2087687=2087689=20=E5=B9=B4=E5=BA=A6?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=BB=B4=E6=8A=A4-=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E4=BF=A1=E6=81=AF-=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=92=8C=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/entity/TbMemberProjectSubitem.java | 4 +- .../ITbMemberProjectSubitemService.java | 113 ++++++++++++------ ...CompanyManagementTemporaryServiceImpl.java | 2 +- 3 files changed, 82 insertions(+), 37 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java index ab0146cb..2c05e828 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java @@ -139,12 +139,12 @@ public class TbMemberProjectSubitem implements Serializable { @Excel(name = "通讯地址", width = 15) @ApiModelProperty(value = "通讯地址") @TableField(exist = false) - private java.lang.String contactAddress; + private String contactAddress; /**邮政编码*/ @Excel(name = "邮政编码", width = 15) @ApiModelProperty(value = "邮政编码") @TableField(exist = false) - private java.lang.String postalCode; + private String postalCode; /**会员状态*/ //@Excel(name = "会员状态", width = 15, dicCode = "member_status") 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 7d6e1ee1..ee6572f3 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 @@ -1,9 +1,4 @@ package com.jero.member.service; -import java.math.RoundingMode; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.time.format.DateTimeParseException; -import java.util.*; import cn.hutool.core.date.DateField; import cn.hutool.core.date.DatePattern; @@ -14,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; 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.enums.PaymentStatusEnum; import com.jero.common.exception.JeroBootException; @@ -41,7 +37,10 @@ import com.jero.member.entity.TbMemberProject; import com.jero.member.entity.TbMemberProjectSubitem; import com.jero.member.enums.MemberStatusEnum; import com.jero.member.mapper.TbMemberProjectSubitemMapper; -import com.jero.member.vo.*; +import com.jero.member.vo.CopyMemberVO; +import com.jero.member.vo.EditMemberBenefitsVO; +import com.jero.member.vo.QueryAggVO; +import com.jero.member.vo.TbMemberProjectSubitemExcelImport; import com.jero.pack.entity.PayPackCompanyProject; import com.jero.pack.service.IPayPackCompanyProjectService; import com.jero.payment.entity.PayConfirmPaymentRecord; @@ -50,12 +49,14 @@ import com.jero.payment.service.IPayPaymentRecordService; import com.jero.payment.service.impl.PayConfirmPaymentRecordService; import com.jero.project.common.PayProjectCommon; import com.jero.project.entity.AnnualDataLocking; -import com.jero.project.entity.PayCommonProject; -import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.project.service.AnnualDataLockingService; import com.jero.statistics.entity.MemberLineChartMap; import com.jero.statistics.entity.MemberLineChartVO; import com.jero.statistics.entity.MemberPieChartVO; +import com.jero.temporary.entity.PayCompanyManagementTemporary; +import com.jero.temporary.entity.PayContactsManagementTemporary; +import com.jero.temporary.service.IPayCompanyManagementTemporaryService; +import com.jero.temporary.service.IPayContactsManagementTemporaryService; import com.jero.valid.group.ChargeNotice; import com.jero.valid.group.Contract; import org.apache.commons.collections.CollectionUtils; @@ -63,17 +64,17 @@ import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.util.stream.Collectors; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; - -import static freemarker.template.utility.NullArgumentException.check; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeParseException; +import java.util.*; +import java.util.stream.Collectors; /** * @Description: 标协会员项目成员表 @@ -117,7 +118,10 @@ public class ITbMemberProjectSubitemService extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(TbMemberProjectSubitem::getProjectId, projectId); wrapper.eq(TbMemberProjectSubitem::getCompanyId, companyId); @@ -193,13 +182,13 @@ public class ITbMemberProjectSubitemService extends ServiceImpl update = new LambdaUpdateWrapper<>(); update.eq(TbMemberProjectSubitem::getId, tbMemberProjectSubitem.getId()); update.set(TbMemberProjectSubitem::getPack, PayProjectCommon.PACKAGING1); @@ -208,6 +197,8 @@ public class ITbMemberProjectSubitemService extends ServiceImpl excelData) { TbMemberProject memberProject = tbMemberProjectService.getById(projectId); String oldYear = memberProject.getYear(); @@ -268,6 +259,7 @@ public class ITbMemberProjectSubitemService extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(PayCompanyManagementTemporary::getId, id) - .isNotNull(PayCompanyManagementTemporary::getYear); + .isNull(PayCompanyManagementTemporary::getYear); return baseMapper.delete(wrapper) > 0; }