From 40bfb646d1b962d33841c1ebbceb0dd7cb668bfb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 29 四月 2025 14:54:04 +0800
Subject: [PATCH] 后台日志管理
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java | 561 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 358 insertions(+), 203 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 441d8ff..3fd561c 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,7 +2,6 @@
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;
@@ -12,7 +11,12 @@
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.common.utlis.StringUtils;
+import com.panzhihua.sangeshenbian.config.AutoColumnWidthStrategy;
import com.panzhihua.sangeshenbian.dao.ComplaintMapper;
+import com.panzhihua.sangeshenbian.enums.AuditStatusEnum;
+import com.panzhihua.sangeshenbian.enums.ComplaintExportEnum;
import com.panzhihua.sangeshenbian.enums.ProcessStatusEnum;
import com.panzhihua.sangeshenbian.enums.RateEnum;
import com.panzhihua.sangeshenbian.enums.ReportTypeEnum;
@@ -25,18 +29,20 @@
import com.panzhihua.sangeshenbian.model.vo.ComplaintVO;
import com.panzhihua.sangeshenbian.model.vo.DispatchVO;
import com.panzhihua.sangeshenbian.service.*;
-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 jodd.util.StringUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
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;
+import java.io.InputStream;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -68,6 +74,7 @@
private final HttpServletResponse response;
private final IPartyMemberService partyMemberService;
private final IdentityInformationService identityInformationService;
+ private final RedisUtils redisUtils;
@Override
public void saveComplaint(Complaint complaint, LoginUserInfoVO loginUserInfoVO) {
@@ -95,13 +102,9 @@
complaint.setSerialNumber(serialNumber);
Integer accountLevel = 5;
//获取当前身份
- IdentityInformation identityInformationVO = identityInformationService.getIdentityInformation(loginUserInfoVO);
+ IdentityInformation identityInformationVO = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
//1=党员，2=管理员
SystemUser systemUser = identityInformationVO.getSystemUser();
- List<PermissionsVO> permissions = identityInformationVO.getPermissions();
- if (permissions.isEmpty()) {
- throw new ServiceException("请先完善个人信息");
- }
Integer identity = identityInformationVO.getIdentity();
if (identity == 2) {
accountLevel = systemUser.getAccountLevel();
@@ -148,7 +151,7 @@
complaint.setReportUserPhone(partyMember.getPhone());
break;
}
- } else{
+ } else {
PartyMember partyMember = partyMemberService.getPartyMemberByPhone(loginUserInfoVO.getPhone());
//党员
complaint.setCityCode(510400);
@@ -177,18 +180,43 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
+ public void saveAndReport(ComplaintVO complaintVO, LoginUserInfoVO loginUserInfo) {
+ Complaint complaint = new Complaint();
+ BeanUtil.copyProperties(complaintVO, complaint);
+ saveComplaint(complaint, loginUserInfo);
+ ComplaintReportDTO dto = new ComplaintReportDTO();
+ dto.setComplaintId(complaint.getId());
+ dto.setComment(complaintVO.getComment());
+ saveReport(dto, loginUserInfo);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void saveAndComplete(ComplaintSaveAndCompleteDTO complaintVO, LoginUserInfoVO loginUserInfo) {
+ Complaint complaint = new Complaint();
+ BeanUtil.copyProperties(complaintVO, complaint);
+ saveComplaint(complaint, loginUserInfo);
+
+ ComplaintCompletionDTO complaintCompletionDTO = complaintVO.getComplaintCompletionDTO();
+ complaintCompletionDTO.setComplaintId(complaint.getId());
+ complaintCompletionDTO.setId(complaint.getId());
+ saveResult(complaintCompletionDTO, loginUserInfo);
+ }
+
+ @Override
public Page<ComplaintVO> complaintList(ComplaintQuery query, LoginUserInfoVO loginUserInfoVO) {
+
+
Page<ComplaintVO> page = new Page<>(query.getPageNum(), query.getPageSize());
//判断当前登录用户级别，查询对应工单
Optional<SystemUser> systemUserByPhone = systemUserService.getSystemUserAdminByPhone(loginUserInfoVO.getPhone());
Long targetId = null;
Integer accountLevel = 5;
//获取当前身份，1=党员，2=管理员
- IdentityInformation identityInformation = identityInformationService.getIdentityInformation(loginUserInfoVO);
- if (CollectionUtil.isEmpty(identityInformation.getPermissions())){
- throw new ServiceException("请先完善个人信息");
- }
+ IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
Integer identity = identityInformation.getIdentity();
+ query.setUserId(loginUserInfoVO.getUserId());
//上级
if (systemUserByPhone.isPresent() && null != identity && identity == 2) {
SystemUser systemUser = systemUserByPhone.get();
@@ -224,136 +252,124 @@
//查询对应诉求
//page = baseMapper.selectComplaintPage(page, query, targetId, isSuperior);
page = baseMapper.selectComplaintPage1(page, query, accountLevel, targetId);
- page.getRecords().forEach(s-> buttonPermission(s, systemUserByPhone, loginUserInfoVO));
+
+ for (ComplaintVO s : page.getRecords()) {
+ buttonPermission(s, systemUserByPhone, loginUserInfoVO);
+ Integer auditButtonStatus = s.getAuditButtonStatus();
+
+ Long reporterId = s.getReporterId();
+ Long superiorId = s.getSuperiorId2();
+ if (!targetId.equals(reporterId) && !targetId.equals(superiorId) && (s.getStatus() == 5)) {
+ s.setStatus(0);
+ }
+ }
return page;
}
-
-
+
+
/**
* 列表按钮权限
*/
- public void buttonPermission(ComplaintVO vo, Optional<SystemUser> systemUserByPhone, LoginUserInfoVO loginUserInfo){
+ 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"));
+ // 获取身份
+ IdentityInformation currentIdentityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfo);
+ Integer identity = currentIdentityInformation.getIdentity();
+ 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 (2 == identity && accountLevel.compareTo(vo.getReportType()) == 0 && (accountLevel != 5 && 1 == isAdmin)) {
vo.setListControlsButtonStatus(0);
}
- }else{
- if(vo.getReportType() == 5){
+ //如果当前身份是党员
+ if (1 == identity && 5 == vo.getReportType()) {
+ vo.setListControlsButtonStatus(0);
+ }
+ } else {
+ if (vo.getReportType() == 5) {
vo.setListControlsButtonStatus(0);
}
}
}
//有审核数据，且正在办理
- if(null != one && (vo.getStatus() == 0 || vo.getStatus() == 1 || vo.getStatus() == 2 || vo.getStatus() == 6)){
+ if (null != one && (vo.getStatus() == 0 || vo.getStatus() == 1 || vo.getStatus() == 2 || vo.getStatus() == 6)) {
//区分是上报数据还是下派数据
- if(one.getAuditType() == 2){
+ if (one.getAuditType() == 2 || one.getAuditType() == 1) {
//判断当前审核状态
- if(one.getAuditStatus() == 1){
+ if (one.getAuditStatus() == 1) {
//审核状态为通过，则权限给到上报审核的这一层
- if(systemUserByPhone.isPresent()){
+ if (systemUserByPhone.isPresent() && identity == 2) {
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) {
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()){
+ 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()) {
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 (2 == identity && accountLevel.compareTo(vo.getReportType()) == 0 && (accountLevel != 5 && 1 == isAdmin)) {
vo.setListControlsButtonStatus(0);
}
- }else{
- if(vo.getReportType() == 5){
+ //如果当前身份是党员
+ if (1 == identity && 5 == vo.getReportType()) {
+ vo.setListControlsButtonStatus(0);
+ }
+ } 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 && 1 == isAdmin && 2 == identity) {
vo.setListControlsButtonStatus(0);
- }
- }else{
- if(vo.getReportType() == 5 && one.getReportType() == 5){
- vo.setListControlsButtonStatus(0);
- }
- }
- }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()){
- SystemUser systemUser = systemUserByPhone.get();
- Integer accountLevel = systemUser.getAccountLevel();
- Integer isAdmin = systemUser.getIsAdmin();
- //非党员用户，必须是管理员有权限
- if(accountLevel.compareTo(one1.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)){
- vo.setListControlsButtonStatus(0);
- }
- }else{
- if(vo.getReportType() == 5 && one1.getReportType() == 5){
- vo.setListControlsButtonStatus(0);
- }
- }
- }else{
- //没有上一层审核通过的数据，则权限给到添加人
- 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)){
- vo.setListControlsButtonStatus(0);
- }
- }else{
- if(vo.getReportType() == 5){
- vo.setListControlsButtonStatus(0);
- }
}
}
}
@@ -362,13 +378,12 @@
//有审核数据，且为审核中
//审核状态为待审核，需要授权审核按钮
- if(null != one && (vo.getStatus() == 5 || vo.getStatus() == 7) && systemUserByPhone.isPresent()){
+ 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.getIdentityInformation(loginUserInfo);
- if(2 == identityInformation.getIdentity()){
+ if (2 == currentIdentityInformation.getIdentity()) {
accountLevel = systemUser.getAccountLevel();
switch (accountLevel) {
case 1:
@@ -394,35 +409,51 @@
break;
}
- ComplaintAuditRecord one2 = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, vo.getId())
+ 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){
+ 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 || vo.getStatus() == 8) && 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 (2 == identity && accountLevel.compareTo(vo.getReportType()) == 0 && accountLevel != 5 && 1 == isAdmin) {
vo.setEvaluateButtonStatus(0);
}
- }else{
- if(vo.getReportType() == 5){
+ //当前是党员身份，只有是以党员身份提交的数据才有权限
+ if (1 == identity && vo.getReportType() == 5) {
+ vo.setEvaluateButtonStatus(0);
+ }
+ } else {
+ if (vo.getReportType() == 5) {
vo.setEvaluateButtonStatus(0);
}
}
}
+
+ Long auditCreateBy = vo.getAuditCreateBy();
+ Long userId = loginUserInfo.getUserId();
+ if (null != auditCreateBy && auditCreateBy.compareTo(userId) == 0 && vo.getStatus() == 5) {
+ vo.setWithdrawButtonStatus(0);
+ } else {
+ vo.setWithdrawButtonStatus(1);
+ }
+
+
}
-
-
+
+
/**
* 工单详情
*
@@ -435,10 +466,7 @@
String targetId = "";
Integer accountLevel = 5;
//获取当前身份，1=党员，2=管理员
- IdentityInformation identityInformation = identityInformationService.getIdentityInformation(loginUserInfoVO);
- if (CollectionUtil.isEmpty(identityInformation.getPermissions())){
- throw new ServiceException("身份信息异常");
- }
+ IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
Integer identity = identityInformation.getIdentity();
//上级
if (systemUserByPhone.isPresent() && identity == 2) {
@@ -474,28 +502,30 @@
}
ComplaintVO detail = baseMapper.getDetail(id);
if (detail.getStatus().equals(0)) {
- List<ComplaintFlow> list = complaintFlowService.lambdaQuery().eq(ComplaintFlow::getComplaintId, id).orderByAsc(ComplaintFlow::getCreateTime).list();
+ List<ComplaintFlow> list = complaintFlowService.lambdaQuery().eq(ComplaintFlow::getComplaintId, id).orderByAsc(ComplaintFlow::getSort).list();
detail.setComplaintFlows(list);
}
//查询办理进度
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);
-// }
-// }
-
-
+
+
buttonPermission(detail, systemUserByPhone, loginUserInfoVO);
-
-
+ Long reporterId = detail.getReporterId();
+ Long superiorId = detail.getSuperiorId2();
+ if (!String.valueOf(reporterId).equals(targetId) && !String.valueOf(superiorId).equals(targetId) && detail.getStatus() == 5) {
+ detail.setStatus(0);
+ }
+
+
+// if (auditButtonStatus == 1 && detail.getStatus() == 5 && !Objects.equals(detail.getAuditCreateBy(), loginUserInfoVO.getUserId())){
+// detail.setStatus(0);
+// }
+
+
+
+
// //已办结，显示评价按钮
// int count = complaintCommentService.count(new LambdaQueryWrapper<ComplaintComment>().eq(ComplaintComment::getComplaintId, detail.getId()).eq(ComplaintComment::getDelFlag, 0));
// if(detail.getStatus() == 3 && 0 == count){
@@ -522,10 +552,27 @@
*/
@Override
public void saveProcess(ComplaintProcessDTO dto, LoginUserInfoVO loginUserInfoVO) {
+ //获取当前身份
+ IdentityInformation identityInformationVO = identityInformationService.getIdentityInformation(loginUserInfoVO);
+
+ List<PermissionsVO> permissions = identityInformationVO.getPermissions();
+ if (permissions.isEmpty()) {
+ throw new ServiceException("请先完善个人信息");
+ }
+ //上级
+ String name = "";
+ if (identityInformationVO.getIdentity() == 2) {
+ //1=党员，2=管理员
+ SystemUser systemUser = identityInformationVO.getSystemUser();
+ name = systemUser.getName();
+ } else if (identityInformationVO.getIdentity() == 1) {
+ PartyMember partyMember = identityInformationVO.getPartyMember();
+ name = partyMember.getName();
+ }
ComplaintProgress complaintProgress = BeanUtil.copyProperties(dto, ComplaintProgress.class);
complaintProgress.setCreateTime(new Date());
complaintProgress.setCreateBy(loginUserInfoVO.getUserId());
- complaintProgress.setCreateByName(loginUserInfoVO.getNickName());
+ complaintProgress.setCreateByName(name);
complaintProgressService.save(complaintProgress);
}
@@ -537,12 +584,33 @@
*/
@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;
+ String name = "";
+ //上级
+ if (identityInformationVO.getIdentity() == 2) {
+ //1=党员，2=管理员
+ SystemUser systemUser = identityInformationVO.getSystemUser();
+ accountLevel = systemUser.getAccountLevel();
+ name = systemUser.getName();
+ } else if (identityInformationVO.getIdentity() == 1) {
+ accountLevel = 5;
+ PartyMember partyMember = identityInformationVO.getPartyMember();
+ name = partyMember.getName();
+ }
Complaint complaint = BeanUtil.copyProperties(dto, Complaint.class);
complaint.setUpdateTime(new Date());
complaint.setCompletionUserId(loginUserInfoVO.getUserId());
- complaint.setCompletionUsername(loginUserInfoVO.getNickName());
+ complaint.setCompletionUsername(name);
complaint.setCompletionUserPhone(loginUserInfoVO.getPhone());
complaint.setCompletionTime(new Date());
+ complaint.setCompletionUserLevel(accountLevel);
this.updateById(complaint);
}
@@ -559,51 +627,55 @@
.orderByAsc(ComplaintProgress::getCreateTime).list();
}
+
@Override
@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.getIdentityInformation(loginUserInfoVO);
- if (CollectionUtil.isEmpty(identityInformationVO.getPermissions())) {
- throw new ServiceException("请先完成认证");
- }
+ IdentityInformation identityInformationVO = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
+ SystemUser adminUser = identityInformationVO.getSystemUser();
Long superiorId;
int reportType;
+ int reporterLevel;
+ Long reporterId = null;
String departmentName = "";
+ String reporter = "";
if (identityInformationVO.getIdentity() == 1) {
PartyMember partyMember = partyMemberService.getPartyMemberByPhone(phone);
superiorId = partyMember.getCommunityId();
+ reporterId = partyMember.getId();
reportType = 4;
+ reporterLevel = 5;
departmentName = partyMember.getDistricts() + "-" + partyMember.getStreet() + "-" + partyMember.getCommunity();
+ reporter = partyMember.getName();
} else if (identityInformationVO.getIdentity() == 2) {
int accountLevel = adminUser.getAccountLevel(); // 改为基本类型
if (accountLevel == 1) {
throw new ServiceException("市级账号,无法上报！");
}
reportType = accountLevel - 1;
+ reporterLevel = accountLevel;
+ reporter = adminUser.getName();
// 使用基本类型比较并补充默认分支
if (accountLevel == ReportTypeEnum.COMMUNITY.getCode()) {
superiorId = Long.parseLong(adminUser.getStreetId());
+ reporterId = adminUser.getCommunityId();
} else if (accountLevel == ReportTypeEnum.STREET.getCode()) {
superiorId = Long.parseLong(adminUser.getDistrictsCode());
+ reporterId = Long.parseLong(adminUser.getStreetId());
} else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
superiorId = 510400L; // 攀枝花市
- } else if(accountLevel == ReportTypeEnum.PARTY.getCode()){
+ reporterId = Long.parseLong(adminUser.getDistrictsCode());
+ } else if (accountLevel == ReportTypeEnum.PARTY.getCode()) {
superiorId = adminUser.getCommunityId();
} else {
// 处理未预期的账号等级
throw new ServiceException("未知的账号等级");
}
//查询社区信息
- switch (accountLevel){
+ switch (accountLevel) {
case 2:
BcRegion region = bcRegionService.getDistrictByCode(adminUser.getDistrictsCode().toString());
if (Objects.nonNull(region)) {
@@ -622,11 +694,11 @@
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();
+ departmentName = Objects.nonNull(district) && Objects.nonNull(street2) ? district.getRegionName() + "-" + street2.getName() + "-" + act.getName() : act.getName();
}
break;
}
- }else {
+ } else {
throw new ServiceException("未知的账号等级");
}
@@ -652,23 +724,56 @@
complaintAuditRecord.setCreateTime(new Date());
complaintAuditRecord.setUpdateBy(loginUserInfoVO.getUserId());
complaintAuditRecord.setUpdateTime(new Date());
- complaintAuditRecord.setReporter(loginUserInfoVO.getNickName());
+ complaintAuditRecord.setReporter(reporter);
complaintAuditRecord.setReportType(reportType);
complaintAuditRecord.setSuperiorId(superiorId);
complaintAuditRecord.setComment(dto.getComment());
complaintAuditRecord.setSort(count + 1);
complaintAuditRecord.setDepartmentName(departmentName);
+ complaintAuditRecord.setReporterLevel(reporterLevel);
+ complaintAuditRecord.setReporterId(reporterId);
complaintAuditRecordService.save(complaintAuditRecord);
+ }
+
+ @Override
+ public void reportWithdraw(ComplaintReportWithdrawDTO dto, LoginUserInfoVO loginUserInfoVO) {
+ ComplaintAuditRecord complaintAuditRecord = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>()
+ .eq(ComplaintAuditRecord::getComplaintId, dto.getComplaintId())
+ .eq(ComplaintAuditRecord::getAuditType, 2)
+ .eq(ComplaintAuditRecord::getLatestFlag, true));
+ if (Objects.isNull(complaintAuditRecord)) {
+ throw new ServiceException("未找到相关记录");
+ }
+ complaintAuditRecord.setAuditStatus(3);
+ complaintAuditRecord.setUpdateBy(loginUserInfoVO.getUserId());
+ complaintAuditRecord.setUpdateTime(new Date());
+ complaintAuditRecord.setLatestFlag(false);
+ complaintAuditRecordService.updateById(complaintAuditRecord);
+
+ // 获取上一条记录
+ ComplaintAuditRecord lastRecord = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>()
+ .ne(ComplaintAuditRecord::getId, complaintAuditRecord.getId())
+ .eq(ComplaintAuditRecord::getComplaintId, dto.getComplaintId())
+ .eq(ComplaintAuditRecord::getAuditType, 2)
+ .eq(ComplaintAuditRecord::getLatestFlag, false)
+ .orderByDesc(ComplaintAuditRecord::getSort)
+ );
+ if (Objects.nonNull(lastRecord)) {
+ // 复制上一条记录
+ ComplaintAuditRecord newRecord = new ComplaintAuditRecord();
+ BeanUtils.copyProperties(lastRecord, newRecord);
+ newRecord.setId(null);
+ newRecord.setLatestFlag(true);
+ newRecord.setUpdateBy(loginUserInfoVO.getUserId());
+ newRecord.setUpdateTime(new Date());
+ complaintAuditRecordService.save(newRecord);
+ }
}
@Override
@Transactional(rollbackFor = Exception.class)
public void saveDispatch(ComplaintDispatch dto, LoginUserInfoVO loginUserInfoVO) {
- IdentityInformation identityInformation = identityInformationService.getIdentityInformation(loginUserInfoVO);
- List<PermissionsVO> permissions = identityInformation.getPermissions();
- if (CollectionUtil.isEmpty(permissions)) {
- throw new ServiceException("请先完成认证");
- }
+ IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
if (identityInformation.getIdentity() != 2) {
throw new ServiceException("无权下派");
}
@@ -729,18 +834,14 @@
break;
}
complaintAuditRecord.setSuperiorId(superiorId);
- complaintFlowService.createFlow(complaintAuditRecord, 1,loginUserInfoVO.getUserId());
+ complaintFlowService.createFlow(complaintAuditRecord, 1, loginUserInfoVO.getUserId());
}
@Override
@Transactional(rollbackFor = Exception.class)
public void reportAudit(ComplaintReporAuditDTO complaintReporAuditDTO, LoginUserInfoVO loginUserInfoVO) {
- IdentityInformation identityInformation = identityInformationService.getIdentityInformation(loginUserInfoVO);
- List<PermissionsVO> permissions = identityInformation.getPermissions();
- if (CollectionUtil.isEmpty(permissions)) {
- throw new ServiceException("请先完成认证");
- }
+ IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
SystemUser systemUser = identityInformation.getSystemUser();
if (systemUser == null || identityInformation.getIdentity() != 2) {
@@ -774,12 +875,18 @@
if (Objects.isNull(complaintAuditRecord)) {
throw new ServiceException("上报申请记录不存在");
}
+ complaintAuditRecord.setAuditorName(systemUser.getName());
+ complaintAuditRecord.setAuditorPhone(systemUser.getPhone());
if (complaintReporAuditDTO.getAuditResult().equals(1)) {
complaintAuditRecord.setAuditStatus(1);
complaintAuditRecord.setAuditorId(loginUserInfoVO.getUserId());
complaintAuditRecordService.updateById(complaintAuditRecord);
//创建流程
- complaintFlowService.createFlow(complaintAuditRecord ,0, loginUserInfoVO.getUserId());
+ ComplaintAuditRecord complaintAuditRecord2 = new ComplaintAuditRecord();
+ complaintAuditRecord2.setComplaintId(complaintReporAuditDTO.getId());
+ complaintAuditRecord2.setSuperiorId(complaintAuditRecord.getReporterId());
+ complaintAuditRecord2.setReportType(complaintAuditRecord.getReporterLevel());
+ complaintFlowService.createFlow(complaintAuditRecord2, 0, loginUserInfoVO.getUserId());
} else {
complaintAuditRecord.setRejectReason(complaintReporAuditDTO.getRejectReason());
complaintAuditRecord.setAuditStatus(2);
@@ -792,16 +899,13 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void saveDelay(ComplaintDelayDTO dto, LoginUserInfoVO loginUserInfoVO) {
- IdentityInformation identityInformation = identityInformationService.getIdentityInformation(loginUserInfoVO);
- List<PermissionsVO> permissions = identityInformation.getPermissions();
-
- if (CollectionUtil.isEmpty(permissions)){
- throw new ServiceException("请先完成认证");
- }
+ IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
SystemUser systemUser = systemUserService.getSystemUserAdminByPhone(loginUserInfoVO.getPhone()).orElse(null);
Long superiorId;
int reportType;
+ String departmentName = "";
+ String reporter = "";
if (identityInformation.getIdentity() == 1) {
PartyMember partyMember = partyMemberService.getPartyMemberByPhone(loginUserInfoVO.getPhone());
superiorId = partyMember.getCommunityId();
@@ -809,12 +913,15 @@
throw new ServiceException("延期申请失败，请绑定社区");
}
reportType = ReportTypeEnum.COMMUNITY.getCode();
- } else if (identityInformation.getIdentity() == 2 && systemUser!=null){
+ departmentName = partyMember.getDistricts() + "-" + partyMember.getStreet() + "-" + partyMember.getCommunity();
+ reporter = partyMember.getName();
+ } else if (identityInformation.getIdentity() == 2 && systemUser != null) {
int accountLevel = systemUser.getAccountLevel(); // 改为基本类型
if (accountLevel == 1) {
throw new ServiceException("市级账号,无法延期申请！");
}
reportType = accountLevel - 1;
+ reporter = systemUser.getName();
// 使用基本类型比较并补充默认分支
if (accountLevel == ReportTypeEnum.COMMUNITY.getCode()) {
@@ -829,7 +936,31 @@
// 处理未预期的账号等级
throw new ServiceException("未知的账号等级");
}
- }else {
+ //查询社区信息
+ 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("无权申请");
}
@@ -847,24 +978,21 @@
record1.setCreateTime(new Date(System.currentTimeMillis()));
record1.setUpdateBy(loginUserInfoVO.getUserId());
record1.setUpdateTime(new Date(System.currentTimeMillis()));
- record1.setReporter(loginUserInfoVO.getNickName());
+ record1.setReporter(reporter);
record1.setReportType(reportType);
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) {
- IdentityInformation identityInformation = identityInformationService.getIdentityInformation(loginUserInfoVO);
- List<PermissionsVO> permissions = identityInformation.getPermissions();
- if (CollectionUtil.isEmpty(permissions)){
- throw new ServiceException("请先完成认证");
- }
+ IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
SystemUser systemUser = identityInformation.getSystemUser();
- if (identityInformation.getIdentity() != 2 || systemUser == null){
+ if (identityInformation.getIdentity() != 2 || systemUser == null) {
throw new ServiceException("无权审核");
}
@@ -877,7 +1005,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 {
// 处理未预期的账号等级
@@ -889,7 +1017,7 @@
.eq(ComplaintAuditRecord::getAuditType, 1)
.eq(ComplaintAuditRecord::getLatestFlag, 1)
.eq(ComplaintAuditRecord::getAuditStatus, 0)
- .ne(ComplaintAuditRecord::getSuperiorId, superiorId)
+ .eq(ComplaintAuditRecord::getSuperiorId, superiorId)
.eq(ComplaintAuditRecord::getReportType, accountLevel)
.eq(ComplaintAuditRecord::getComplaintId, dto.getComplaintId())
.last("LIMIT 1"));
@@ -898,18 +1026,20 @@
if (Objects.isNull(complaintAuditRecord)) {
throw new ServiceException("诉求延期申请不存在");
}
+ complaintAuditRecord.setAuditorName(systemUser.getName());
+ complaintAuditRecord.setAuditorPhone(systemUser.getPhone());
//审核通过后，设置诉求延期
if (complaintAuditRecord.getAuditType().equals(1) && complaintAuditRecord.getAuditStatus().equals(0) && dto.getAuditResult().equals(1)) {
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());
@@ -920,7 +1050,7 @@
@Override
public List<DispatchVO> getDispatchList(LoginUserInfoVO loginUserInfoVO) {
- IdentityInformation identityInformation = identityInformationService.getIdentityInformation(loginUserInfoVO);
+ IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
SystemUser adminUser = identityInformation.getSystemUser();
@@ -936,7 +1066,7 @@
List<DispatchVO> dispatchVOList = new ArrayList<>();
if (accountLevel == ReportTypeEnum.STREET.getCode()) {
String streetId = adminUser.getStreetId();
- List<ComAct> list = comActService.list(new LambdaQueryWrapper<ComAct>().eq(ComAct::getStreetId, streetId).eq(ComAct::getState, 0));
+ List<ComAct> list = comActService.list(new LambdaQueryWrapper<ComAct>().eq(ComAct::getStreetId, streetId));
for (ComAct comAct : list) {
DispatchVO dispatchVO = new DispatchVO();
dispatchVO.setId(comAct.getCommunityId().toString());
@@ -977,12 +1107,8 @@
*/
@Override
public Page<ComplaintTodoVO> getTodoList(BasePage basePage, LoginUserInfoVO loginUserInfo) {
- IdentityInformation identityInformation = identityInformationService.getIdentityInformation(loginUserInfo);
- List<PermissionsVO> permissions = identityInformation.getPermissions();
+ IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfo);
SystemUser systemUser = identityInformation.getSystemUser();
- if (permissions.isEmpty()) {
- throw new ServiceException("无权限");
- }
String targetId = "";
int isSuperior = 0;
//上级
@@ -1037,7 +1163,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
@@ -1045,28 +1171,39 @@
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)
- .orderByDesc(ComplaintFlow::getCreateTime)
+ .orderByAsc(ComplaintFlow::getSort)
.list();
complaintVO.setComplaintFlows(complaintFlows);
//查询评价
ComplaintComment comment = complaintCommentService.lambdaQuery().eq(ComplaintComment::getComplaintId, id).last("LIMIT 1").one();
complaintVO.setComplaintComment(comment);
+ ArrayList<String> voiceFileList = new ArrayList<>();
+ String voiceFile = complaint.getVoiceFile();
+ if(StringUtils.isNotEmpty(voiceFile)){
+ for (String file :voiceFile.split(",")) {
+ voiceFileList.add(file);
+ }
+ }
+
+ complaintVO.setVoiceFileList(voiceFileList);
return complaintVO;
}
/**
* 诉求列表导出
+ *
* @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");
@@ -1074,19 +1211,20 @@
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
EasyExcel.write(response.getOutputStream(), ComplaintExcel.class)
.sheet("诉求数据")
+ .registerWriteHandler(new AutoColumnWidthStrategy())
.doWrite(complaintExcels);
}
@Override
- public void downloadFile(Long id,Integer type) throws IOException {
+ public String downloadFile(Long id, Integer type, SystemUserVo loginUserInfo) throws IOException {
Complaint complaint = baseMapper.getDetailBg(id);
if (Objects.isNull(complaint)) {
throw new ServiceException("该诉求不存在");
}
- //查询社区信息
+ //查询社区信息
Integer reportType = complaint.getReportType();
String community = "";
- switch (reportType){
+ switch (reportType) {
case 1:
community = "攀枝花市";
break;
@@ -1108,7 +1246,7 @@
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();
+ community = Objects.nonNull(district) && Objects.nonNull(street2) ? district.getRegionName() + "-" + street2.getName() + "-" + act.getName() : act.getName();
}
break;
case 5:
@@ -1116,36 +1254,50 @@
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();
+ 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 = "社区问题单";
+ fileName = "community_question.docx";
break;
case 2:
- fileName = "问题处理单";
+ fileName = "question_handle.docx";
if (Objects.nonNull(partyMember)) {
- community = community + "-" + partyMember.getServiceTarget();
+ if (StringUtil.isNotBlank(partyMember.getServiceTarget())) {
+ community = community + "-" + partyMember.getServiceTarget();
+ }
}
+ reportType = complaint.getCompletionUserLevel();
break;
case 3:
- fileName = "协调通知单";
+ //如果上报或下派了，取当前操作人的层级
+ 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 = "notice.docx";
break;
}
Map<String, Object> map = new HashMap<>();
map.put("community", community);
map.put("problemType", complaint.getProblemType());
map.put("descriptionContent", complaint.getDescriptionContent());
- map.put("reportType", ReportTypeEnum.fromCode(reportType).getDescription());
- map.put("partyOrganization",Objects.nonNull(partyMember)? partyMember.getPartyOrganization() : "");
+ map.put("reportType", reportType == null ? "" : ReportTypeEnum.getDescriptionByCode(reportType));
+ if (Objects.nonNull(partyMember)) {
+ map.put("partyOrganization", StringUtil.isNotBlank(partyMember.getPartyOrganization()) ? partyMember.getPartyOrganization() : "");
+ }
map.put("name", complaint.getName());
map.put("contactNumber", complaint.getContactNumber());
map.put("nickname", complaint.getReportUserName());
@@ -1154,26 +1306,28 @@
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");
});
}
// 在文本中直接使用换行符
map.put("complaintProgress", sb.toString());
- map.put("status", ProcessStatusEnum.getDescriptionByCode(complaint.getStatus()));
+ map.put("status", ComplaintExportEnum.getEnumByCode(complaint.getStatus()).getDesc());
if (2 == type) {
//查询诉求评价
ComplaintComment complaintComment = complaintCommentService.lambdaQuery().eq(ComplaintComment::getComplaintId, id).last("LIMIT 1").one();
if (Objects.nonNull(complaintComment)) {
- map.put("rateStr", RateEnum.getEnumByCode(complaintComment.getRate()));
+ map.put("rateStr", RateEnum.getEnumByCode(complaintComment.getRate()).getDesc());
}
+ //map.put("departmentLevel", ReportTypeEnum.getDescriptionByCode(loginUserInfo.getAccountLevel()) + "级");
}
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";
- XWPFTemplate.compile(fileTemplateName).render(map).writeAndClose(response.getOutputStream());
+ response.setHeader("Content-disposition", "attachment;filename=\"" + fileNameEncode + ".docx" + "\"");
+ InputStream resourceAsStream = this.getClass().getResourceAsStream("/template/" + fileName);
+ XWPFTemplate.compile(resourceAsStream).render(map).writeAndClose(response.getOutputStream());
+ return complaint.getName();
}
@@ -1194,21 +1348,22 @@
String content = "第一行内容\n第二行内容\n第三行内容";
map.put("complaintProgress", content);
map.put("status", "处理中");
- XWPFTemplate.compile("F:\\DeskTop\\zhihuishequ\\springcloud_k8s_panzhihuazhihuishequ\\service_sangeshenbian\\src\\main\\resources\\template\\社区问题单.docx").render(map).writeToFile("F:\\DeskTop\\社区.docx");
+ XWPFTemplate.compile("F:\\DeskTop\\zhihuishequ\\springcloud_k8s_panzhihuazhihuishequ\\service_sangeshenbian\\src\\main\\resources\\template\\community_question.docx").render(map).writeToFile("F:\\DeskTop\\社区.docx");
} catch (IOException e) {
e.printStackTrace();
}
}
-
-
+
+
/**
* 获取超时未评价的数据
+ *
* @return
*/
@Override
- public List<Complaint> getTimeoutAndNotComment() {
- return this.baseMapper.getTimeoutAndNotComment();
- }
+ public List<Complaint> getTimeoutAndNotComment() {
+ return this.baseMapper.getTimeoutAndNotComment();
+ }
}
--
Gitblit v1.7.1