From 9c2e0c9cad7d48014df7fdbe0a7292f86d95f3ae Mon Sep 17 00:00:00 2001 From: luofl <1442745593@qq.com> Date: 星期六, 15 三月 2025 19:03:32 +0800 Subject: [PATCH] 1. --- springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 56 insertions(+), 2 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java index 760517c..5e71a8a 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java @@ -2,19 +2,29 @@ import cn.hutool.core.bean.BeanUtil; import cn.idev.excel.FastExcel; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.panzhihua.common.exceptions.ServiceException; +import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo; -import com.panzhihua.sangeshenbian.model.entity.PartyMember; import com.panzhihua.sangeshenbian.dao.PartyMemberMapper; +import com.panzhihua.sangeshenbian.enums.AuditStatusEnum; +import com.panzhihua.sangeshenbian.enums.ReportTypeEnum; +import com.panzhihua.sangeshenbian.model.entity.PartyMember; +import com.panzhihua.sangeshenbian.model.entity.SystemUser; import com.panzhihua.sangeshenbian.model.excel.PartyMemberExcel; import com.panzhihua.sangeshenbian.model.excel.PartyMemberTemplate; import com.panzhihua.sangeshenbian.service.IPartyMemberService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.panzhihua.sangeshenbian.service.ISystemUserService; +import com.panzhihua.sangeshenbian.warpper.PartyMemberApplicationRequest; import com.panzhihua.sangeshenbian.warpper.PartyMemberDTO; import com.panzhihua.sangeshenbian.warpper.PartyMemberQuery; +import com.panzhihua.sangeshenbian.warpper.PendingPartyMemberApplicationVO; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -35,6 +45,7 @@ @RequiredArgsConstructor(onConstructor_ = {@Lazy}) public class PartyMemberServiceImpl extends ServiceImpl<PartyMemberMapper, PartyMember> implements IPartyMemberService { private final HttpServletResponse response; + private final ISystemUserService systemUserService; /** * 党员分页查询列表 * @@ -116,6 +127,19 @@ } + @Override + @Transactional(rollbackFor = Exception.class) + public void applyForMembership(PartyMemberApplicationRequest dto, LoginUserInfoVO loginUserInfo) { + PartyMember partyMember = BeanUtil.copyProperties(dto, PartyMember.class); + String idNumber = dto.getIdNumber(); + partyMember.setPhone(loginUserInfo.getPhone()); + partyMember.setGender(getGender(idNumber)); + partyMember.setCreateBy(loginUserInfo.getUserId()); + partyMember.setAuditStatus(AuditStatusEnum.PENDING.getCode()); + saveOrUpdate(partyMember); + } + + /** * 审核 * @@ -129,6 +153,36 @@ updateById(partyMember); } + @Override + public Page<PendingPartyMemberApplicationVO> preAuditList(Page<PendingPartyMemberApplicationVO> page, + LoginUserInfoVO loginUserInfo) { + SystemUser adminUser = systemUserService.getOne(new LambdaQueryWrapper<SystemUser>() + .eq(SystemUser::getPhone, loginUserInfo.getPhone()) + .eq(SystemUser::getIsAdmin, 1) + .ne(SystemUser::getStatus, 3) + .last("LIMIT 1")); + + if (adminUser == null){ + throw new ServiceException("无权审核"); + } + + int accountLevel = adminUser.getAccountLevel(); + Long communityId = null; + String streetId = null; + String districtsCode = null; + if (accountLevel == ReportTypeEnum.COMMUNITY.getCode()) { + communityId = adminUser.getCommunityId(); + } else if (accountLevel == ReportTypeEnum.STREET.getCode()) { + streetId = adminUser.getStreetId(); + } else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) { + districtsCode = adminUser.getDistrictsCode(); + } else if(accountLevel != ReportTypeEnum.PARTY.getCode()){ + throw new ServiceException("无权审核:未知等级"); + } + Long userId = loginUserInfo.getUserId(); + return this.baseMapper.queryPreAuditPage(page, userId, accountLevel, districtsCode, streetId, communityId); + } + /** * 根据身份证号获取性别 * @param idNumber -- Gitblit v1.7.1