From ebba2c050590fca7d5376b212d0d68d3c84a4159 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 24 二月 2025 18:08:51 +0800
Subject: [PATCH] 修改循环依赖问题
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java | 242 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 229 insertions(+), 13 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 f27bf26..a5fab15 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,11 +2,16 @@
import cn.hutool.core.bean.BeanUtil;
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.panzhihua.common.model.vos.LoginUserInfoVO;
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;
@@ -18,13 +23,18 @@
import com.panzhihua.sangeshenbian.service.IComplaintFlowService;
import com.panzhihua.sangeshenbian.service.IComplaintProgressService;
import com.panzhihua.sangeshenbian.service.IComplaintService;
+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 lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Optional;
@@ -43,11 +53,18 @@
@RequiredArgsConstructor
public class ComplaintServiceImpl extends ServiceImpl<ComplaintMapper, Complaint> implements IComplaintService {
private final ISystemUserService systemUserService;
- private final IComplaintFlowService complaintFlowService;
+ @Lazy
+ @Resource
+ private IComplaintFlowService complaintFlowService;
private final IComplaintProgressService complaintProgressService;
+ private final IComplaintAuditRecordService complaintAuditRecordService;
+ private final IBcRegionService bcRegionService;
+ private final IComStreetService comStreetService;
+ private final IComActService comActService;
+
@Override
- public void saveComplaint(Complaint complaint,Long userId) {
+ public void saveComplaint(Complaint complaint, Long userId) {
// 获取当前日期（年月日）
String datePrefix = new SimpleDateFormat("yyyyMMdd").format(new Date());
@@ -73,10 +90,10 @@
// 设置其他字段
complaint.setStatus(ProcessStatusEnum.PROCESSING.getCode());
- complaint.setCreateTime(new Date());
+ complaint.setCreateTime(new Date(System.currentTimeMillis()));
complaint.setCreateBy(userId);
complaint.setUpdateBy(userId);
- complaint.setUpdateTime(new Date());
+ complaint.setUpdateTime(new Date(System.currentTimeMillis()));
// 保存诉求记录
save(complaint);
@@ -109,11 +126,11 @@
break;
case 3:
//街道
- targetId = systemUser.getStreetCode();
+ targetId = systemUser.getStreetId().toString();
break;
case 4:
//社区
- targetId = systemUser.getCommunityCode();
+ targetId = systemUser.getCommunityId().toString();
break;
}
isSuperior = 1;
@@ -138,19 +155,25 @@
List<ComplaintFlow> list = complaintFlowService.lambdaQuery().eq(ComplaintFlow::getComplaintId, id).orderByAsc(ComplaintFlow::getCreateTime).list();
detail.setComplaintFlows(list);
}
+ //查询办理进度
+ List<ComplaintProgress> list = complaintProgressService.lambdaQuery().eq(ComplaintProgress::getComplaintId, id)
+ .orderByAsc(ComplaintProgress::getCreateTime).list();
+ detail.setComplaintProgresses(list);
return detail;
}
/**
- *办理进度录入
+ * 办理进度录入
+ *
* @param dto
- * @param userId
+ * @param loginUserInfoVO
*/
@Override
- public void saveProcess(ComplaintProcessDTO dto,Long userId) {
+ public void saveProcess(ComplaintProcessDTO dto, LoginUserInfoVO loginUserInfoVO) {
ComplaintProgress complaintProgress = BeanUtil.copyProperties(dto, ComplaintProgress.class);
complaintProgress.setCreateTime(new Date());
- complaintProgress.setCreateBy(userId);
+ complaintProgress.setCreateBy(loginUserInfoVO.getUserId());
+ complaintProgress.setCreateByName(loginUserInfoVO.getName());
complaintProgressService.save(complaintProgress);
}
@@ -169,10 +192,191 @@
complaint.setCompletionTime(new Date());
this.updateById(complaint);
}
+ /**
+ * 办理进度列表
+ * @param complaintId
+ * @return
+ */
+ @Override
+ public List<ComplaintProgress> progress(Long complaintId) {
+ //查询办理进度
+ return complaintProgressService.lambdaQuery().eq(ComplaintProgress::getComplaintId, complaintId)
+ .orderByAsc(ComplaintProgress::getCreateTime).list();
+ }
+ @Override
+ 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)
+ .eq(SystemUser::getStatus, 3)
+ .last("LIMIT 1"));
+
+ Long superiorId;
+ int reportType;
+ if (adminUser == null) {
+ superiorId = loginUserInfoVO.getCommunityId();
+ reportType = ReportTypeEnum.COMMUNITY.getCode();
+ } else {
+ int accountLevel = adminUser.getAccountLevel(); // 改为基本类型
+ if (accountLevel == 1) {
+ throw new ServiceException("市级账号,无法上报！");
+ }
+ reportType = accountLevel + 1;
+
+ // 使用基本类型比较并补充默认分支
+ if (accountLevel == ReportTypeEnum.COMMUNITY.getCode()) {
+ superiorId = adminUser.getStreetId().longValue();
+ } else if (accountLevel == ReportTypeEnum.STREET.getCode()) {
+ superiorId = Long.parseLong(adminUser.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.update(new LambdaUpdateWrapper<ComplaintAuditRecord>()
+ .eq(ComplaintAuditRecord::getComplaintId, dto.getComplaintId())
+ .set(ComplaintAuditRecord::getLatestFlag,false));
+
+ // 添加审核记录
+ complaintAuditRecordService.createComplaintAuditRecord(dto.getComplaintId(), 2, dto.getComment(), loginUserInfoVO.getUserId());
+ }
+
+ @Override
+ 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)
+ .eq(SystemUser::getStatus, 3)
+ .last("LIMIT 1"));
+
+ if (adminUser == null) {
+ throw new ServiceException("无权下派");
+ }
+
+ long superiorId;
+ int reportType;
+ int accountLevel = adminUser.getAccountLevel(); // 改为基本类型
+ if (accountLevel == 1) {
+ throw new ServiceException("市级账号,无法上报！");
+ }
+ reportType = accountLevel - 1;
+
+ // 使用基本类型比较并补充默认分支
+ if (accountLevel == ReportTypeEnum.STREET.getCode()) {
+ superiorId = adminUser.getCommunityId().longValue();
+ } else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
+ superiorId = adminUser.getStreetId().longValue();
+ } else if (accountLevel == ReportTypeEnum.CITY.getCode()) {
+ superiorId = Long.parseLong(adminUser.getDistrictsCode());
+ } else {
+ // 处理未预期的账号等级
+ throw new ServiceException("未知的账号等级");
+ }
+
+ Complaint complaint = getById(dto.getComplaintId());
+ complaint.setReportType(reportType);
+ complaint.setSuperiorId(superiorId);
+ updateById(complaint);
+
+ // 添加流转记录
+ complaintFlowService.createFlow(dto.getComplaintId(), 1, loginUserInfoVO.getUserId());
+ }
+
+ @Override
+ public void reportAudit(ComplaintReporAuditDTO complaintReporAuditDTO, LoginUserInfoVO loginUserInfoVO) {
+ complaintAuditRecordService.audit(complaintReporAuditDTO.getId(), loginUserInfoVO.getUserId(),
+ complaintReporAuditDTO.getAuditResult(), complaintReporAuditDTO.getRejectReason());
+
+ // 添加流转记录
+ ComplaintAuditRecord complaintAuditRecord = complaintAuditRecordService.getById(complaintReporAuditDTO.getId());
+ complaintFlowService.createFlow(complaintAuditRecord.getComplaintId(), 0, loginUserInfoVO.getUserId());
+ }
+
+
+ @Override
+ public void saveDelay(ComplaintDelayDTO dto, LoginUserInfoVO loginUserInfoVO) {
+ // 标记最新
+ complaintAuditRecordService.update(new LambdaUpdateWrapper<ComplaintAuditRecord>()
+ .eq(ComplaintAuditRecord::getComplaintId, dto.getComplaintId())
+ .set(ComplaintAuditRecord::getLatestFlag,false));
+ // 添加审核记录
+ complaintAuditRecordService.createComplaintAuditRecord(dto.getComplaintId(), 1, dto.getComment(), loginUserInfoVO.getUserId());
+ }
+
+
+ @Override
+ public void delayAudit(ComplaintDelayAuditDTO complaintDelayAuditDTO, LoginUserInfoVO loginUserInfoVO) {
+ complaintAuditRecordService.audit(complaintDelayAuditDTO.getId(), loginUserInfoVO.getUserId(),
+ complaintDelayAuditDTO.getAuditResult(), complaintDelayAuditDTO.getRejectReason());
+ }
+
+ @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)
+ .eq(SystemUser::getStatus, 3)
+ .last("LIMIT 1"));
+
+ if (adminUser == null) {
+ throw new ServiceException("无权下派");
+ }
+ int accountLevel = adminUser.getAccountLevel(); // 改为基本类型
+ if (accountLevel == 1) {
+ throw new ServiceException("市级账号,无法上报！");
+ }
+
+ // 使用基本类型比较并补充默认分支
+ List<DispatchVO> dispatchVOList = new ArrayList<>();
+ if (accountLevel == ReportTypeEnum.STREET.getCode()) {
+ List<ComAct> list = comActService.list();
+ for (ComAct comAct : list) {
+ DispatchVO dispatchVO = new DispatchVO();
+ dispatchVO.setId(comAct.getCommunityId());
+ dispatchVO.setName(comAct.getName());
+ dispatchVOList.add(dispatchVO);
+ }
+ } else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
+ List<ComStreet> list = comStreetService.list();
+ for (ComStreet street : list) {
+ DispatchVO dispatchVO = new DispatchVO();
+ dispatchVO.setId(Long.valueOf(street.getStreetId()));
+ dispatchVO.setName(street.getName());
+ dispatchVOList.add(dispatchVO);
+ }
+ } else if (accountLevel == ReportTypeEnum.CITY.getCode()) {
+ List<BcRegion> list = bcRegionService.list(new LambdaQueryWrapper<BcRegion>()
+ .eq(BcRegion::getHierarchyOrder, 3));
+ for (BcRegion region : list) {
+ DispatchVO dispatchVO = new DispatchVO();
+ dispatchVO.setId(Long.valueOf(region.getRegionCode()));
+ dispatchVO.setName(region.getRegionName());
+ dispatchVOList.add(dispatchVO);
+ }
+ } else {
+ // 处理未预期的账号等级
+ throw new ServiceException("未知的账号等级");
+ }
+ return dispatchVOList;
+ }
/**
* 获取待办诉求
- * @param page
+ * @param basePage
* @param loginUserInfo
* @return
*/
@@ -196,11 +400,11 @@
break;
case 3:
//街道
- targetId = systemUser.getStreetCode();
+ targetId = systemUser.getStreetId().toString();
break;
case 4:
//社区
- targetId = systemUser.getCommunityCode();
+ targetId = systemUser.getCommunityId().toString();
break;
}
isSuperior = 1;
@@ -211,5 +415,17 @@
Page<ComplaintTodoVO> page = baseMapper.getTodoList(new Page<>(basePage.getPageNum(), basePage.getPageSize()), targetId,isSuperior);
return page;
}
+ /**
+ * 延期情况说明
+ * @param complaintId
+ * @return
+ */
+ @Override
+ public ComplaintAuditRecord delayDetail(Long complaintId) {
+ return complaintAuditRecordService.lambdaQuery().eq(ComplaintAuditRecord::getComplaintId, complaintId)
+ .eq(ComplaintAuditRecord::getAuditType, 1)
+ .eq(ComplaintAuditRecord::getLatestFlag, true)
+ .last("LIMIT 1").one();
+ }
}
--
Gitblit v1.7.1