From 2c8c1336223ba4777d580220f1e11480fda7c948 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 18 三月 2025 16:26:34 +0800
Subject: [PATCH] Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java | 556 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 363 insertions(+), 193 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java
index 54f5a6b..e4048c2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java
@@ -2,42 +2,34 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
import cn.idev.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.deepoove.poi.XWPFTemplate;
+import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo;
-import com.panzhihua.common.redis.RedisUtils;
+import com.panzhihua.sangeshenbian.dao.ComplaintMapper;
+import com.panzhihua.sangeshenbian.enums.AuditStatusEnum;
+import com.panzhihua.sangeshenbian.enums.ProcessStatusEnum;
import com.panzhihua.sangeshenbian.enums.RateEnum;
-import com.panzhihua.sangeshenbian.model.dto.ComplaintCompletionDTO;
-import com.panzhihua.sangeshenbian.model.dto.ComplaintProcessDTO;
-import com.panzhihua.sangeshenbian.model.entity.Complaint;
-import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.sangeshenbian.enums.ReportTypeEnum;
import com.panzhihua.sangeshenbian.model.dto.*;
import com.panzhihua.sangeshenbian.model.entity.*;
-import com.panzhihua.sangeshenbian.enums.ProcessStatusEnum;
-import com.panzhihua.sangeshenbian.dao.ComplaintMapper;
-import com.panzhihua.sangeshenbian.model.entity.ComplaintFlow;
-import com.panzhihua.sangeshenbian.model.entity.ComplaintProgress;
-import com.panzhihua.sangeshenbian.model.entity.SystemUser;
import com.panzhihua.sangeshenbian.model.excel.ComplaintExcel;
-import com.panzhihua.sangeshenbian.model.excel.PartyMemberExcel;
import com.panzhihua.sangeshenbian.model.query.BasePage;
import com.panzhihua.sangeshenbian.model.query.ComplaintQuery;
import com.panzhihua.sangeshenbian.model.vo.ComplaintTodoVO;
-import com.panzhihua.sangeshenbian.service.IComplaintFlowService;
-import com.panzhihua.sangeshenbian.service.IComplaintProgressService;
-import com.panzhihua.sangeshenbian.service.IComplaintService;
+import com.panzhihua.sangeshenbian.model.vo.ComplaintVO;
import com.panzhihua.sangeshenbian.model.vo.DispatchVO;
import com.panzhihua.sangeshenbian.service.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.panzhihua.sangeshenbian.model.vo.ComplaintVO;
-import com.panzhihua.sangeshenbian.service.ISystemUserService;
import com.panzhihua.sangeshenbian.utils.FileUtil;
+import com.panzhihua.sangeshenbian.warpper.IdentityInformation;
import com.panzhihua.sangeshenbian.warpper.MgtComplaintQuery;
+import com.panzhihua.sangeshenbian.warpper.PermissionsVO;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Lazy;
@@ -48,13 +40,7 @@
import java.io.IOException;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
import static cn.hutool.core.util.ObjectUtil.isNull;
@@ -82,7 +68,7 @@
private final IComplaintCommentService complaintCommentService;
private final HttpServletResponse response;
private final IPartyMemberService partyMemberService;
- private final RedisUtils redisUtils;
+ private final IdentityInformationService identityInformationService;
@Override
public void saveComplaint(Complaint complaint, LoginUserInfoVO loginUserInfoVO) {
@@ -108,12 +94,13 @@
// 设置流水号
complaint.setSerialNumber(serialNumber);
- Optional<SystemUser> systemUserOpt = systemUserService.getSystemUserAdminByPhone(loginUserInfoVO.getPhone());
Integer accountLevel = 5;
- //获取当前身份，1=党员，2=管理员
- Integer identity = (Integer) redisUtils.get("identity:" + loginUserInfoVO.getPhone());
- if (systemUserOpt.isPresent() && identity == 2) {
- SystemUser systemUser = systemUserOpt.get();
+ //获取当前身份
+ IdentityInformation identityInformationVO = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
+ //1=党员，2=管理员
+ SystemUser systemUser = identityInformationVO.getSystemUser();
+ Integer identity = identityInformationVO.getIdentity();
+ if (identity == 2) {
accountLevel = systemUser.getAccountLevel();
switch (accountLevel) {
case 1:
@@ -158,7 +145,7 @@
complaint.setReportUserPhone(partyMember.getPhone());
break;
}
- } else{
+ } else {
PartyMember partyMember = partyMemberService.getPartyMemberByPhone(loginUserInfoVO.getPhone());
//党员
complaint.setCityCode(510400);
@@ -186,11 +173,6 @@
save(complaint);
}
- /**
- * @param query
- * @param loginUserInfoVO
- * @return
- */
@Override
public Page<ComplaintVO> complaintList(ComplaintQuery query, LoginUserInfoVO loginUserInfoVO) {
Page<ComplaintVO> page = new Page<>(query.getPageNum(), query.getPageSize());
@@ -199,9 +181,10 @@
Long targetId = null;
Integer accountLevel = 5;
//获取当前身份，1=党员，2=管理员
- Integer identity = (Integer) redisUtils.get("identity:" + loginUserInfoVO.getPhone());
+ IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
+ Integer identity = identityInformation.getIdentity();
//上级
- if (systemUserByPhone.isPresent() && identity == 2) {
+ if (systemUserByPhone.isPresent() && null != identity && identity == 2) {
SystemUser systemUser = systemUserByPhone.get();
accountLevel = systemUser.getAccountLevel();
switch (accountLevel) {
@@ -235,135 +218,134 @@
//查询对应诉求
//page = baseMapper.selectComplaintPage(page, query, targetId, isSuperior);
page = baseMapper.selectComplaintPage1(page, query, accountLevel, targetId);
- page.getRecords().forEach(s->{
- buttonPermission(s, systemUserByPhone);
- });
+ page.getRecords().forEach(s -> buttonPermission(s, systemUserByPhone, loginUserInfoVO));
return page;
}
-
-
+
+
/**
* 列表按钮权限
- * @param vo
*/
- public void buttonPermission(ComplaintVO vo, Optional<SystemUser> systemUserByPhone){
+ public void buttonPermission(ComplaintVO vo, Optional<SystemUser> systemUserByPhone, LoginUserInfoVO loginUserInfo) {
vo.setListControlsButtonStatus(1);
vo.setEvaluateButtonStatus(1);
+ vo.setAuditButtonStatus(1);
+
ComplaintAuditRecord one = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, vo.getId())
.ne(ComplaintAuditRecord::getAuditType, 1).orderByDesc(ComplaintAuditRecord::getSort).last(" limit 0, 1"));
//没有审核数据，且正在办理，则按钮权限是添加人员的
- if(null == one && (vo.getStatus() == 0 || vo.getStatus() == 1 || vo.getStatus() == 2)){
- if(systemUserByPhone.isPresent()){
+ if (null == one && (vo.getStatus() == 0 || vo.getStatus() == 1 || vo.getStatus() == 2)) {
+ if (systemUserByPhone.isPresent()) {
SystemUser systemUser = systemUserByPhone.get();
Integer accountLevel = systemUser.getAccountLevel();
Integer isAdmin = systemUser.getIsAdmin();
//非党员用户，必须是管理员有权限
- if(accountLevel.compareTo(vo.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)){
+ if (accountLevel.compareTo(vo.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)) {
vo.setListControlsButtonStatus(0);
}
- }else{
- if(vo.getReportType() == 5){
+ } else {
+ if (vo.getReportType() == 5) {
vo.setListControlsButtonStatus(0);
}
}
}
//有审核数据，且正在办理
- if(null != one && (vo.getStatus() == 0 || vo.getStatus() == 1 || vo.getStatus() == 2)){
+ if (null != one && (vo.getStatus() == 0 || vo.getStatus() == 1 || vo.getStatus() == 2 || vo.getStatus() == 6)) {
//区分是上报数据还是下派数据
- if(one.getAuditType() == 2){
+ if (one.getAuditType() == 2) {
//判断当前审核状态
- if(one.getAuditStatus() == 1){
+ if (one.getAuditStatus() == 1) {
//审核状态为通过，则权限给到上报审核的这一层
- if(systemUserByPhone.isPresent()){
+ if (systemUserByPhone.isPresent()) {
SystemUser systemUser = systemUserByPhone.get();
Integer accountLevel = systemUser.getAccountLevel();
Integer isAdmin = systemUser.getIsAdmin();
//非党员用户，必须是管理员有权限
- if(accountLevel.compareTo(one.getReportType()) == 0 && accountLevel != 5 && 1 == isAdmin){
+ if (accountLevel.compareTo(one.getReportType()) == 0 && accountLevel != 5 && 1 == isAdmin) {
vo.setListControlsButtonStatus(0);
}
}
- }else{
+ } else {
//没有审核通过，则需要查询上一条审核通过的数据，如果没有则给到添加诉求的人
ComplaintAuditRecord one1 = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, vo.getId())
.eq(ComplaintAuditRecord::getAuditType, 2).eq(ComplaintAuditRecord::getAuditStatus, 1).orderByDesc(ComplaintAuditRecord::getSort).last(" limit 0, 1"));
- if(null != one1){
- if(systemUserByPhone.isPresent()){
+ if (null != one1) {
+ if (systemUserByPhone.isPresent()) {
SystemUser systemUser = systemUserByPhone.get();
Integer accountLevel = systemUser.getAccountLevel();
Integer isAdmin = systemUser.getIsAdmin();
//非党员用户，必须是管理员有权限
- if(accountLevel.compareTo(one1.getReportType()) == 0 && accountLevel != 5 && 1 == isAdmin){
+ if (accountLevel.compareTo(one1.getReportType()) == 0 && accountLevel != 5 && 1 == isAdmin) {
vo.setListControlsButtonStatus(0);
}
}
- }else{
+ } else {
//没有上一层审核通过的数据，则权限给到添加人
- if(systemUserByPhone.isPresent()){
+ if (systemUserByPhone.isPresent()) {
SystemUser systemUser = systemUserByPhone.get();
Integer accountLevel = systemUser.getAccountLevel();
Integer isAdmin = systemUser.getIsAdmin();
//非党员用户，必须是管理员有权限
- if(accountLevel.compareTo(vo.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)){
+ if (accountLevel.compareTo(vo.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)) {
vo.setListControlsButtonStatus(0);
}
- }else{
- if(vo.getReportType() == 5){
+ } else {
+ if (vo.getReportType() == 5) {
vo.setListControlsButtonStatus(0);
}
}
}
}
}
-
+
//下派数据
- if(one.getAuditType() == 3){
+ if (one.getAuditType() == 3) {
//判断当前审核状态
- if(one.getAuditStatus() == 1){
+ if (one.getAuditStatus() == 1) {
//审核状态为通过，则权限给到下报审核的这一层
- if(systemUserByPhone.isPresent()){
+ if (systemUserByPhone.isPresent()) {
SystemUser systemUser = systemUserByPhone.get();
Integer accountLevel = systemUser.getAccountLevel();
Integer isAdmin = systemUser.getIsAdmin();
//非党员用户，必须是管理员有权限
- if(accountLevel.compareTo(one.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)){
+ if (accountLevel.compareTo(one.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)) {
vo.setListControlsButtonStatus(0);
}
- }else{
- if(vo.getReportType() == 5 && one.getReportType() == 5){
+ } else {
+ if (vo.getReportType() == 5 && one.getReportType() == 5) {
vo.setListControlsButtonStatus(0);
}
}
- }else{
+ } else {
//没有审核通过，则需要查询上一条审核通过的数据，如果没有则给到添加诉求的人
ComplaintAuditRecord one1 = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, vo.getId())
.eq(ComplaintAuditRecord::getAuditType, 3).eq(ComplaintAuditRecord::getAuditStatus, 1).orderByDesc(ComplaintAuditRecord::getSort).last(" limit 0, 1"));
- if(null != one1){
- if(systemUserByPhone.isPresent()){
+ if (null != one1) {
+ if (systemUserByPhone.isPresent()) {
SystemUser systemUser = systemUserByPhone.get();
Integer accountLevel = systemUser.getAccountLevel();
Integer isAdmin = systemUser.getIsAdmin();
//非党员用户，必须是管理员有权限
- if(accountLevel.compareTo(one1.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)){
+ if (accountLevel.compareTo(one1.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)) {
vo.setListControlsButtonStatus(0);
}
- }else{
- if(vo.getReportType() == 5 && one1.getReportType() == 5){
+ } else {
+ if (vo.getReportType() == 5 && one1.getReportType() == 5) {
vo.setListControlsButtonStatus(0);
}
}
- }else{
+ } else {
//没有上一层审核通过的数据，则权限给到添加人
- if(systemUserByPhone.isPresent()){
+ if (systemUserByPhone.isPresent()) {
SystemUser systemUser = systemUserByPhone.get();
Integer accountLevel = systemUser.getAccountLevel();
Integer isAdmin = systemUser.getIsAdmin();
//非党员用户，必须是管理员有权限
- if(accountLevel.compareTo(vo.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)){
+ if (accountLevel.compareTo(vo.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)) {
vo.setListControlsButtonStatus(0);
}
- }else{
- if(vo.getReportType() == 5){
+ } else {
+ if (vo.getReportType() == 5) {
vo.setListControlsButtonStatus(0);
}
}
@@ -371,26 +353,70 @@
}
}
}
-
+
+ //有审核数据，且为审核中
+ //审核状态为待审核，需要授权审核按钮
+ if (null != one && (vo.getStatus() == 5 || vo.getStatus() == 7) && systemUserByPhone.isPresent()) {
+ SystemUser systemUser = systemUserByPhone.get();
+ String targetId = "";
+ Integer accountLevel = 5;
+ //获取当前身份，1=党员，2=管理员
+ IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfo);
+ if (2 == identityInformation.getIdentity()) {
+ accountLevel = systemUser.getAccountLevel();
+ switch (accountLevel) {
+ case 1:
+ //市级
+ targetId = "510400";
+ break;
+ case 2:
+ //区县级
+ targetId = systemUser.getDistrictsCode();
+ break;
+ case 3:
+ //街道
+ targetId = systemUser.getStreetId().toString();
+ break;
+ case 4:
+ //社区
+ targetId = systemUser.getCommunityId().toString();
+ break;
+ case 5:
+ //党员
+ PartyMember partyMember = partyMemberService.getPartyMemberByPhone(systemUser.getPhone());
+ targetId = partyMember.getId().toString();
+ break;
+ }
+
+ ComplaintAuditRecord one2 = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, vo.getId())
+ .eq(ComplaintAuditRecord::getLatestFlag, 1));
+ Integer isAdmin = systemUserByPhone.get().getIsAdmin();
+ if (one2.getReportType().equals(accountLevel) && one2.getSuperiorId().toString().equals(targetId) && 1 == isAdmin) {
+ vo.setAuditButtonStatus(0);
+ }
+ }
+ }
+
+
//状态为已办结，判断评价按钮
int count = complaintCommentService.count(new LambdaQueryWrapper<ComplaintComment>().eq(ComplaintComment::getComplaintId, vo.getId()).eq(ComplaintComment::getDelFlag, 0));
- if(vo.getStatus() == 3 && 0 == count){
- if(systemUserByPhone.isPresent()){
+ if (vo.getStatus() == 3 && 0 == count) {
+ if (systemUserByPhone.isPresent()) {
SystemUser systemUser = systemUserByPhone.get();
Integer accountLevel = systemUser.getAccountLevel();
Integer isAdmin = systemUser.getIsAdmin();
- if(accountLevel.compareTo(vo.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)){
+ if (accountLevel.compareTo(vo.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)) {
vo.setEvaluateButtonStatus(0);
}
- }else{
- if(vo.getReportType() == 5){
+ } else {
+ if (vo.getReportType() == 5) {
vo.setEvaluateButtonStatus(0);
}
}
}
}
-
-
+
+
/**
* 工单详情
*
@@ -403,7 +429,8 @@
String targetId = "";
Integer accountLevel = 5;
//获取当前身份，1=党员，2=管理员
- Integer identity = (Integer) redisUtils.get("identity:" + loginUserInfoVO.getPhone());
+ IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
+ Integer identity = identityInformation.getIdentity();
//上级
if (systemUserByPhone.isPresent() && identity == 2) {
SystemUser systemUser = systemUserByPhone.get();
@@ -445,31 +472,36 @@
List<ComplaintProgress> list = complaintProgressService.lambdaQuery().eq(ComplaintProgress::getComplaintId, id)
.orderByAsc(ComplaintProgress::getCreateTime).list();
detail.setComplaintProgresses(list);
- detail.setAuditButtonStatus(1);
- detail.setEvaluateButtonStatus(1);
- if((detail.getStatus() == 5 || detail.getStatus() == 7) && systemUserByPhone.isPresent()){
- ComplaintAuditRecord one = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, detail.getId())
- .eq(ComplaintAuditRecord::getLatestFlag, 1));
- Integer isAdmin = systemUserByPhone.get().getIsAdmin();
- if(one.getReportType().equals(accountLevel) && one.getSuperiorId().toString().equals(targetId) && 1 == isAdmin){
- detail.setAuditButtonStatus(0);
- }
- }
- //已办结，显示评价按钮
- int count = complaintCommentService.count(new LambdaQueryWrapper<ComplaintComment>().eq(ComplaintComment::getComplaintId, detail.getId()).eq(ComplaintComment::getDelFlag, 0));
- if(detail.getStatus() == 3 && 0 == count){
- if(systemUserByPhone.isPresent()){
- SystemUser systemUser = systemUserByPhone.get();
- Integer isAdmin = systemUser.getIsAdmin();
- if(accountLevel.compareTo(detail.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)){
- detail.setEvaluateButtonStatus(0);
- }
- }else{
- if(detail.getReportType() == 5){
- detail.setEvaluateButtonStatus(0);
- }
- }
- }
+// detail.setAuditButtonStatus(1);
+// detail.setEvaluateButtonStatus(1);
+// if((detail.getStatus() == 5 || detail.getStatus() == 7) && systemUserByPhone.isPresent()){
+// ComplaintAuditRecord one = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, detail.getId())
+// .eq(ComplaintAuditRecord::getLatestFlag, 1));
+// Integer isAdmin = systemUserByPhone.get().getIsAdmin();
+// if(one.getReportType().equals(accountLevel) && one.getSuperiorId().toString().equals(targetId) && 1 == isAdmin){
+// detail.setAuditButtonStatus(0);
+// }
+// }
+
+
+ buttonPermission(detail, systemUserByPhone, loginUserInfoVO);
+
+
+// //已办结，显示评价按钮
+// int count = complaintCommentService.count(new LambdaQueryWrapper<ComplaintComment>().eq(ComplaintComment::getComplaintId, detail.getId()).eq(ComplaintComment::getDelFlag, 0));
+// if(detail.getStatus() == 3 && 0 == count){
+// if(systemUserByPhone.isPresent()){
+// SystemUser systemUser = systemUserByPhone.get();
+// Integer isAdmin = systemUser.getIsAdmin();
+// if(accountLevel.compareTo(detail.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)){
+// detail.setEvaluateButtonStatus(0);
+// }
+// }else{
+// if(detail.getReportType() == 5){
+// detail.setEvaluateButtonStatus(0);
+// }
+// }
+// }
return detail;
}
@@ -496,12 +528,29 @@
*/
@Override
public void saveResult(ComplaintCompletionDTO dto, LoginUserInfoVO loginUserInfoVO) {
+ //获取当前身份
+ IdentityInformation identityInformationVO = identityInformationService.getIdentityInformation(loginUserInfoVO);
+
+ List<PermissionsVO> permissions = identityInformationVO.getPermissions();
+ if (permissions.isEmpty()) {
+ throw new ServiceException("请先完善个人信息");
+ }
+ Integer accountLevel = null;
+ //上级
+ if (identityInformationVO.getIdentity() == 2) {
+ //1=党员，2=管理员
+ SystemUser systemUser = identityInformationVO.getSystemUser();
+ accountLevel = systemUser.getAccountLevel();
+ }else if (identityInformationVO.getIdentity() == 1){
+ accountLevel = 5;
+ }
Complaint complaint = BeanUtil.copyProperties(dto, Complaint.class);
complaint.setUpdateTime(new Date());
complaint.setCompletionUserId(loginUserInfoVO.getUserId());
complaint.setCompletionUsername(loginUserInfoVO.getNickName());
complaint.setCompletionUserPhone(loginUserInfoVO.getPhone());
complaint.setCompletionTime(new Date());
+ complaint.setCompletionUserLevel(accountLevel);
this.updateById(complaint);
}
@@ -522,21 +571,18 @@
@Transactional(rollbackFor = Exception.class)
public void saveReport(ComplaintReportDTO dto, LoginUserInfoVO loginUserInfoVO) {
String phone = loginUserInfoVO.getPhone();
- SystemUser adminUser = systemUserService.getOne(new LambdaQueryWrapper<SystemUser>()
- .eq(SystemUser::getPhone, phone)
- .eq(SystemUser::getIsAdmin, 1)
- .ne(SystemUser::getStatus, 3)
- .last("LIMIT 1"));
+ IdentityInformation identityInformationVO = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
+ SystemUser adminUser = identityInformationVO.getSystemUser();
Long superiorId;
int reportType;
- if (adminUser == null) {
- superiorId = loginUserInfoVO.getCommunityId();
- if (Objects.isNull(superiorId)) {
- throw new ServiceException("上报失败，请绑定社区");
- }
- reportType = ReportTypeEnum.COMMUNITY.getCode();
- } else {
+ String departmentName = "";
+ if (identityInformationVO.getIdentity() == 1) {
+ PartyMember partyMember = partyMemberService.getPartyMemberByPhone(phone);
+ superiorId = partyMember.getCommunityId();
+ reportType = 4;
+ departmentName = partyMember.getDistricts() + "-" + partyMember.getStreet() + "-" + partyMember.getCommunity();
+ } else if (identityInformationVO.getIdentity() == 2) {
int accountLevel = adminUser.getAccountLevel(); // 改为基本类型
if (accountLevel == 1) {
throw new ServiceException("市级账号,无法上报！");
@@ -550,12 +596,38 @@
superiorId = Long.parseLong(adminUser.getDistrictsCode());
} else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
superiorId = 510400L; // 攀枝花市
- } else if(accountLevel == ReportTypeEnum.PARTY.getCode()){
+ } else if (accountLevel == ReportTypeEnum.PARTY.getCode()) {
superiorId = adminUser.getCommunityId();
} else {
// 处理未预期的账号等级
throw new ServiceException("未知的账号等级");
}
+ //查询社区信息
+ switch (accountLevel) {
+ case 2:
+ BcRegion region = bcRegionService.getDistrictByCode(adminUser.getDistrictsCode().toString());
+ if (Objects.nonNull(region)) {
+ departmentName = region.getRegionName();
+ }
+ break;
+ case 3:
+ ComStreet street = comStreetService.getById(adminUser.getStreetId().toString());
+ if (Objects.nonNull(street)) {
+ BcRegion district = bcRegionService.getDistrictByCode(street.getAreaCode().toString());
+ departmentName = Objects.nonNull(district) ? district.getRegionName() + "-" + street.getName() : street.getName();
+ }
+ break;
+ case 4:
+ ComAct act = comActService.getById(adminUser.getCommunityId());
+ if (Objects.nonNull(act)) {
+ ComStreet street2 = comStreetService.getById(adminUser.getStreetId().toString());
+ BcRegion district = bcRegionService.getDistrictByCode(act.getAreaCode());
+ departmentName = Objects.nonNull(district) && Objects.nonNull(street2) ? district.getRegionName() + "-" + street2.getName() + "-" + act.getName() : act.getName();
+ }
+ break;
+ }
+ } else {
+ throw new ServiceException("未知的账号等级");
}
Complaint complaint = getById(dto.getComplaintId());
@@ -585,23 +657,19 @@
complaintAuditRecord.setSuperiorId(superiorId);
complaintAuditRecord.setComment(dto.getComment());
complaintAuditRecord.setSort(count + 1);
+ complaintAuditRecord.setDepartmentName(departmentName);
complaintAuditRecordService.save(complaintAuditRecord);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void saveDispatch(ComplaintDispatch dto, LoginUserInfoVO loginUserInfoVO) {
- String phone = loginUserInfoVO.getPhone();
- SystemUser adminUser = systemUserService.getOne(new LambdaQueryWrapper<SystemUser>()
- .eq(SystemUser::getPhone, phone)
- .eq(SystemUser::getIsAdmin, 1)
- .ne(SystemUser::getStatus, 3)
- .last("LIMIT 1"));
-
- if (adminUser == null) {
+ IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
+ if (identityInformation.getIdentity() != 2) {
throw new ServiceException("无权下派");
}
+ SystemUser adminUser = identityInformation.getSystemUser();
int accountLevel = adminUser.getAccountLevel(); // 改为基本类型
if (accountLevel == 4) {
throw new ServiceException("社区账号,无法下派！");
@@ -609,18 +677,16 @@
accountLevel++;
Complaint complaint = getById(dto.getComplaintId());
- updateById(complaint);
//查询当前单位审核记录表数据
//查询上报审核记录
- ComplaintAuditRecord complaintAuditRecord = complaintAuditRecordService.lambdaQuery()
- .eq(ComplaintAuditRecord::getComplaintId, dto.getComplaintId())
- .eq(ComplaintAuditRecord::getAuditType, 0)
- .eq(ComplaintAuditRecord::getLatestFlag, true)
- .eq(ComplaintAuditRecord::getReportType, adminUser.getAccountLevel())
- .last("LIMIT 1").one();
+// ComplaintAuditRecord complaintAuditRecord = complaintAuditRecordService.lambdaQuery()
+// .eq(ComplaintAuditRecord::getComplaintId, dto.getComplaintId())
+// .eq(ComplaintAuditRecord::getAuditType, 0)
+// .eq(ComplaintAuditRecord::getLatestFlag, true)
+// .eq(ComplaintAuditRecord::getReportType, adminUser.getAccountLevel())
+// .last("LIMIT 1").one();
// 添加流转记录
- complaintFlowService.createFlow(complaintAuditRecord, 1,loginUserInfoVO.getUserId());
-
+// complaintFlowService.createFlow(complaintAuditRecord, 1,loginUserInfoVO.getUserId());
// 标记最新
complaintAuditRecordService.update(new LambdaUpdateWrapper<ComplaintAuditRecord>()
.eq(ComplaintAuditRecord::getComplaintId, dto.getComplaintId())
@@ -640,17 +706,39 @@
record.setSuperiorId(dto.getDispatchId());
record.setSort(count + 1);
complaintAuditRecordService.save(record);
+ ComplaintAuditRecord complaintAuditRecord = new ComplaintAuditRecord();
+ complaintAuditRecord.setComplaintId(complaint.getId());
+ complaintAuditRecord.setReportType(adminUser.getAccountLevel());
+ Long superiorId = null;
+ switch (adminUser.getAccountLevel()) {
+ case 1:
+ superiorId = 510400L;//默认市级
+ break;
+ case 2:
+ superiorId = Long.parseLong(adminUser.getDistrictsCode());
+ break;
+ case 3:
+ superiorId = Long.parseLong(adminUser.getStreetId());
+ break;
+ case 4:
+ superiorId = adminUser.getCommunityId();
+ break;
+ }
+ complaintAuditRecord.setSuperiorId(superiorId);
+ complaintFlowService.createFlow(complaintAuditRecord, 1, loginUserInfoVO.getUserId());
}
@Override
@Transactional(rollbackFor = Exception.class)
public void reportAudit(ComplaintReporAuditDTO complaintReporAuditDTO, LoginUserInfoVO loginUserInfoVO) {
- Optional<SystemUser> systemUserByPhone = systemUserService.getSystemUserAdminByPhone(loginUserInfoVO.getPhone());
- if (!systemUserByPhone.isPresent()) {
+
+ IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
+
+ SystemUser systemUser = identityInformation.getSystemUser();
+ if (systemUser == null || identityInformation.getIdentity() != 2) {
throw new ServiceException("无权审核");
}
- SystemUser systemUser = systemUserByPhone.get();
Long superiorId = 0L;
switch (systemUser.getAccountLevel()) {
case 1:
@@ -683,7 +771,7 @@
complaintAuditRecord.setAuditorId(loginUserInfoVO.getUserId());
complaintAuditRecordService.updateById(complaintAuditRecord);
//创建流程
- complaintFlowService.createFlow(complaintAuditRecord ,0, loginUserInfoVO.getUserId());
+ complaintFlowService.createFlow(complaintAuditRecord, 0, loginUserInfoVO.getUserId());
} else {
complaintAuditRecord.setRejectReason(complaintReporAuditDTO.getRejectReason());
complaintAuditRecord.setAuditStatus(2);
@@ -696,16 +784,21 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void saveDelay(ComplaintDelayDTO dto, LoginUserInfoVO loginUserInfoVO) {
+ IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
+
SystemUser systemUser = systemUserService.getSystemUserAdminByPhone(loginUserInfoVO.getPhone()).orElse(null);
Long superiorId;
int reportType;
- if (systemUser == null) {
- superiorId = loginUserInfoVO.getCommunityId();
+ String departmentName = "";
+ if (identityInformation.getIdentity() == 1) {
+ PartyMember partyMember = partyMemberService.getPartyMemberByPhone(loginUserInfoVO.getPhone());
+ superiorId = partyMember.getCommunityId();
if (Objects.isNull(superiorId)) {
throw new ServiceException("延期申请失败，请绑定社区");
}
reportType = ReportTypeEnum.COMMUNITY.getCode();
- } else {
+ departmentName = partyMember.getDistricts() + "-" + partyMember.getStreet() + "-" + partyMember.getCommunity();
+ } else if (identityInformation.getIdentity() == 2 && systemUser != null) {
int accountLevel = systemUser.getAccountLevel(); // 改为基本类型
if (accountLevel == 1) {
throw new ServiceException("市级账号,无法延期申请！");
@@ -725,6 +818,32 @@
// 处理未预期的账号等级
throw new ServiceException("未知的账号等级");
}
+ //查询社区信息
+ switch (accountLevel) {
+ case 2:
+ BcRegion region = bcRegionService.getDistrictByCode(systemUser.getDistrictsCode().toString());
+ if (Objects.nonNull(region)) {
+ departmentName = region.getRegionName();
+ }
+ break;
+ case 3:
+ ComStreet street = comStreetService.getById(systemUser.getStreetId().toString());
+ if (Objects.nonNull(street)) {
+ BcRegion district = bcRegionService.getDistrictByCode(street.getAreaCode().toString());
+ departmentName = Objects.nonNull(district) ? district.getRegionName() + "-" + street.getName() : street.getName();
+ }
+ break;
+ case 4:
+ ComAct act = comActService.getById(systemUser.getCommunityId());
+ if (Objects.nonNull(act)) {
+ ComStreet street2 = comStreetService.getById(systemUser.getStreetId().toString());
+ BcRegion district = bcRegionService.getDistrictByCode(act.getAreaCode());
+ departmentName = Objects.nonNull(district) && Objects.nonNull(street2) ? district.getRegionName() + "-" + street2.getName() + "-" + act.getName() : act.getName();
+ }
+ break;
+ }
+ } else {
+ throw new ServiceException("无权申请");
}
// 清除最新记录
@@ -746,13 +865,19 @@
record1.setSuperiorId(superiorId);
record1.setSort(count + 1);
record1.setComment(dto.getComment());
+ record1.setDepartmentName(departmentName);
complaintAuditRecordService.save(record1);
}
@Override
public void delayAudit(ComplaintDelayAuditDTO dto, LoginUserInfoVO loginUserInfoVO) {
- SystemUser systemUser = systemUserService.getSystemUserAdminByPhone(loginUserInfoVO.getPhone()).orElse(null);
+ IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
+ SystemUser systemUser = identityInformation.getSystemUser();
+ if (identityInformation.getIdentity() != 2 || systemUser == null) {
+ throw new ServiceException("无权审核");
+ }
+
int accountLevel = systemUser.getAccountLevel(); // 改为基本类型
Long superiorId;
// 使用基本类型比较并补充默认分支
@@ -762,7 +887,7 @@
superiorId = Long.parseLong(systemUser.getStreetId());
} else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
superiorId = Long.parseLong(systemUser.getDistrictsCode());
- } else if (accountLevel == ReportTypeEnum.CITY.getCode()) {
+ } else if (accountLevel == ReportTypeEnum.CITY.getCode()) {
superiorId = 510400L;
} else {
// 处理未预期的账号等级
@@ -788,13 +913,13 @@
Complaint complaint = getById(complaintAuditRecord.getComplaintId());
complaint.setStatus(1);
updateById(complaint);
-
+
complaintAuditRecord.setAuditStatus(1);
complaintAuditRecord.setAuditorId(loginUserInfoVO.getUserId());
complaintAuditRecordService.updateById(complaintAuditRecord);
}
//审核不通过
- if(complaintAuditRecord.getAuditType().equals(1) && complaintAuditRecord.getAuditStatus().equals(0) && dto.getAuditResult().equals(2)){
+ if (complaintAuditRecord.getAuditType().equals(1) && complaintAuditRecord.getAuditStatus().equals(0) && dto.getAuditResult().equals(2)) {
complaintAuditRecord.setRejectReason(dto.getRejectReason());
complaintAuditRecord.setAuditStatus(2);
complaintAuditRecord.setAuditorId(loginUserInfoVO.getUserId());
@@ -805,14 +930,11 @@
@Override
public List<DispatchVO> getDispatchList(LoginUserInfoVO loginUserInfoVO) {
- String phone = loginUserInfoVO.getPhone();
- SystemUser adminUser = systemUserService.getOne(new LambdaQueryWrapper<SystemUser>()
- .eq(SystemUser::getPhone, phone)
- .eq(SystemUser::getIsAdmin, 1)
- .ne(SystemUser::getStatus, 3)
- .last("LIMIT 1"));
+ IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
- if (adminUser == null) {
+ SystemUser adminUser = identityInformation.getSystemUser();
+
+ if (adminUser == null || identityInformation.getIdentity() != 2) {
throw new ServiceException("无权下派");
}
int accountLevel = adminUser.getAccountLevel(); // 改为基本类型
@@ -865,12 +987,12 @@
*/
@Override
public Page<ComplaintTodoVO> getTodoList(BasePage basePage, LoginUserInfoVO loginUserInfo) {
- Optional<SystemUser> systemUserByPhone = systemUserService.getSystemUserAdminByPhone(loginUserInfo.getPhone());
+ IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfo);
+ SystemUser systemUser = identityInformation.getSystemUser();
String targetId = "";
int isSuperior = 0;
//上级
- if (systemUserByPhone.isPresent()) {
- SystemUser systemUser = systemUserByPhone.get();
+ if (identityInformation.getIdentity() == 2) {
Integer accountLevel = systemUser.getAccountLevel();
switch (accountLevel) {
case 1:
@@ -883,7 +1005,7 @@
break;
case 3:
//街道
- targetId = systemUser.getStreetId().toString();
+ targetId = systemUser.getStreetId();
break;
case 4:
//社区
@@ -895,8 +1017,7 @@
//党员
targetId = loginUserInfo.getUserId().toString();
}
- Page<ComplaintTodoVO> page = baseMapper.getTodoList(new Page<>(basePage.getPageNum(), basePage.getPageSize()), targetId, isSuperior);
- return page;
+ return baseMapper.getTodoList(new Page<>(basePage.getPageNum(), basePage.getPageSize()), targetId, isSuperior);
}
/**
@@ -922,7 +1043,7 @@
*/
@Override
public Page<ComplaintVO> pageList(MgtComplaintQuery query, SystemUserVo loginUserInfo) {
- return baseMapper.pageList(new Page<>(query.getPageNum(), query.getPageSize()), query,loginUserInfo);
+ return baseMapper.pageList(new Page<>(query.getPageNum(), query.getPageSize()), query, loginUserInfo);
}
@Override
@@ -930,10 +1051,14 @@
Complaint complaint = getById(id);
ComplaintVO complaintVO = BeanUtil.copyProperties(complaint, ComplaintVO.class);
//查询办理进度
- List<ComplaintProgress> complaintProgresses = complaintProgressService.lambdaQuery().eq(ComplaintProgress::getComplaintId, id).orderByAsc(ComplaintProgress::getCreateTime).list();
+ List<ComplaintProgress> complaintProgresses = complaintProgressService.lambdaQuery()
+ .eq(ComplaintProgress::getComplaintId, id).orderByDesc(ComplaintProgress::getCreateTime).list();
complaintVO.setComplaintProgresses(complaintProgresses);
//查询诉求流转记录
- List<ComplaintFlow> complaintFlows = complaintFlowService.lambdaQuery().eq(ComplaintFlow::getComplaintId, id).orderByAsc(ComplaintFlow::getCreateTime).list();
+ List<ComplaintFlow> complaintFlows = complaintFlowService.lambdaQuery()
+ .eq(ComplaintFlow::getComplaintId, id)
+ .orderByAsc(ComplaintFlow::getCreateTime)
+ .list();
complaintVO.setComplaintFlows(complaintFlows);
//查询评价
ComplaintComment comment = complaintCommentService.lambdaQuery().eq(ComplaintComment::getComplaintId, id).last("LIMIT 1").one();
@@ -943,12 +1068,13 @@
/**
* 诉求列表导出
+ *
* @param query
* @param loginUserInfo
*/
@Override
public void export(MgtComplaintQuery query, SystemUserVo loginUserInfo) throws IOException {
- List<ComplaintVO> list = baseMapper.getList(query, loginUserInfo);
+ List<ComplaintVO> list = baseMapper.getList(query, loginUserInfo);
List<ComplaintExcel> complaintExcels = BeanUtil.copyToList(list, ComplaintExcel.class);
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setCharacterEncoding("utf-8");
@@ -960,22 +1086,55 @@
}
@Override
- public void downloadFile(Long id,Integer type) throws IOException {
+ public void downloadFile(Long id, Integer type) throws IOException {
Complaint complaint = baseMapper.getDetailBg(id);
if (Objects.isNull(complaint)) {
throw new ServiceException("该诉求不存在");
}
- //查询社区信息
- BcRegion region = bcRegionService.getDistrictByCode(complaint.getDistrictsCode().toString());
- ComStreet street = comStreetService.getById(complaint.getStreetId().toString());
- ComAct act = comActService.getById(complaint.getCommunityId());
- String community = region.getRegionName() +"-"+ street.getName() + "-"+ act.getName();
+ //查询社区信息
+ Integer reportType = complaint.getReportType();
+ String community = "";
+ switch (reportType) {
+ case 1:
+ community = "攀枝花市";
+ break;
+ case 2:
+ BcRegion region = bcRegionService.getDistrictByCode(complaint.getDistrictsCode().toString());
+ if (Objects.nonNull(region)) {
+ community = region.getRegionName();
+ }
+ break;
+ case 3:
+ ComStreet street = comStreetService.getById(complaint.getStreetId().toString());
+ if (Objects.nonNull(street)) {
+ BcRegion district = bcRegionService.getDistrictByCode(street.getAreaCode().toString());
+ community = Objects.nonNull(district) ? district.getRegionName() + "-" + street.getName() : street.getName();
+ }
+ break;
+ case 4:
+ ComAct act = comActService.getById(complaint.getCommunityId());
+ if (Objects.nonNull(act)) {
+ ComStreet street2 = comStreetService.getById(complaint.getStreetId().toString());
+ BcRegion district = bcRegionService.getDistrictByCode(act.getAreaCode());
+ community = Objects.nonNull(district) && Objects.nonNull(street2) ? district.getRegionName() + "-" + street2.getName() + "-" + act.getName() : act.getName();
+ }
+ break;
+ case 5:
+ ComAct act2 = comActService.getById(complaint.getCommunityId());
+ if (Objects.nonNull(act2)) {
+ ComStreet street2 = comStreetService.getById(complaint.getStreetId().toString());
+ BcRegion district = bcRegionService.getDistrictByCode(act2.getAreaCode());
+ community = Objects.nonNull(district) && Objects.nonNull(street2) ? district.getRegionName() + "-" + street2.getName() + "-" + act2.getName() : act2.getName();
+ }
+ break;
+ }
+
PartyMember partyMember = null;
- if (Objects.nonNull(complaint.getPartyMemberId())){
- partyMember = partyMemberService.getById(complaint.getPartyMemberId());
+ if (Objects.nonNull(complaint.getPartyMemberId())) {
+ partyMember = partyMemberService.getById(complaint.getPartyMemberId());
}
String fileName = "";
- switch (type){
+ switch (type) {
case 1:
fileName = "社区问题单";
break;
@@ -984,8 +1143,18 @@
if (Objects.nonNull(partyMember)) {
community = community + "-" + partyMember.getServiceTarget();
}
+ reportType = complaint.getCompletionUserLevel();
break;
case 3:
+ //如果上报或下派了，取当前操作人的层级
+ ComplaintAuditRecord record = complaintAuditRecordService.lambdaQuery().eq(ComplaintAuditRecord::getComplaintId, complaint.getId())
+ .in(ComplaintAuditRecord::getAuditType, 2, 3)
+ .eq(ComplaintAuditRecord::getAuditStatus, AuditStatusEnum.APPROVED.getCode())
+ .eq(ComplaintAuditRecord::getLatestFlag, true)
+ .last("LIMIT 1").one();
+ if (Objects.nonNull(record)) {
+ reportType = record.getReportType();
+ }
fileName = "协调通知单";
break;
}
@@ -993,8 +1162,8 @@
map.put("community", community);
map.put("problemType", complaint.getProblemType());
map.put("descriptionContent", complaint.getDescriptionContent());
- map.put("reportType", ReportTypeEnum.fromCode(complaint.getReportType()).getDescription());
- map.put("partyOrganization",Objects.nonNull(partyMember)? partyMember.getPartyOrganization() : "");
+ map.put("reportType", ReportTypeEnum.getDescriptionByCode(reportType));
+ map.put("partyOrganization", Objects.nonNull(partyMember) ? partyMember.getPartyOrganization() : "");
map.put("name", complaint.getName());
map.put("contactNumber", complaint.getContactNumber());
map.put("nickname", complaint.getReportUserName());
@@ -1003,7 +1172,7 @@
StringBuilder sb = new StringBuilder();
if (CollUtil.isNotEmpty(list)) {
int rowNum = 1;
- list.forEach(item->{
+ list.forEach(item -> {
sb.append(rowNum).append("、 ");
sb.append(item.getDescribe()).append("\n");
});
@@ -1020,8 +1189,8 @@
}
response.setContentType("application/octet-stream");
String fileNameEncode = URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20");
- response.setHeader("Content-disposition","attachment;filename=\""+fileNameEncode+".docx"+"\"");
- String fileTemplateName = FileUtil.getPath() + "template/"+fileName+".docx";
+ response.setHeader("Content-disposition", "attachment;filename=\"" + fileNameEncode + ".docx" + "\"");
+ String fileTemplateName = FileUtil.getPath() + "template/" + fileName + ".docx";
XWPFTemplate.compile(fileTemplateName).render(map).writeAndClose(response.getOutputStream());
}
@@ -1048,16 +1217,17 @@
e.printStackTrace();
}
}
-
-
+
+
/**
* 获取超时未评价的数据
+ *
* @return
*/
@Override
- public List<Complaint> getTimeoutAndNotComment() {
- return this.baseMapper.getTimeoutAndNotComment();
- }
+ public List<Complaint> getTimeoutAndNotComment() {
+ return this.baseMapper.getTimeoutAndNotComment();
+ }
}
--
Gitblit v1.7.1