From 4434d16a2aa97394d078f2e6e38aac5cd85411c3 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 28 Mar 2024 12:09:57 +0800 Subject: [PATCH] =?UTF-8?q?fix=2082829=20=E4=BC=9A=E5=91=98=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E6=A0=87=E5=8D=8F=E4=BC=9A=E5=91=98=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E4=BF=A1=E6=81=AF-=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E7=BC=BA=E5=B0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TbMemberProjectSubitemController.java | 11 +++--- .../member/entity/TbMemberProjectSubitem.java | 11 ++++++ .../ITbMemberProjectSubitemService.java | 39 ++++++++++++------- 3 files changed, 43 insertions(+), 18 deletions(-) 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 df572108..10c604a5 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 @@ -7,6 +7,10 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.date.format.DateParser; import com.jero.aspect.annotation.CompanyNameTranslate; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; @@ -61,9 +65,8 @@ public class TbMemberProjectSubitemController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(tbMemberProjectSubitem, req.getParameterMap()); Page page = new Page<>(pageNo, pageSize); - IPage pageList = tbMemberProjectSubitemService.pageList(page, queryWrapper); + IPage pageList = tbMemberProjectSubitemService.pageList(page, req, tbMemberProjectSubitem); for (TbMemberProjectSubitem record : pageList.getRecords()) { record.setEmail(PasswordUtil.decrypt(record.getEmail())); record.setMobile(PasswordUtil.decrypt(record.getMobile())); @@ -246,9 +249,7 @@ public class TbMemberProjectSubitemController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(tbMemberProjectSubitem, request.getParameterMap()); - - List pageList = tbMemberProjectSubitemService.pageList(queryWrapper); + List pageList = tbMemberProjectSubitemService.pageList(request,tbMemberProjectSubitem); List exportList; // 过滤选中数据 String selections = request.getParameter("selections"); 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 a3a60358..1cbd8a12 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 @@ -382,6 +382,17 @@ public class TbMemberProjectSubitem implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd") private Date invalidationDate; + /** 生效日期 */ + @ApiModelProperty(value = "生效日期") + @TableField(exist = false) + private String effectiveDateStr; + /** + * 失效日期 + */ + @ApiModelProperty(value = "失效日期") + @TableField(exist = false) + private String invalidationDateStr; + @ApiModelProperty(value = "年份") @TableField(exist = false) private String year; 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 fd0adaea..93b85e1b 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 @@ -14,10 +14,9 @@ import com.jero.common.enums.PaymentStatusEnum; import com.jero.common.exception.JeroBootException; 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.AuthenticationUtils; -import com.jero.common.util.PasswordUtil; import com.jero.company.entity.PayCompanyManagement; import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayCompanyManagementService; @@ -34,7 +33,6 @@ import com.jero.meeting.mapper.PayMeetingSituationMapper; import com.jero.member.entity.TbMemberProjectSubitem; import com.jero.member.enums.MemberStatusEnum; import com.jero.member.mapper.TbMemberProjectSubitemMapper; -import com.jero.member.service.ITbMemberProjectSubitemService; import com.jero.member.vo.CopyMemberVO; import com.jero.member.vo.EditMemberBenefitsVO; import com.jero.member.vo.QueryAggVO; @@ -45,11 +43,9 @@ 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.PayWorkingGroupSubItem; import com.jero.statistics.entity.MemberLineChartMap; import com.jero.statistics.entity.MemberLineChartVO; import com.jero.statistics.entity.MemberPieChartVO; -import com.jero.temporary.service.IPayContactsManagementTemporaryService; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -394,22 +390,39 @@ public class ITbMemberProjectSubitemService extends ServiceImpl pageList(Page page, QueryWrapper queryWrapper) { - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - if (!rolePermissionService.getRolePermission("safeguardStardsMember:search")) { - queryWrapper.eq("tmp.director_id",sysUser.getId()); - } - return baseMapper.pageList(page,queryWrapper); + public IPage pageList(Page page, HttpServletRequest request, TbMemberProjectSubitem tbMemberProjectSubitem) { + QueryWrapper queryWrapper = generateQueryWrapper(request, tbMemberProjectSubitem); + + return baseMapper.pageList(page,queryWrapper); } - public List pageList(QueryWrapper queryWrapper) { + public List pageList(HttpServletRequest request, TbMemberProjectSubitem tbMemberProjectSubitem) { + QueryWrapper queryWrapper = generateQueryWrapper(request, tbMemberProjectSubitem); + return baseMapper.pageList(queryWrapper); + } + + private QueryWrapper generateQueryWrapper(HttpServletRequest request, TbMemberProjectSubitem tbMemberProjectSubitem){ + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(tbMemberProjectSubitem, request.getParameterMap()); + String invalidationDateStr = tbMemberProjectSubitem.getInvalidationDateStr(); + String effectiveDateStr = tbMemberProjectSubitem.getEffectiveDateStr(); + if (StringUtils.isNotBlank(invalidationDateStr)){ + DateTime invalidationDate = DateUtil.parse(invalidationDateStr, DatePattern.NORM_MONTH_PATTERN); + queryWrapper.eq("year(invalidation_date)",invalidationDate.year()); + queryWrapper.eq("month(invalidation_date)",invalidationDate.month()+1); + } + if (StringUtils.isNotBlank(effectiveDateStr)){ + DateTime effectiveDate = DateUtil.parse(effectiveDateStr, DatePattern.NORM_MONTH_PATTERN); + queryWrapper.eq("year(effective_date)",effectiveDate.year()); + queryWrapper.eq("month(effective_date)",effectiveDate.month()+1); + } LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); if (!rolePermissionService.getRolePermission("safeguardStardsMember:search")) { queryWrapper.eq("tmp.director_id",sysUser.getId()); } - return baseMapper.pageList(queryWrapper); + return queryWrapper; } + public void ticketCollection(String id) { LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(TbMemberProjectSubitem::getId,id);