From 7781b75609b56a01b6c3d252fc699624810f6805 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 28 二月 2025 22:55:04 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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 b8e1e9a..2c269dd 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,6 +30,7 @@
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 org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -316,6 +319,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void saveReport(ComplaintReportDTO dto, LoginUserInfoVO loginUserInfoVO) {
+ System.err.println("用户登录数据---》" + JSON.toJSONString(loginUserInfoVO));
String phone = loginUserInfoVO.getPhone();
SystemUser adminUser = systemUserService.getOne(new LambdaQueryWrapper<SystemUser>()
@@ -678,8 +682,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"));
@@ -687,8 +691,8 @@
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)) {
Complaint complaint = getById(complaintAuditRecord.getComplaintId());
@@ -712,10 +716,11 @@
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);
complaintAuditRecordService.save(record1);
+
}
@Override
--
Gitblit v1.7.1