From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java | 496 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 411 insertions(+), 85 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 0819eb4..35f9664 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
@@ -1,6 +1,8 @@
package com.panzhihua.sangeshenbian.service.impl;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -28,7 +30,9 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.sangeshenbian.model.vo.ComplaintVO;
import com.panzhihua.sangeshenbian.service.ISystemUserService;
+import io.jsonwebtoken.lang.Collections;
import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -50,6 +54,7 @@
* @author
* @since 2025-02-22
*/
+@Slf4j
@Service
@RequiredArgsConstructor(onConstructor_ = {@Lazy})
public class ComplaintServiceImpl extends ServiceImpl<ComplaintMapper, Complaint> implements IComplaintService {
@@ -64,7 +69,7 @@
private final IWorkOrderItemConfigService workOrderItemConfigService;
@Override
- public void saveComplaint(Complaint complaint, Long userId) {
+ public void saveComplaint(Complaint complaint, LoginUserInfoVO loginUserInfoVO) {
// 获取当前日期（年月日）
String datePrefix = new SimpleDateFormat("yyyyMMdd").format(new Date());
@@ -87,21 +92,69 @@
// 设置流水号
complaint.setSerialNumber(serialNumber);
-
+ Optional<SystemUser> systemUserOpt = systemUserService.getSystemUserByPhone(loginUserInfoVO.getPhone());
+ Integer accountLevel = 5;
+ Long superiorId = null;
+ if (systemUserOpt.isPresent()) {
+ SystemUser systemUser = systemUserOpt.get();
+ accountLevel = systemUser.getAccountLevel();
+ switch (accountLevel) {
+ 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;
+ case 5:
+ //社区
+ superiorId = loginUserInfoVO.getUserId();
+ break;
+ }
+ complaint.setSuperiorType(accountLevel);
+ complaint.setSuperiorId(superiorId);
+ }else{
+ superiorId = loginUserInfoVO.getUserId();
+ }
+ complaint.setReportType(accountLevel);
// 设置其他字段
complaint.setStatus(ProcessStatusEnum.PROCESSING.getCode());
complaint.setCreateTime(new Date(System.currentTimeMillis()));
- complaint.setCreateBy(userId);
- complaint.setUpdateBy(userId);
+ complaint.setCreateBy(loginUserInfoVO.getUserId());
+ complaint.setUpdateBy(loginUserInfoVO.getUserId());
complaint.setUpdateTime(new Date(System.currentTimeMillis()));
//查询系统配置诉求处理期限，设置截止日期
WorkOrderItemConfig config = workOrderItemConfigService.lambdaQuery().orderByDesc(WorkOrderItemConfig::getId).last("LIMIT 1").one();
- if (Objects.isNull(config)){
+ if (Objects.isNull(config)) {
throw new ServiceException("工单事项未配置，请联系管理员");
}
complaint.setClosingTime(new Date(System.currentTimeMillis() + config.getDemandProcessingTime() * 24 * 60 * 60 * 1000));
// 保存诉求记录
save(complaint);
+ int count = complaintAuditRecordService.count(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, complaint.getId()));
+ //保存记录
+ ComplaintAuditRecord complaintAuditRecord = new ComplaintAuditRecord();
+ complaintAuditRecord.setComplaintId(complaint.getId());
+ complaintAuditRecord.setLatestFlag(true);
+ complaintAuditRecord.setAuditType(0);
+ complaintAuditRecord.setAuditStatus(-1);
+ complaintAuditRecord.setCreateBy(loginUserInfoVO.getUserId());
+ complaintAuditRecord.setCreateTime(new Date(System.currentTimeMillis()));
+ complaintAuditRecord.setUpdateBy(loginUserInfoVO.getUserId());
+ complaintAuditRecord.setUpdateTime(new Date(System.currentTimeMillis()));
+ complaintAuditRecord.setReportType(accountLevel);
+ complaintAuditRecord.setSuperiorId(superiorId);
+ complaintAuditRecord.setSort(count + 1);
+ complaintAuditRecordService.save(complaintAuditRecord);
}
/**
@@ -116,10 +169,11 @@
Optional<SystemUser> systemUserByPhone = systemUserService.getSystemUserByPhone(loginUserInfoVO.getPhone());
String targetId = "";
int isSuperior = 0;
+ Integer accountLevel = 5;
//上级
if (systemUserByPhone.isPresent()) {
SystemUser systemUser = systemUserByPhone.get();
- Integer accountLevel = systemUser.getAccountLevel();
+ accountLevel = systemUser.getAccountLevel();
switch (accountLevel) {
case 1:
//市级
@@ -137,26 +191,68 @@
//社区
targetId = systemUser.getCommunityId().toString();
break;
+ case 5:
+ //党员
+ targetId = loginUserInfoVO.getUserId().toString();
+ break;
}
isSuperior = 1;
} else {
- //党员
+ //党员
targetId = loginUserInfoVO.getUserId().toString();
}
//查询对应诉求
- query.setUserId(loginUserInfoVO.getUserId());//当前登录用户id
- page = baseMapper.selectComplaintPage(page, query, targetId,isSuperior);
+ //page = baseMapper.selectComplaintPage(page, query, targetId, isSuperior);
+ page = baseMapper.selectComplaintPage1(page, query, accountLevel, targetId);
return page;
}
/**
* 工单详情
+ *
* @param id
* @return
*/
@Override
- public ComplaintVO detail(Long id) {
- ComplaintVO detail = baseMapper.getDetail(id);
+ public ComplaintVO detail(Long id, LoginUserInfoVO loginUserInfoVO) {
+ Optional<SystemUser> systemUserByPhone = systemUserService.getSystemUserByPhone(loginUserInfoVO.getPhone());
+ String targetId = "";
+ int isSuperior = 0;
+ Integer accountLevel = 5;
+ //上级
+ if (systemUserByPhone.isPresent()) {
+ SystemUser systemUser = systemUserByPhone.get();
+ 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:
+ //社区
+ targetId = loginUserInfoVO.getUserId().toString();
+ break;
+ }
+ isSuperior = 1;
+ } else {
+ //党员
+ targetId = loginUserInfoVO.getUserId().toString();
+ }
+
+
+ ComplaintVO detail = baseMapper.getDetail(id,targetId, isSuperior);
if (detail.getStatus().equals(0)) {
List<ComplaintFlow> list = complaintFlowService.lambdaQuery().eq(ComplaintFlow::getComplaintId, id).orderByAsc(ComplaintFlow::getCreateTime).list();
detail.setComplaintFlows(list);
@@ -165,6 +261,15 @@
List<ComplaintProgress> list = complaintProgressService.lambdaQuery().eq(ComplaintProgress::getComplaintId, id)
.orderByAsc(ComplaintProgress::getCreateTime).list();
detail.setComplaintProgresses(list);
+ detail.setAuditButtonStatus(1);
+ Long superiorId = detail.getSuperiorId();
+ Integer superiorType = detail.getSuperiorType();
+ if((detail.getStatus() == 5 || detail.getStatus() == 7) && systemUserByPhone.isPresent()){
+ if(superiorType.equals(accountLevel) && superiorId.toString().equals(targetId)){
+ detail.setAuditButtonStatus(0);
+ }
+ }
+
return detail;
}
@@ -199,8 +304,10 @@
complaint.setCompletionTime(new Date());
this.updateById(complaint);
}
+
/**
* 办理进度列表
+ *
* @param complaintId
* @return
*/
@@ -214,6 +321,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void saveReport(ComplaintReportDTO dto, LoginUserInfoVO loginUserInfoVO) {
+ log.info("用户登录数据----------------》" + JSON.toJSONString(loginUserInfoVO));
String phone = loginUserInfoVO.getPhone();
SystemUser adminUser = systemUserService.getOne(new LambdaQueryWrapper<SystemUser>()
@@ -223,13 +331,16 @@
.last("LIMIT 1"));
Long superiorId;
+ Long currentId;
int reportType;
if (adminUser == null) {
superiorId = loginUserInfoVO.getCommunityId();
- if (Objects.isNull(superiorId)){
+ currentId = 0L;
+ if (Objects.isNull(superiorId)) {
throw new ServiceException("上报失败，请绑定社区");
}
reportType = ReportTypeEnum.COMMUNITY.getCode();
+ currentId = loginUserInfoVO.getUserId();
} else {
int accountLevel = adminUser.getAccountLevel(); // 改为基本类型
if (accountLevel == 1) {
@@ -240,10 +351,16 @@
// 使用基本类型比较并补充默认分支
if (accountLevel == ReportTypeEnum.COMMUNITY.getCode()) {
superiorId = Long.parseLong(adminUser.getStreetId());
+ currentId = adminUser.getCommunityId();
} else if (accountLevel == ReportTypeEnum.STREET.getCode()) {
superiorId = Long.parseLong(adminUser.getDistrictsCode());
+ currentId = Long.valueOf(adminUser.getStreetId());
} else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
superiorId = 510400L; // 攀枝花市
+ currentId = Long.valueOf(adminUser.getDistrictsCode());
+ } else if(accountLevel == ReportTypeEnum.PARTY.getCode()){
+ superiorId = adminUser.getCommunityId();
+ currentId = loginUserInfoVO.getUserId();
} else {
// 处理未预期的账号等级
throw new ServiceException("未知的账号等级");
@@ -251,17 +368,54 @@
}
Complaint complaint = getById(dto.getComplaintId());
- complaint.setReportType(reportType);
+ //complaint.setReportType(+);
+ complaint.setSuperiorType(reportType);
complaint.setSuperiorId(superiorId);
+ if (complaint.getStatus() != 0) {
+ complaint.setStatus(0);
+ }
updateById(complaint);
// 标记最新
complaintAuditRecordService.update(new LambdaUpdateWrapper<ComplaintAuditRecord>()
.eq(ComplaintAuditRecord::getComplaintId, dto.getComplaintId())
- .set(ComplaintAuditRecord::getLatestFlag,false));
+ .set(ComplaintAuditRecord::getLatestFlag, false));
// 添加审核记录
- complaintAuditRecordService.createComplaintAuditRecord(dto.getComplaintId(), 2, dto.getComment(), loginUserInfoVO,adminUser);
+ //complaintAuditRecordService.createComplaintAuditRecord(dto.getComplaintId(), 2, dto.getComment(), loginUserInfoVO,adminUser);
+ int count = complaintAuditRecordService.count(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, complaint.getId()));
+ ComplaintAuditRecord complaintAuditRecord = new ComplaintAuditRecord();
+ complaintAuditRecord.setComplaintId(complaint.getId());
+ complaintAuditRecord.setLatestFlag(true);
+ complaintAuditRecord.setAuditType(2);
+ complaintAuditRecord.setAuditStatus(0);
+ complaintAuditRecord.setCreateBy(loginUserInfoVO.getUserId());
+ complaintAuditRecord.setCreateTime(new Date());
+ complaintAuditRecord.setUpdateBy(loginUserInfoVO.getUserId());
+ complaintAuditRecord.setUpdateTime(new Date());
+ complaintAuditRecord.setReporter(loginUserInfoVO.getNickName());
+ complaintAuditRecord.setReportType(Objects.isNull(adminUser) ? 5 : adminUser.getAccountLevel());
+ complaintAuditRecord.setSuperiorId(currentId);
+ complaintAuditRecord.setComment(dto.getComment());
+ complaintAuditRecord.setSort(count + 1);
+ complaintAuditRecordService.save(complaintAuditRecord);
+
+
+ ComplaintAuditRecord complaintAuditRecord2 = new ComplaintAuditRecord();
+ complaintAuditRecord2.setComplaintId(complaint.getId());
+ complaintAuditRecord2.setLatestFlag(true);
+ complaintAuditRecord2.setAuditType(2);
+ complaintAuditRecord2.setAuditStatus(0);
+ complaintAuditRecord2.setCreateBy(loginUserInfoVO.getUserId());
+ complaintAuditRecord2.setCreateTime(new Date());
+ complaintAuditRecord2.setUpdateBy(loginUserInfoVO.getUserId());
+ complaintAuditRecord2.setUpdateTime(new Date());
+ complaintAuditRecord2.setReporter(loginUserInfoVO.getNickName());
+ complaintAuditRecord2.setReportType(reportType);
+ complaintAuditRecord2.setSuperiorId(superiorId);
+ complaintAuditRecord2.setComment(dto.getComment());
+ complaintAuditRecord2.setSort(count + 2);
+ complaintAuditRecordService.save(complaintAuditRecord2);
}
@Override
@@ -278,34 +432,48 @@
throw new ServiceException("无权下派");
}
-
- long superiorId;
int accountLevel = adminUser.getAccountLevel(); // 改为基本类型
if (accountLevel == 4) {
throw new ServiceException("社区账号,无法下派！");
}
+ accountLevel++;
- // 使用基本类型比较并补充默认分支
- if (accountLevel == ReportTypeEnum.STREET.getCode()) {
- superiorId = adminUser.getCommunityId().longValue();
- } else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
- superiorId = Long.parseLong(adminUser.getStreetId());
- } else if (accountLevel == ReportTypeEnum.CITY.getCode()) {
- superiorId = Long.parseLong(adminUser.getDistrictsCode());
- } else {
- // 处理未预期的账号等级
- throw new ServiceException("未知的账号等级");
- }
-
- Long superiorOrgId;
Complaint complaint = getById(dto.getComplaintId());
- superiorOrgId = complaint.getSuperiorId();
- complaint.setReportType(accountLevel + 1);
- complaint.setSuperiorId(superiorId);
+ complaint.setSuperiorType(accountLevel);
+ complaint.setSuperiorId(dto.getDispatchId());
updateById(complaint);
-
+ Long superiorOrgId = complaint.getSuperiorId();
+ Integer superiorType = complaint.getSuperiorType();
+ //查询当前单位审核记录表数据
+ //查询上报审核记录
+ 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(dto.getComplaintId(), superiorOrgId, accountLevel, 1, loginUserInfoVO.getUserId());
+ complaintFlowService.createFlow(complaintAuditRecord, 1,loginUserInfoVO.getUserId());
+
+ // 标记最新
+ complaintAuditRecordService.update(new LambdaUpdateWrapper<ComplaintAuditRecord>()
+ .eq(ComplaintAuditRecord::getComplaintId, dto.getComplaintId())
+ .set(ComplaintAuditRecord::getLatestFlag, false));
+ int count = complaintAuditRecordService.count(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, complaint.getId()));
+ ComplaintAuditRecord record = new ComplaintAuditRecord();
+ record.setComplaintId(complaint.getId());
+ record.setLatestFlag(true);
+ record.setAuditType(0);
+ record.setAuditStatus(1);
+ record.setCreateBy(loginUserInfoVO.getUserId());
+ record.setCreateTime(new Date(System.currentTimeMillis()));
+ record.setUpdateBy(loginUserInfoVO.getUserId());
+ record.setUpdateTime(new Date(System.currentTimeMillis()));
+ record.setReporter(loginUserInfoVO.getNickName());
+ record.setReportType(accountLevel);
+ record.setSuperiorId(dto.getDispatchId());
+ record.setSort(count + 1);
+ complaintAuditRecordService.save(record);
}
@Override
@@ -315,65 +483,123 @@
if (!systemUserByPhone.isPresent()) {
throw new ServiceException("无权审核");
}
+
+ SystemUser systemUser = systemUserByPhone.get();
+ Long superiorId = 0L;
+ 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;
+ }
+
//查询上报审核记录
- ComplaintAuditRecord complaintAuditRecord = complaintAuditRecordService.lambdaQuery().eq(ComplaintAuditRecord::getComplaintId, complaintReporAuditDTO.getId())
+ ComplaintAuditRecord complaintAuditRecord = complaintAuditRecordService.lambdaQuery()
+ .eq(ComplaintAuditRecord::getComplaintId, complaintReporAuditDTO.getId())
.eq(ComplaintAuditRecord::getAuditType, 2)
.eq(ComplaintAuditRecord::getLatestFlag, true)
+ .eq(ComplaintAuditRecord::getReportType, systemUser.getAccountLevel())
+ .eq(ComplaintAuditRecord::getSuperiorId, superiorId)
+ .last("LIMIT 1").one();
+ ComplaintAuditRecord lowLevelRecord = complaintAuditRecordService.lambdaQuery()
+ .eq(ComplaintAuditRecord::getComplaintId, complaintReporAuditDTO.getId())
+ .eq(ComplaintAuditRecord::getAuditType, 2)
+ .eq(ComplaintAuditRecord::getLatestFlag, true)
+ .eq(ComplaintAuditRecord::getReportType, systemUser.getAccountLevel()+1)
.last("LIMIT 1").one();
if (Objects.isNull(complaintAuditRecord)) {
throw new ServiceException("上报申请记录不存在");
}
//查询待审核诉求
- complaintAuditRecordService.audit(complaintAuditRecord, loginUserInfoVO.getUserId(),
- complaintReporAuditDTO.getAuditResult(), complaintReporAuditDTO.getRejectReason());
+ //complaintAuditRecordService.audit(complaintAuditRecord, loginUserInfoVO.getUserId(),
+ // complaintReporAuditDTO.getAuditResult(), complaintReporAuditDTO.getRejectReason());
// 添加流转记录
Complaint complaint = getById(complaintAuditRecord.getComplaintId());
- Long superiorId = null;
- if (Objects.nonNull(complaint)) {
- superiorId = complaint.getCreateBy();
- if (Objects.nonNull(complaint.getSuperiorId())) {
- superiorId = complaint.getSuperiorId();
+ // 标记最新
+ complaintAuditRecordService.update(new LambdaUpdateWrapper<ComplaintAuditRecord>()
+ .eq(ComplaintAuditRecord::getComplaintId, complaintAuditRecord.getComplaintId())
+ .set(ComplaintAuditRecord::getLatestFlag, false));
+
+ if (complaintReporAuditDTO.getAuditResult().equals(1)) {
+ int count = complaintAuditRecordService.count(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, complaint.getId()));
+ ComplaintAuditRecord record = new ComplaintAuditRecord();
+ record.setComplaintId(complaint.getId());
+ record.setLatestFlag(true);
+ record.setAuditorId(loginUserInfoVO.getUserId());
+ record.setAuditType(0);
+ record.setAuditStatus(1);
+ record.setCreateBy(loginUserInfoVO.getUserId());
+ record.setCreateTime(new Date());
+ record.setUpdateBy(loginUserInfoVO.getUserId());
+ record.setUpdateTime(new Date());
+ record.setReporter(complaintAuditRecord.getReporter());
+ record.setReportType(complaintAuditRecord.getReportType());
+ record.setSuperiorId(superiorId);
+ record.setSort(count + 1);
+ complaintAuditRecordService.save(record);
+ //创建流程
+ complaintFlowService.createFlow(lowLevelRecord ,0, loginUserInfoVO.getUserId());
+ } else {
+
+ switch (systemUser.getAccountLevel() + 1) {
+ 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;
+ case 5:
+ superiorId = complaint.getCreateBy();
+ break;
}
- complaintFlowService.createFlow(complaintAuditRecord.getComplaintId(), superiorId,complaint.getReportType(),0, loginUserInfoVO.getUserId());
+ int count = complaintAuditRecordService.count(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, complaint.getId()));
+ ComplaintAuditRecord record2 = new ComplaintAuditRecord();
+ record2.setComplaintId(complaint.getId());
+ record2.setLatestFlag(true);
+ record2.setAuditType(2);
+ record2.setAuditorId(loginUserInfoVO.getUserId());
+ record2.setAuditStatus(2);
+ record2.setCreateBy(loginUserInfoVO.getUserId());
+ record2.setCreateTime(new Date());
+ record2.setUpdateBy(loginUserInfoVO.getUserId());
+ record2.setUpdateTime(new Date());
+ record2.setReporter(complaintAuditRecord.getReporter());
+ record2.setReportType(systemUser.getAccountLevel() + 1);
+ record2.setSuperiorId(superiorId);
+ record2.setRejectReason(complaintReporAuditDTO.getRejectReason());
+ record2.setSort(count + 1);
+ complaintAuditRecordService.save(record2);
}
- //审核通过后，将诉求转移给上级
- 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;
+ Long currentId;
int reportType;
if (systemUser == null) {
superiorId = loginUserInfoVO.getCommunityId();
- if (Objects.isNull(superiorId)){
+ currentId = loginUserInfoVO.getUserId();
+ if (Objects.isNull(superiorId)) {
throw new ServiceException("上报失败，请绑定社区");
}
reportType = ReportTypeEnum.COMMUNITY.getCode();
@@ -382,15 +608,21 @@
if (accountLevel == 1) {
throw new ServiceException("市级账号,无法上报！");
}
- reportType = accountLevel + 1;
+ reportType = accountLevel - 1;
// 使用基本类型比较并补充默认分支
if (accountLevel == ReportTypeEnum.COMMUNITY.getCode()) {
superiorId = Long.parseLong(systemUser.getStreetId());
+ currentId = systemUser.getCommunityId();
} else if (accountLevel == ReportTypeEnum.STREET.getCode()) {
superiorId = Long.parseLong(systemUser.getDistrictsCode());
+ currentId = Long.parseLong(systemUser.getStreetId());
} else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
superiorId = 510400L; // 攀枝花市
+ currentId = Long.parseLong(systemUser.getDistrictsCode());
+ } else if (accountLevel == ReportTypeEnum.PARTY.getCode()) {
+ superiorId = systemUser.getCommunityId();
+ currentId = loginUserInfoVO.getUserId();
} else {
// 处理未预期的账号等级
throw new ServiceException("未知的账号等级");
@@ -398,27 +630,115 @@
}
Complaint complaint = getById(dto.getComplaintId());
- complaint.setReportType(reportType);
+ complaint.setSuperiorType(reportType);
complaint.setSuperiorId(superiorId);
updateById(complaint);
// 添加审核记录
- complaintAuditRecordService.createComplaintAuditRecord(dto.getComplaintId(), 1, dto.getComment(), loginUserInfoVO, systemUser);
+ //complaintAuditRecordService.createComplaintAuditRecord(dto.getComplaintId(), 1, dto.getComment(), loginUserInfoVO, systemUser);
+
+ // 清除最新记录
+ complaintAuditRecordService.update(new LambdaUpdateWrapper<ComplaintAuditRecord>()
+ .eq(ComplaintAuditRecord::getComplaintId, dto.getComplaintId())
+ .set(ComplaintAuditRecord::getLatestFlag, false));
+ int count = complaintAuditRecordService.count(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, complaint.getId()));
+ ComplaintAuditRecord record1 = new ComplaintAuditRecord();
+ record1.setComplaintId(complaint.getId());
+ record1.setLatestFlag(true);
+ record1.setAuditType(1);
+ record1.setAuditStatus(0);
+ record1.setCreateBy(loginUserInfoVO.getUserId());
+ record1.setCreateTime(new Date(System.currentTimeMillis()));
+ record1.setUpdateBy(loginUserInfoVO.getUserId());
+ record1.setUpdateTime(new Date(System.currentTimeMillis()));
+ record1.setReporter(loginUserInfoVO.getNickName());
+ record1.setReportType(Objects.isNull(systemUser) ? 5 : systemUser.getAccountLevel());
+ record1.setSuperiorId(currentId);
+ record1.setSort(count + 1);
+ record1.setComment(dto.getComment());
+ complaintAuditRecordService.save(record1);
+
+ ComplaintAuditRecord record2 = new ComplaintAuditRecord();
+ record2.setComplaintId(complaint.getId());
+ record2.setLatestFlag(true);
+ record2.setAuditType(1);
+ record2.setAuditStatus(0);
+ record2.setCreateBy(loginUserInfoVO.getUserId());
+ record2.setCreateTime(new Date(System.currentTimeMillis()));
+ record2.setUpdateBy(loginUserInfoVO.getUserId());
+ record2.setUpdateTime(new Date(System.currentTimeMillis()));
+ record2.setReporter(loginUserInfoVO.getNickName());
+ record2.setReportType(reportType);
+ record2.setSuperiorId(superiorId);
+ record2.setSort(count + 2);
+ record1.setComment(dto.getComment());
+ complaintAuditRecordService.save(record2);
}
@Override
- public void delayAudit(ComplaintDelayAuditDTO complaintDelayAuditDTO, LoginUserInfoVO loginUserInfoVO) {
- //查询待审核诉求
- ComplaintAuditRecord complaintAuditRecord = complaintAuditRecordService.lambdaQuery().eq(ComplaintAuditRecord::getComplaintId, complaintDelayAuditDTO.getComplaintId())
+ public void delayAudit(ComplaintDelayAuditDTO dto, LoginUserInfoVO loginUserInfoVO) {
+
+ SystemUser systemUser = systemUserService.getSystemUserByPhone(loginUserInfoVO.getPhone()).orElse(null);
+
+ int accountLevel = systemUser.getAccountLevel(); // 改为基本类型
+ Long cunrrentId;
+ // 使用基本类型比较并补充默认分支
+ if (accountLevel == ReportTypeEnum.COMMUNITY.getCode()) {
+ cunrrentId = systemUser.getCommunityId();
+ } else if (accountLevel == ReportTypeEnum.STREET.getCode()) {
+ cunrrentId = Long.parseLong(systemUser.getStreetId());
+ } else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
+ cunrrentId = Long.parseLong(systemUser.getDistrictsCode());
+ } else {
+ // 处理未预期的账号等级
+ throw new ServiceException("未知的账号等级");
+ }
+
+
+ ComplaintAuditRecord complaintAuditRecord = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>()
.eq(ComplaintAuditRecord::getAuditType, 1)
+ .eq(ComplaintAuditRecord::getLatestFlag, 1)
.eq(ComplaintAuditRecord::getAuditStatus, 0)
- .eq(ComplaintAuditRecord::getLatestFlag, true)
- .last("LIMIT 1").one();
+ .ne(ComplaintAuditRecord::getSuperiorId, cunrrentId)
+ .eq(ComplaintAuditRecord::getReportType, accountLevel+1)
+ .eq(ComplaintAuditRecord::getComplaintId, dto.getComplaintId())
+ .last("LIMIT 1"));
+
+
if (Objects.isNull(complaintAuditRecord)) {
throw new ServiceException("诉求延期申请不存在");
}
- complaintAuditRecordService.audit(complaintAuditRecord, loginUserInfoVO.getUserId(),
- complaintDelayAuditDTO.getAuditResult(), complaintDelayAuditDTO.getRejectReason());
+ //complaintAuditRecordService.audit(complaintAuditRecord, loginUserInfoVO.getUserId(),
+ // dto.getAuditResult(), dto.getRejectReason());
+ //审核通过后，设置诉求延期
+ if (complaintAuditRecord.getAuditType().equals(1) && complaintAuditRecord.getAuditStatus().equals(0) && dto.getAuditResult().equals(1)) {
+ Complaint complaint = getById(complaintAuditRecord.getComplaintId());
+ complaint.setStatus(1);
+ updateById(complaint);
+ }
+
+
+ complaintAuditRecordService.update(new LambdaUpdateWrapper<ComplaintAuditRecord>()
+ .eq(ComplaintAuditRecord::getComplaintId, dto.getComplaintId())
+ .set(ComplaintAuditRecord::getLatestFlag, false));
+ int count = complaintAuditRecordService.count(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, dto.getId()));
+ ComplaintAuditRecord record1 = new ComplaintAuditRecord();
+ record1.setComplaintId(dto.getComplaintId());
+ record1.setLatestFlag(true);
+ record1.setAuditType(1);
+ record1.setAuditorId(loginUserInfoVO.getUserId());
+ record1.setAuditStatus(dto.getAuditResult());
+ record1.setCreateBy(loginUserInfoVO.getUserId());
+ record1.setCreateTime(new Date(System.currentTimeMillis()));
+ record1.setUpdateBy(loginUserInfoVO.getUserId());
+ record1.setUpdateTime(new Date(System.currentTimeMillis()));
+ record1.setReporter(complaintAuditRecord.getReporter());
+ record1.setReportType(complaintAuditRecord.getReportType());
+ record1.setSuperiorId(complaintAuditRecord.getSuperiorId());
+ record1.setSort(count + 1);
+ record1.setRejectReason(dto.getRejectReason());
+ complaintAuditRecordService.save(record1);
+
}
@Override
@@ -442,18 +762,20 @@
// 使用基本类型比较并补充默认分支
List<DispatchVO> dispatchVOList = new ArrayList<>();
if (accountLevel == ReportTypeEnum.STREET.getCode()) {
- List<ComAct> list = comActService.list();
+ String streetId = adminUser.getStreetId();
+ List<ComAct> list = comActService.list(new LambdaQueryWrapper<ComAct>().eq(ComAct::getStreetId, streetId).eq(ComAct::getState, 0));
for (ComAct comAct : list) {
DispatchVO dispatchVO = new DispatchVO();
- dispatchVO.setId(comAct.getCommunityId());
+ dispatchVO.setId(comAct.getCommunityId().toString());
dispatchVO.setName(comAct.getName());
dispatchVOList.add(dispatchVO);
}
} else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
- List<ComStreet> list = comStreetService.list();
+ String districtsCode = adminUser.getDistrictsCode();
+ List<ComStreet> list = comStreetService.list(new LambdaQueryWrapper<ComStreet>().eq(ComStreet::getAreaCode, districtsCode));
for (ComStreet street : list) {
DispatchVO dispatchVO = new DispatchVO();
- dispatchVO.setId(Long.valueOf(street.getStreetId()));
+ dispatchVO.setId(street.getStreetId().toString());
dispatchVO.setName(street.getName());
dispatchVOList.add(dispatchVO);
}
@@ -462,7 +784,7 @@
.eq(BcRegion::getHierarchyOrder, 3).eq(BcRegion::getParentId, 510400));//获取攀枝花市下的区县
for (BcRegion region : list) {
DispatchVO dispatchVO = new DispatchVO();
- dispatchVO.setId(Long.valueOf(region.getRegionCode()));
+ dispatchVO.setId(region.getRegionCode());
dispatchVO.setName(region.getRegionName());
dispatchVOList.add(dispatchVO);
}
@@ -472,8 +794,10 @@
}
return dispatchVOList;
}
+
/**
* 获取待办诉求
+ *
* @param basePage
* @param loginUserInfo
* @return
@@ -510,11 +834,13 @@
//党员
targetId = loginUserInfo.getUserId().toString();
}
- Page<ComplaintTodoVO> page = baseMapper.getTodoList(new Page<>(basePage.getPageNum(), basePage.getPageSize()), targetId,isSuperior);
+ Page<ComplaintTodoVO> page = baseMapper.getTodoList(new Page<>(basePage.getPageNum(), basePage.getPageSize()), targetId, isSuperior);
return page;
}
+
/**
* 延期情况说明
+ *
* @param complaintId
* @return
*/
--
Gitblit v1.7.1