From 7a4f9541331bef779a506b38a27ed5c3373c0bec Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 15 五月 2025 13:53:22 +0800
Subject: [PATCH] 开发二级等保功能及心跳消息队列修改
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyServiceImpl.java
index 29d8c4a..2077b20 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyServiceImpl.java
@@ -12,6 +12,7 @@
import com.ruoyi.other.api.feignClient.OtherClient;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -58,7 +59,11 @@
.sorted(Comparator.comparing(TAccountingStrategy::getCreateTime).reversed()).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(accountingStrategies)){
TAccountingStrategy tAccountingStrategy = accountingStrategies.get(0);
- tAccountingStrategyVO.setAuditStatus(tAccountingStrategy.getAuditStatus());
+ if(tAccountingStrategyVO.getAuditStatus() == 4){
+ BeanUtils.copyProperties(tAccountingStrategy,tAccountingStrategyVO);
+ }else {
+ tAccountingStrategyVO.setAuditStatus(tAccountingStrategy.getAuditStatus());
+ }
}
}
pageInfo.setRecords(list);
--
Gitblit v1.7.1