From ee2bff3a8eaaafcea4675931db3b8c6ac04c273f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 25 二月 2025 15:37:51 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java | 112 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 98 insertions(+), 14 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 f981e87..0819eb4 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
@@ -29,12 +29,10 @@
import com.panzhihua.sangeshenbian.model.vo.ComplaintVO;
import com.panzhihua.sangeshenbian.service.ISystemUserService;
import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -63,6 +61,7 @@
private final IBcRegionService bcRegionService;
private final IComStreetService comStreetService;
private final IComActService comActService;
+ private final IWorkOrderItemConfigService workOrderItemConfigService;
@Override
public void saveComplaint(Complaint complaint, Long userId) {
@@ -95,7 +94,12 @@
complaint.setCreateBy(userId);
complaint.setUpdateBy(userId);
complaint.setUpdateTime(new Date(System.currentTimeMillis()));
-
+ //查询系统配置诉求处理期限，设置截止日期
+ WorkOrderItemConfig config = workOrderItemConfigService.lambdaQuery().orderByDesc(WorkOrderItemConfig::getId).last("LIMIT 1").one();
+ if (Objects.isNull(config)){
+ throw new ServiceException("工单事项未配置，请联系管理员");
+ }
+ complaint.setClosingTime(new Date(System.currentTimeMillis() + config.getDemandProcessingTime() * 24 * 60 * 60 * 1000));
// 保存诉求记录
save(complaint);
}
@@ -140,6 +144,7 @@
targetId = loginUserInfoVO.getUserId().toString();
}
//查询对应诉求
+ query.setUserId(loginUserInfoVO.getUserId());//当前登录用户id
page = baseMapper.selectComplaintPage(page, query, targetId,isSuperior);
return page;
}
@@ -189,7 +194,8 @@
Complaint complaint = BeanUtil.copyProperties(dto, Complaint.class);
complaint.setUpdateTime(new Date());
complaint.setCompletionUserId(loginUserInfoVO.getUserId());
- complaint.setCompletionUsername(loginUserInfoVO.getName());
+ complaint.setCompletionUsername(loginUserInfoVO.getNickName());
+ complaint.setCompletionUserPhone(loginUserInfoVO.getPhone());
complaint.setCompletionTime(new Date());
this.updateById(complaint);
}
@@ -206,6 +212,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void saveReport(ComplaintReportDTO dto, LoginUserInfoVO loginUserInfoVO) {
String phone = loginUserInfoVO.getPhone();
@@ -228,7 +235,7 @@
if (accountLevel == 1) {
throw new ServiceException("市级账号,无法上报！");
}
- reportType = accountLevel + 1;
+ reportType = accountLevel - 1;
// 使用基本类型比较并补充默认分支
if (accountLevel == ReportTypeEnum.COMMUNITY.getCode()) {
@@ -254,10 +261,11 @@
.set(ComplaintAuditRecord::getLatestFlag,false));
// 添加审核记录
- complaintAuditRecordService.createComplaintAuditRecord(dto.getComplaintId(), 2, dto.getComment(), loginUserInfoVO.getUserId());
+ complaintAuditRecordService.createComplaintAuditRecord(dto.getComplaintId(), 2, dto.getComment(), loginUserInfoVO,adminUser);
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void saveDispatch(ComplaintDispatch dto, LoginUserInfoVO loginUserInfoVO) {
String phone = loginUserInfoVO.getPhone();
SystemUser adminUser = systemUserService.getOne(new LambdaQueryWrapper<SystemUser>()
@@ -286,13 +294,13 @@
superiorId = Long.parseLong(adminUser.getDistrictsCode());
} else {
// 处理未预期的账号等级
- throw new ServiceException("未知的账号等级2");
+ throw new ServiceException("未知的账号等级");
}
Long superiorOrgId;
Complaint complaint = getById(dto.getComplaintId());
superiorOrgId = complaint.getSuperiorId();
- complaint.setReportType(accountLevel - 1);
+ complaint.setReportType(accountLevel + 1);
complaint.setSuperiorId(superiorId);
updateById(complaint);
@@ -301,14 +309,27 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void reportAudit(ComplaintReporAuditDTO complaintReporAuditDTO, LoginUserInfoVO loginUserInfoVO) {
-
- complaintAuditRecordService.audit(complaintReporAuditDTO.getId(), loginUserInfoVO.getUserId(),
+ Optional<SystemUser> systemUserByPhone = systemUserService.getSystemUserByPhone(loginUserInfoVO.getPhone());
+ if (!systemUserByPhone.isPresent()) {
+ throw new ServiceException("无权审核");
+ }
+ //查询上报审核记录
+ ComplaintAuditRecord complaintAuditRecord = complaintAuditRecordService.lambdaQuery().eq(ComplaintAuditRecord::getComplaintId, complaintReporAuditDTO.getId())
+ .eq(ComplaintAuditRecord::getAuditType, 2)
+ .eq(ComplaintAuditRecord::getLatestFlag, true)
+ .last("LIMIT 1").one();
+ if (Objects.isNull(complaintAuditRecord)) {
+ throw new ServiceException("上报申请记录不存在");
+ }
+ //查询待审核诉求
+ complaintAuditRecordService.audit(complaintAuditRecord, loginUserInfoVO.getUserId(),
complaintReporAuditDTO.getAuditResult(), complaintReporAuditDTO.getRejectReason());
// 添加流转记录
- ComplaintAuditRecord complaintAuditRecord = complaintAuditRecordService.getById(complaintReporAuditDTO.getId());
Complaint complaint = getById(complaintAuditRecord.getComplaintId());
+
Long superiorId = null;
if (Objects.nonNull(complaint)) {
superiorId = complaint.getCreateBy();
@@ -317,23 +338,86 @@
}
complaintFlowService.createFlow(complaintAuditRecord.getComplaintId(), superiorId,complaint.getReportType(),0, loginUserInfoVO.getUserId());
}
+ //审核通过后，将诉求转移给上级
+ if (complaintAuditRecord.getAuditType().equals(2) && complaintAuditRecord.getAuditStatus().equals(1)){
+ SystemUser systemUser = systemUserByPhone.get();
+ switch (systemUser.getAccountLevel()) {
+ case 1:
+ superiorId = 510400L;//默认市级
+ break;
+ case 2:
+ superiorId = Long.parseLong(systemUser.getDistrictsCode());
+ break;
+ case 3:
+ superiorId = Long.parseLong(systemUser.getStreetId());
+ break;
+ case 4:
+ superiorId = systemUser.getCommunityId();
+ break;
+ }
+ }
+ complaint.setSuperiorId(superiorId);
+ updateById(complaint );
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void saveDelay(ComplaintDelayDTO dto, LoginUserInfoVO loginUserInfoVO) {
// 标记最新
complaintAuditRecordService.update(new LambdaUpdateWrapper<ComplaintAuditRecord>()
.eq(ComplaintAuditRecord::getComplaintId, dto.getComplaintId())
.set(ComplaintAuditRecord::getLatestFlag,false));
+ SystemUser systemUser = systemUserService.getSystemUserByPhone(loginUserInfoVO.getPhone()).orElse(null);
+ Long superiorId;
+ int reportType;
+ if (systemUser == null) {
+ superiorId = loginUserInfoVO.getCommunityId();
+ if (Objects.isNull(superiorId)){
+ throw new ServiceException("上报失败，请绑定社区");
+ }
+ reportType = ReportTypeEnum.COMMUNITY.getCode();
+ } else {
+ int accountLevel = systemUser.getAccountLevel(); // 改为基本类型
+ if (accountLevel == 1) {
+ throw new ServiceException("市级账号,无法上报！");
+ }
+ reportType = accountLevel + 1;
+
+ // 使用基本类型比较并补充默认分支
+ if (accountLevel == ReportTypeEnum.COMMUNITY.getCode()) {
+ superiorId = Long.parseLong(systemUser.getStreetId());
+ } else if (accountLevel == ReportTypeEnum.STREET.getCode()) {
+ superiorId = Long.parseLong(systemUser.getDistrictsCode());
+ } else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
+ superiorId = 510400L; // 攀枝花市
+ } else {
+ // 处理未预期的账号等级
+ throw new ServiceException("未知的账号等级");
+ }
+ }
+
+ Complaint complaint = getById(dto.getComplaintId());
+ complaint.setReportType(reportType);
+ complaint.setSuperiorId(superiorId);
+ updateById(complaint);
// 添加审核记录
- complaintAuditRecordService.createComplaintAuditRecord(dto.getComplaintId(), 1, dto.getComment(), loginUserInfoVO.getUserId());
+ complaintAuditRecordService.createComplaintAuditRecord(dto.getComplaintId(), 1, dto.getComment(), loginUserInfoVO, systemUser);
}
@Override
public void delayAudit(ComplaintDelayAuditDTO complaintDelayAuditDTO, LoginUserInfoVO loginUserInfoVO) {
- complaintAuditRecordService.audit(complaintDelayAuditDTO.getId(), loginUserInfoVO.getUserId(),
+ //查询待审核诉求
+ ComplaintAuditRecord complaintAuditRecord = complaintAuditRecordService.lambdaQuery().eq(ComplaintAuditRecord::getComplaintId, complaintDelayAuditDTO.getComplaintId())
+ .eq(ComplaintAuditRecord::getAuditType, 1)
+ .eq(ComplaintAuditRecord::getAuditStatus, 0)
+ .eq(ComplaintAuditRecord::getLatestFlag, true)
+ .last("LIMIT 1").one();
+ if (Objects.isNull(complaintAuditRecord)) {
+ throw new ServiceException("诉求延期申请不存在");
+ }
+ complaintAuditRecordService.audit(complaintAuditRecord, loginUserInfoVO.getUserId(),
complaintDelayAuditDTO.getAuditResult(), complaintDelayAuditDTO.getRejectReason());
}
--
Gitblit v1.7.1