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 | 128 ++++++++++++++++++++++++++----------------
1 files changed, 80 insertions(+), 48 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 255181b..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 {
@@ -135,6 +140,7 @@
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());
@@ -147,6 +153,7 @@
complaintAuditRecord.setUpdateTime(new Date(System.currentTimeMillis()));
complaintAuditRecord.setReportType(accountLevel);
complaintAuditRecord.setSuperiorId(superiorId);
+ complaintAuditRecord.setSort(count + 1);
complaintAuditRecordService.save(complaintAuditRecord);
}
@@ -257,7 +264,7 @@
detail.setAuditButtonStatus(1);
Long superiorId = detail.getSuperiorId();
Integer superiorType = detail.getSuperiorType();
- if(detail.getStatus() == 5 && systemUserByPhone.isPresent()){
+ if((detail.getStatus() == 5 || detail.getStatus() == 7) && systemUserByPhone.isPresent()){
if(superiorType.equals(accountLevel) && superiorId.toString().equals(targetId)){
detail.setAuditButtonStatus(0);
}
@@ -314,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>()
@@ -363,6 +371,9 @@
//complaint.setReportType(+);
complaint.setSuperiorType(reportType);
complaint.setSuperiorId(superiorId);
+ if (complaint.getStatus() != 0) {
+ complaint.setStatus(0);
+ }
updateById(complaint);
// 标记最新
@@ -372,20 +383,21 @@
// 添加审核记录
//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(System.currentTimeMillis()));
+ complaintAuditRecord.setCreateTime(new Date());
complaintAuditRecord.setUpdateBy(loginUserInfoVO.getUserId());
- complaintAuditRecord.setUpdateTime(new Date(System.currentTimeMillis()));
+ 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);
@@ -395,13 +407,14 @@
complaintAuditRecord2.setAuditType(2);
complaintAuditRecord2.setAuditStatus(0);
complaintAuditRecord2.setCreateBy(loginUserInfoVO.getUserId());
- complaintAuditRecord2.setCreateTime(new Date(System.currentTimeMillis()));
+ complaintAuditRecord2.setCreateTime(new Date());
complaintAuditRecord2.setUpdateBy(loginUserInfoVO.getUserId());
- complaintAuditRecord2.setUpdateTime(new Date(System.currentTimeMillis()));
+ 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);
}
@@ -431,15 +444,22 @@
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, superiorType, 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);
@@ -452,6 +472,7 @@
record.setReporter(loginUserInfoVO.getNickName());
record.setReportType(accountLevel);
record.setSuperiorId(dto.getDispatchId());
+ record.setSort(count + 1);
complaintAuditRecordService.save(record);
}
@@ -488,6 +509,12 @@
.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("上报申请记录不存在");
}
@@ -504,6 +531,7 @@
.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);
@@ -511,21 +539,16 @@
record.setAuditType(0);
record.setAuditStatus(1);
record.setCreateBy(loginUserInfoVO.getUserId());
- record.setCreateTime(new Date(System.currentTimeMillis()));
+ record.setCreateTime(new Date());
record.setUpdateBy(loginUserInfoVO.getUserId());
- record.setUpdateTime(new Date(System.currentTimeMillis()));
+ record.setUpdateTime(new Date());
record.setReporter(complaintAuditRecord.getReporter());
record.setReportType(complaintAuditRecord.getReportType());
record.setSuperiorId(superiorId);
+ record.setSort(count + 1);
complaintAuditRecordService.save(record);
-
-
- if (Objects.nonNull(complaint.getSuperiorId())) {
- complaintFlowService.createFlow(complaintAuditRecord.getComplaintId(), complaint.getSuperiorId(), complaint.getSuperiorType(), 0, loginUserInfoVO.getUserId());
- } else {
- complaintFlowService.createFlow(complaintAuditRecord.getComplaintId(), complaint.getCreateBy(), complaint.getReportType(), 0, loginUserInfoVO.getUserId());
- }
-
+ //创建流程
+ complaintFlowService.createFlow(lowLevelRecord ,0, loginUserInfoVO.getUserId());
} else {
switch (systemUser.getAccountLevel() + 1) {
@@ -545,7 +568,7 @@
superiorId = complaint.getCreateBy();
break;
}
-
+ int count = complaintAuditRecordService.count(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, complaint.getId()));
ComplaintAuditRecord record2 = new ComplaintAuditRecord();
record2.setComplaintId(complaint.getId());
record2.setLatestFlag(true);
@@ -553,13 +576,14 @@
record2.setAuditorId(loginUserInfoVO.getUserId());
record2.setAuditStatus(2);
record2.setCreateBy(loginUserInfoVO.getUserId());
- record2.setCreateTime(new Date(System.currentTimeMillis()));
+ record2.setCreateTime(new Date());
record2.setUpdateBy(loginUserInfoVO.getUserId());
- record2.setUpdateTime(new Date(System.currentTimeMillis()));
+ 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);
}
}
@@ -568,17 +592,13 @@
@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();
- currentId = loginUserInfoVO.getCommunityId();
+ currentId = loginUserInfoVO.getUserId();
if (Objects.isNull(superiorId)) {
throw new ServiceException("上报失败，请绑定社区");
}
@@ -588,7 +608,7 @@
if (accountLevel == 1) {
throw new ServiceException("市级账号,无法上报！");
}
- reportType = accountLevel + 1;
+ reportType = accountLevel - 1;
// 使用基本类型比较并补充默认分支
if (accountLevel == ReportTypeEnum.COMMUNITY.getCode()) {
@@ -600,6 +620,9 @@
} 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("未知的账号等级");
@@ -613,37 +636,41 @@
// 添加审核记录
//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(2);
- record1.setAuditStatus(2);
+ 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(systemUser.getAccountLevel());
+ 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(2);
- record2.setAuditStatus(2);
+ 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(systemUser.getAccountLevel() - 1);
+ record2.setReportType(reportType);
record2.setSuperiorId(superiorId);
+ record2.setSort(count + 2);
+ record1.setComment(dto.getComment());
complaintAuditRecordService.save(record2);
}
@@ -672,8 +699,8 @@
.eq(ComplaintAuditRecord::getAuditType, 1)
.eq(ComplaintAuditRecord::getLatestFlag, 1)
.eq(ComplaintAuditRecord::getAuditStatus, 0)
- .eq(ComplaintAuditRecord::getSuperiorId, cunrrentId)
- .eq(ComplaintAuditRecord::getReportType, accountLevel)
+ .ne(ComplaintAuditRecord::getSuperiorId, cunrrentId)
+ .eq(ComplaintAuditRecord::getReportType, accountLevel+1)
.eq(ComplaintAuditRecord::getComplaintId, dto.getComplaintId())
.last("LIMIT 1"));
@@ -681,10 +708,10 @@
if (Objects.isNull(complaintAuditRecord)) {
throw new ServiceException("诉求延期申请不存在");
}
- complaintAuditRecordService.audit(complaintAuditRecord, loginUserInfoVO.getUserId(),
- dto.getAuditResult(), dto.getRejectReason());
+ //complaintAuditRecordService.audit(complaintAuditRecord, loginUserInfoVO.getUserId(),
+ // dto.getAuditResult(), dto.getRejectReason());
//审核通过后，设置诉求延期
- if (complaintAuditRecord.getAuditType().equals(1) && complaintAuditRecord.getAuditStatus().equals(1)) {
+ if (complaintAuditRecord.getAuditType().equals(1) && complaintAuditRecord.getAuditStatus().equals(0) && dto.getAuditResult().equals(1)) {
Complaint complaint = getById(complaintAuditRecord.getComplaintId());
complaint.setStatus(1);
updateById(complaint);
@@ -694,21 +721,24 @@
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(2);
+ record1.setAuditType(1);
record1.setAuditorId(loginUserInfoVO.getUserId());
- record1.setAuditStatus(2);
+ 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(systemUser.getAccountLevel());
- record1.setSuperiorId(cunrrentId);
+ record1.setReportType(complaintAuditRecord.getReportType());
+ record1.setSuperiorId(complaintAuditRecord.getSuperiorId());
+ record1.setSort(count + 1);
+ record1.setRejectReason(dto.getRejectReason());
complaintAuditRecordService.save(record1);
+
}
@Override
@@ -732,7 +762,8 @@
// 使用基本类型比较并补充默认分支
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().toString());
@@ -740,7 +771,8 @@
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(street.getStreetId().toString());
--
Gitblit v1.7.1