From 8876b1b9cd27fad076ea9e5f3e04197b84ba02bd Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 01 八月 2024 14:26:56 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditRecordServiceImpl.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditRecordServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditRecordServiceImpl.java
index 6a31892..3dbba56 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditRecordServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditRecordServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.management.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.management.domain.*;
@@ -57,12 +58,15 @@
@Override
public void updSlAuditRecord(AuditRecordDTO auditRecordDTO) {
SlAudit slAudit = slAuditMapper.selectById(auditRecordDTO.getAuditId());
- SlAuditRecord byId = this.getById(auditRecordDTO.getId());
+ SlAuditRecord byId = this.getOne(new QueryWrapper<SlAuditRecord>()
+ .eq("type", auditRecordDTO.getType())
+ .eq("audit_id", auditRecordDTO.getAuditId()));
+ Long userid = SecurityUtils.getUserId();
+ SysUser data = sysUserClient.getSysUser(userid).getData();
if (auditRecordDTO.getState()==2){
- Long userid = SecurityUtils.getUserId();
- SysUser data = sysUserClient.getSysUser(userid).getData();
byId.setShenhName(data.getNickName());
byId.setShenhTime(new Date());
+ byId.setState(auditRecordDTO.getState());
this.updateById(byId);
if (slAudit.getState()==1){
slAudit.setState(2);
@@ -92,12 +96,12 @@
slVolumeProductionZyglMapper.updateById(slVolumeProductionZygl);
}
- } if (slAudit.getState()==2){
+ } else if (slAudit.getState()==2){
slAudit.setState(3);
LambdaQueryWrapper<SlAuditRecord> wrapper= Wrappers.lambdaQuery();
wrapper.eq(SlAuditRecord::getAuditId,auditRecordDTO.getAuditId());
wrapper.eq(SlAuditRecord::getType,3);
- wrapper.eq( SlAuditRecord::getDelFlag,0);
+ wrapper.eq(SlAuditRecord::getDelFlag,0);
SlAuditRecord one = this.getOne(wrapper);
slAudit.setShenhId(one.getShenhId());
slAuditMapper.updateById(slAudit);
@@ -120,7 +124,7 @@
slVolumeProductionZyglMapper.updateById(slVolumeProductionZygl);
}
- }if (slAudit.getState()==3){
+ }else if (slAudit.getState()==3){
slAudit.setState(4);
slAuditMapper.updateById(slAudit);
if (slAudit.getType()==1){
@@ -147,12 +151,20 @@
}
- }
- if (auditRecordDTO.getState()==3){
+ }else if (auditRecordDTO.getState()==3){
+ byId.setShenhName(data.getNickName());
+ byId.setShenhTime(new Date());
+ byId.setState(auditRecordDTO.getState());
+ this.updateById(byId);
+ LambdaQueryWrapper<SlAuditRecord> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(SlAuditRecord::getAuditId,auditRecordDTO.getAuditId());
+ wrapper.eq(SlAuditRecord::getType,3);
+ wrapper.eq(SlAuditRecord::getDelFlag,0);
+ SlAuditRecord one = this.getOne(wrapper);
+ slAudit.setShenhId(one.getShenhId());
slAudit.setCause(auditRecordDTO.getCause());
slAudit.setState(5);
slAuditMapper.updateById(slAudit);
-
if (slAudit.getType()==1){
SlVolumeProductionRkgl slVolumeProductionRkgl = slVolumeProductionRkglMapper.selectById(slAudit.getRkId());
slVolumeProductionRkgl.setAuditStatus(5);
--
Gitblit v1.7.1