From 86df207c37502cce1b2043e1c7c0486459eef1d6 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 13 三月 2025 19:58:45 +0800
Subject: [PATCH] 党员、诉求评论基础代码
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 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 e173f60..e2233df 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,7 +1,6 @@
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;
@@ -30,7 +29,6 @@
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;
@@ -92,7 +90,7 @@
// 设置流水号
complaint.setSerialNumber(serialNumber);
- Optional<SystemUser> systemUserOpt = systemUserService.getSystemUserByPhone(loginUserInfoVO.getPhone());
+ Optional<SystemUser> systemUserOpt = systemUserService.getSystemUserAdminByPhone(loginUserInfoVO.getPhone());
Integer accountLevel = 5;
Long superiorId = null;
if (systemUserOpt.isPresent()) {
@@ -166,7 +164,7 @@
public Page<ComplaintVO> complaintList(ComplaintQuery query, LoginUserInfoVO loginUserInfoVO) {
Page<ComplaintVO> page = new Page<>(query.getPageNum(), query.getPageSize());
//判断当前登录用户级别，查询对应工单
- Optional<SystemUser> systemUserByPhone = systemUserService.getSystemUserByPhone(loginUserInfoVO.getPhone());
+ Optional<SystemUser> systemUserByPhone = systemUserService.getSystemUserAdminByPhone(loginUserInfoVO.getPhone());
String targetId = "";
int isSuperior = 0;
Integer accountLevel = 5;
@@ -215,7 +213,7 @@
*/
@Override
public ComplaintVO detail(Long id, LoginUserInfoVO loginUserInfoVO) {
- Optional<SystemUser> systemUserByPhone = systemUserService.getSystemUserByPhone(loginUserInfoVO.getPhone());
+ Optional<SystemUser> systemUserByPhone = systemUserService.getSystemUserAdminByPhone(loginUserInfoVO.getPhone());
String targetId = "";
int isSuperior = 0;
Integer accountLevel = 5;
@@ -479,7 +477,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void reportAudit(ComplaintReporAuditDTO complaintReporAuditDTO, LoginUserInfoVO loginUserInfoVO) {
- Optional<SystemUser> systemUserByPhone = systemUserService.getSystemUserByPhone(loginUserInfoVO.getPhone());
+ Optional<SystemUser> systemUserByPhone = systemUserService.getSystemUserAdminByPhone(loginUserInfoVO.getPhone());
if (!systemUserByPhone.isPresent()) {
throw new ServiceException("无权审核");
}
@@ -536,7 +534,7 @@
record.setComplaintId(complaint.getId());
record.setLatestFlag(true);
record.setAuditorId(loginUserInfoVO.getUserId());
- record.setAuditType(0);
+ record.setAuditType(2);
record.setAuditStatus(1);
record.setCreateBy(loginUserInfoVO.getUserId());
record.setCreateTime(new Date());
@@ -592,7 +590,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void saveDelay(ComplaintDelayDTO dto, LoginUserInfoVO loginUserInfoVO) {
- SystemUser systemUser = systemUserService.getSystemUserByPhone(loginUserInfoVO.getPhone()).orElse(null);
+ SystemUser systemUser = systemUserService.getSystemUserAdminByPhone(loginUserInfoVO.getPhone()).orElse(null);
Long superiorId;
Long currentId;
int reportType;
@@ -678,7 +676,7 @@
@Override
public void delayAudit(ComplaintDelayAuditDTO dto, LoginUserInfoVO loginUserInfoVO) {
- SystemUser systemUser = systemUserService.getSystemUserByPhone(loginUserInfoVO.getPhone()).orElse(null);
+ SystemUser systemUser = systemUserService.getSystemUserAdminByPhone(loginUserInfoVO.getPhone()).orElse(null);
int accountLevel = systemUser.getAccountLevel(); // 改为基本类型
Long cunrrentId;
@@ -736,6 +734,7 @@
record1.setReportType(complaintAuditRecord.getReportType());
record1.setSuperiorId(complaintAuditRecord.getSuperiorId());
record1.setSort(count + 1);
+ record1.setRejectReason(dto.getRejectReason());
complaintAuditRecordService.save(record1);
}
@@ -803,7 +802,7 @@
*/
@Override
public Page<ComplaintTodoVO> getTodoList(BasePage basePage, LoginUserInfoVO loginUserInfo) {
- Optional<SystemUser> systemUserByPhone = systemUserService.getSystemUserByPhone(loginUserInfo.getPhone());
+ Optional<SystemUser> systemUserByPhone = systemUserService.getSystemUserAdminByPhone(loginUserInfo.getPhone());
String targetId = "";
int isSuperior = 0;
//上级
--
Gitblit v1.7.1