Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

无关风月

2024-11-01 206ccf5c1151d4f7b1326589cb6cccd4d4ad9225

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

 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,9 +59,13 @@
                    .sorted(Comparator.comparing(TAccountingStrategy::getCreateTime).reversed()).collect(Collectors.toList());
            if(!CollectionUtils.isEmpty(accountingStrategies)){
                TAccountingStrategy tAccountingStrategy = accountingStrategies.get(0);
                if(tAccountingStrategyVO.getAuditStatus() == 4){
                    BeanUtils.copyProperties(tAccountingStrategy,tAccountingStrategyVO);
                }else {
                tAccountingStrategyVO.setAuditStatus(tAccountingStrategy.getAuditStatus());
            }
        }
        }
        pageInfo.setRecords(list);
        return pageInfo;
    }