From 98ea94ddb97e2eb2a43021e66f3a7f635e14ee4c Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 2 Nov 2021 10:26:49 +0800 Subject: [PATCH] =?UTF-8?q?fix=20bug=2041839=20=E6=A0=87=E5=8D=8F=E4=BC=9A?= =?UTF-8?q?=E5=91=98=E9=A1=B9=E7=9B=AE-=E4=BC=9A=E8=AE=AE=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4--=E4=BC=9A=E8=AE=AE=E8=B4=9F=E8=B4=A3=E4=BA=BA?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E5=8F=AA=E8=83=BD=E7=9C=8B=E8=87=AA=E5=B7=B1?= =?UTF-8?q?=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PayMeetingServiceImpl.java | 32 +++++++++++++++++-- .../controller/TbMemberProjectController.java | 2 +- .../member/mapper/TbMemberProjectMapper.java | 5 ++- .../mapper/xml/TbMemberProjectMapper.xml | 6 ++++ .../service/ITbMemberProjectService.java | 2 ++ .../impl/TbMemberProjectServiceImpl.java | 16 ++++++++++ 6 files changed, 59 insertions(+), 4 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index 372313a8..e370e4b2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.meeting.service.impl; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; @@ -46,6 +47,8 @@ import com.jero.meeting.vo.PayMeetingVO; import com.jero.meeting.vo.PublishReminderVO; import com.jero.meeting.vo.UploadFileVO; import com.jero.meeting.vo.excel.*; +import com.jero.member.entity.TbMemberProject; +import com.jero.member.service.ITbMemberProjectService; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.project.entity.PayWorkingGroup; @@ -113,6 +116,8 @@ public class PayMeetingServiceImpl extends ServiceImpl hotelContactsList = payMeeting.getHotelContactsList(); //如果酒店联系人列表不为空，就新增 @@ -316,6 +323,8 @@ public class PayMeetingServiceImpl extends ServiceImpl wrapper1 = new LambdaQueryWrapper<>(); + int year = DateUtil.year(new Date()); + String projectName = year + "年标协会员"; + wrapper1.eq(TbMemberProject::getProjectName, projectName); + + TbMemberProject memberProject = tbMemberProjectService.getOne(wrapper1); + if (memberProject == null) { + memberProject = new TbMemberProject(); + memberProject.setProjectName(projectName); + memberProject.setYear(String.valueOf(year)); + memberProject.setDirectorId("e9ca23d68d884d4ebb19d07889727dae"); + memberProject.setDirectorName("BXGLZ"); + tbMemberProjectService.save(memberProject); + } + return memberProject; + } + /** * 通过id删除 */ @@ -566,7 +594,7 @@ public class PayMeetingServiceImpl extends ServiceImpl a.eq("pwg.principal_id_a", sysUser.getId()) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectController.java index 8a254998..4636f220 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectController.java @@ -49,7 +49,7 @@ public class TbMemberProjectController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(tbMemberProject, req.getParameterMap()); Page page = new Page<>(pageNo, pageSize); - IPage pageList = tbMemberProjectService.page(page, queryWrapper); + IPage pageList = tbMemberProjectService.queryPageList(page, queryWrapper); return Result.OK(pageList); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/TbMemberProjectMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/TbMemberProjectMapper.java index 451fc2fc..274c4b96 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/TbMemberProjectMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/TbMemberProjectMapper.java @@ -2,7 +2,9 @@ package com.jero.member.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.project.entity.PayWorkGroupSubletStatistics; import com.jero.statistics.entity.AllProjectStatistics; @@ -14,9 +16,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 标协会员项目表 * @Author: jero-boot - * @Date: 2021-09-01 + * @Date: 2021-09-01 * @Version: V1.0 */ public interface TbMemberProjectMapper extends BaseMapper { + IPage queryPageList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectMapper.xml index b156c65e..14378706 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectMapper.xml @@ -9,4 +9,10 @@ + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectService.java index 2b224d86..cf61fb13 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectService.java @@ -1,5 +1,6 @@ package com.jero.member.service; +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.entity.TbMemberProject; @@ -65,4 +66,5 @@ public interface ITbMemberProjectService extends IService { */ List queryList(); + IPage queryPageList(Page page, QueryWrapper queryWrapper); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectServiceImpl.java index a261dfc2..1231b63a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectServiceImpl.java @@ -1,7 +1,10 @@ package com.jero.member.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.exception.JeroBootException; +import com.jero.common.service.RolePermissionService; +import com.jero.common.system.vo.LoginUser; import com.jero.contract.entity.PayIncomeContractAssociated; import com.jero.contract.service.IPayIncomeContractAssociatedService; import com.jero.contract.service.IPayIncomeContractService; @@ -14,12 +17,14 @@ import com.jero.member.mapper.TbMemberProjectMapper; import com.jero.member.service.ITbMemberProjectService; import com.jero.member.service.ITbMemberProjectSubitemService; import org.apache.commons.collections.CollectionUtils; +import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import com.jero.project.entity.PayWorkGroupSubletStatistics; import com.jero.statistics.entity.AllProjectStatistics; import com.jero.statistics.entity.AllProjectStatisticsSearch; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -42,6 +47,8 @@ public class TbMemberProjectServiceImpl extends ServiceImpl queryPageList(Page page, QueryWrapper queryWrapper) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if (!rolePermissionService.getRolePermission("stardsMember:search")) { + queryWrapper.eq("pm.director_id",sysUser.getId()); + } + return baseMapper.queryPageList(page,queryWrapper); + } + }