Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-11-01 a85ab71180fdcb02b3cae304ebc96bb2ca12423c

 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);