From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java | 158 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 124 insertions(+), 34 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 e897645..d406f46 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;
@@ -13,6 +12,7 @@
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.config.AutoColumnWidthStrategy;
import com.panzhihua.sangeshenbian.dao.ComplaintMapper;
import com.panzhihua.sangeshenbian.enums.AuditStatusEnum;
import com.panzhihua.sangeshenbian.enums.ComplaintExportEnum;
@@ -28,15 +28,14 @@
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.core.io.ClassPathResource;
-import org.springframework.data.redis.connection.RedisServer;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -180,7 +179,34 @@
}
@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());
@@ -189,6 +215,7 @@
//获取当前身份，1=党员，2=管理员
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,7 +251,17 @@
//查询对应诉求
//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;
}
@@ -237,7 +274,8 @@
vo.setEvaluateButtonStatus(1);
vo.setAuditButtonStatus(1);
// 获取身份
- Integer identity = (Integer) redisUtils.get("identity:" + loginUserInfo.getPhone());
+ 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)
@@ -250,11 +288,11 @@
Integer accountLevel = systemUser.getAccountLevel();
Integer isAdmin = systemUser.getIsAdmin();
//当前身份是管理员
- if(2 == identity && accountLevel.compareTo(vo.getReportType()) == 0 && (accountLevel != 5 && 1 == isAdmin)){
+ if (2 == identity && accountLevel.compareTo(vo.getReportType()) == 0 && (accountLevel != 5 && 1 == isAdmin)) {
vo.setListControlsButtonStatus(0);
}
//如果当前身份是党员
- if(1 == identity && 5 == vo.getReportType()){
+ if (1 == identity && 5 == vo.getReportType()) {
vo.setListControlsButtonStatus(0);
}
} else {
@@ -270,12 +308,11 @@
//判断当前审核状态
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);
}
}
@@ -304,11 +341,11 @@
Integer accountLevel = systemUser.getAccountLevel();
Integer isAdmin = systemUser.getIsAdmin();
//当前身份是管理员
- if(2 == identity && accountLevel.compareTo(vo.getReportType()) == 0 && (accountLevel != 5 && 1 == isAdmin)){
+ if (2 == identity && accountLevel.compareTo(vo.getReportType()) == 0 && (accountLevel != 5 && 1 == isAdmin)) {
vo.setListControlsButtonStatus(0);
}
//如果当前身份是党员
- if(1 == identity && 5 == vo.getReportType()){
+ if (1 == identity && 5 == vo.getReportType()) {
vo.setListControlsButtonStatus(0);
}
} else {
@@ -345,8 +382,7 @@
String targetId = "";
Integer accountLevel = 5;
//获取当前身份，1=党员，2=管理员
- IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfo);
- if (2 == identityInformation.getIdentity()) {
+ if (2 == currentIdentityInformation.getIdentity()) {
accountLevel = systemUser.getAccountLevel();
switch (accountLevel) {
case 1:
@@ -395,7 +431,7 @@
vo.setEvaluateButtonStatus(0);
}
//当前是党员身份，只有是以党员身份提交的数据才有权限
- if(1 == identity && vo.getReportType() == 5){
+ if (1 == identity && vo.getReportType() == 5) {
vo.setEvaluateButtonStatus(0);
}
} else {
@@ -404,6 +440,16 @@
}
}
}
+
+ 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);
+ }
+
+
}
@@ -462,19 +508,21 @@
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);
+// }
+
+
// //已办结，显示评价按钮
@@ -515,8 +563,8 @@
if (identityInformationVO.getIdentity() == 2) {
//1=党员，2=管理员
SystemUser systemUser = identityInformationVO.getSystemUser();
- name = systemUser.getName();
- }else if (identityInformationVO.getIdentity() == 1){
+ name = systemUser.getName();
+ } else if (identityInformationVO.getIdentity() == 1) {
PartyMember partyMember = identityInformationVO.getPartyMember();
name = partyMember.getName();
}
@@ -549,8 +597,8 @@
//1=党员，2=管理员
SystemUser systemUser = identityInformationVO.getSystemUser();
accountLevel = systemUser.getAccountLevel();
- name = systemUser.getName();
- }else if (identityInformationVO.getIdentity() == 1){
+ name = systemUser.getName();
+ } else if (identityInformationVO.getIdentity() == 1) {
accountLevel = 5;
PartyMember partyMember = identityInformationVO.getPartyMember();
name = partyMember.getName();
@@ -577,6 +625,7 @@
return complaintProgressService.lambdaQuery().eq(ComplaintProgress::getComplaintId, complaintId)
.orderByAsc(ComplaintProgress::getCreateTime).list();
}
+
@Override
@Transactional(rollbackFor = Exception.class)
@@ -683,6 +732,41 @@
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
@@ -981,7 +1065,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());
@@ -1117,11 +1201,12 @@
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 void downloadFile(Long id, Integer type, SystemUserVo loginUserInfo) throws IOException {
Complaint complaint = baseMapper.getDetailBg(id);
if (Objects.isNull(complaint)) {
throw new ServiceException("该诉求不存在");
@@ -1176,7 +1261,9 @@
case 2:
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;
@@ -1198,7 +1285,9 @@
map.put("problemType", complaint.getProblemType());
map.put("descriptionContent", complaint.getDescriptionContent());
map.put("reportType", reportType == null ? "" : ReportTypeEnum.getDescriptionByCode(reportType));
- map.put("partyOrganization", Objects.nonNull(partyMember) ? partyMember.getPartyOrganization() : "");
+ 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());
@@ -1221,6 +1310,7 @@
if (Objects.nonNull(complaintComment)) {
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");
--
Gitblit v1.7.1