From 7f302004e78ca5220a4f88a7fab843964a18739a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 17 三月 2025 18:35:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-2.0' into dev-2.0
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java | 62 ++++++++++++++++--------------
1 files changed, 33 insertions(+), 29 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 4a9bbc2..c74b218 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
@@ -1,55 +1,36 @@
package com.panzhihua.sangeshenbian.service.impl;
import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateUtil;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.idev.excel.EasyExcel;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-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.exceptions.ServiceException;
import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo;
+import com.panzhihua.common.redis.RedisUtils;
import com.panzhihua.sangeshenbian.dao.PartyMemberMapper;
import com.panzhihua.sangeshenbian.enums.AuditStatusEnum;
+import com.panzhihua.sangeshenbian.enums.FreezeStatusEnum;
import com.panzhihua.sangeshenbian.enums.ReportTypeEnum;
-import com.panzhihua.sangeshenbian.enums.AuditStatusEnum;
-import com.panzhihua.sangeshenbian.model.entity.BcRegion;
-import com.panzhihua.sangeshenbian.model.entity.ComAct;
-import com.panzhihua.sangeshenbian.model.entity.ComStreet;
-import com.panzhihua.sangeshenbian.model.entity.PartyMember;
-import com.panzhihua.sangeshenbian.model.entity.SystemUser;
+import com.panzhihua.sangeshenbian.model.entity.*;
import com.panzhihua.sangeshenbian.model.excel.PartyMemberExcel;
-import com.panzhihua.sangeshenbian.warpper.PartyMemberImportFailedVO;
import com.panzhihua.sangeshenbian.model.excel.PartyMemberTemplate;
-import com.panzhihua.sangeshenbian.service.IBcRegionService;
-import com.panzhihua.sangeshenbian.service.IComActService;
-import com.panzhihua.sangeshenbian.service.IComStreetService;
-import com.panzhihua.sangeshenbian.service.IPartyMemberService;
-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 com.panzhihua.sangeshenbian.service.*;
+import com.panzhihua.sangeshenbian.warpper.*;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
/**
* <p>
@@ -67,6 +48,7 @@
private final IBcRegionService bcRegionService;
private final IComStreetService comStreetService;
private final IComActService comActService;
+ private final RedisUtils redisUtils;
/**
* 党员分页查询列表
*
@@ -88,10 +70,23 @@
PartyMember partyMember = BeanUtil.copyProperties(dto, PartyMember.class);
String idNumber = dto.getIdNumber();
partyMember.setGender(getGender(idNumber));
+ BcRegion districtByCode = bcRegionService.getDistrictByCode(dto.getDistrictsCode());
+ if (Objects.nonNull(districtByCode)){
+ partyMember.setDistricts(districtByCode.getRegionName());
+ }
+ ComStreet street = comStreetService.getById(dto.getStreetId());
+ if (Objects.nonNull(street)){
+ partyMember.setStreet(street.getName());
+ }
+ ComAct act = comActService.getById(dto.getCommunityId());
+ if (Objects.nonNull(act)){
+ partyMember.setCommunity(act.getName());
+ }
if (Objects.isNull(dto.getId())) {
//添加
partyMember.setCreateBy(Long.parseLong(loginUserInfo.getId().toString()));
partyMember.setAuditStatus(AuditStatusEnum.APPROVED.getCode());
+ partyMember.setFreezeStatus(FreezeStatusEnum.NORMAL.getCode());
partyMember.setSource(1);
save(partyMember);
} else {
@@ -233,11 +228,12 @@
// 验证社区是否存在且属于该街道
// 实际代码应该是调用相应的Service查询社区信息
ComAct comAct = comActService.getCommunityByNameAndStreet(communityName, comStreet.getStreetId());
- streetId = comStreet.getStreetId();
- communityId = comAct.getCommunityId();
if (Objects.isNull(comAct)) {
isValid = false;
errorMsg.append("社区不存在或不属于所选街道; ");
+ } else {
+ streetId = comStreet.getStreetId();
+ communityId = comAct.getCommunityId();
}
}
}
@@ -327,10 +323,18 @@
.eq(SystemUser::getPhone, loginUserInfo.getPhone())
.eq(SystemUser::getIsAdmin, 1)
.ne(SystemUser::getStatus, 3)
+ .ne(SystemUser::getAccountLevel, 5)
.last("LIMIT 1"));
+
+
if (adminUser == null){
throw new ServiceException("无权审核");
+ }
+
+ Integer identity = (Integer) redisUtils.get("identity:" + loginUserInfo.getPhone());
+ if(identity != null && identity != 2){
+ throw new ServiceException("请切换至管理员身份");
}
int accountLevel = adminUser.getAccountLevel();
@@ -343,7 +347,7 @@
streetId = adminUser.getStreetId();
} else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
districtsCode = adminUser.getDistrictsCode();
- } else if(accountLevel != ReportTypeEnum.PARTY.getCode()){
+ } else if(accountLevel != ReportTypeEnum.CITY.getCode()){
throw new ServiceException("无权审核:未知等级");
}
String phone = loginUserInfo.getPhone();
--
Gitblit v1.7.1