Merge remote-tracking branch 'origin/v9.6_network_small_version_20240102' into test

performance-web/src/main/java/com/clx/performance/dao/impl/settle/NetworkDriverRunningWaterRecordDaoImpl.java

@@ -32,9 +32,6 @@ public class NetworkDriverRunningWaterRecordDaoImpl extends BaseDaoImpl<NetworkD
     @Override
     public IPage<APPNetworkDriverRunningWaterRecordVO> pageFrozenList(NetworkDriverPageParam param) {
         Page<APPNetworkDriverRunningWaterRecordVO> page = Page.of(param.getPage(), param.getPageSize());
-        for (APPNetworkDriverRunningWaterRecordVO record : page.getRecords()) {
-            record.setAlterationBalance(record.getAlterationBalance().negate());
-        }
         return baseMapper.pageFrozenList(page, param);
     }
 

performance-web/src/main/java/com/clx/performance/service/impl/settle/NetworkDriverRunningWaterRecordServiceImpl.java

 package com.clx.performance.service.impl.settle;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.component.IdGenerateSnowFlake;
@@ -217,7 +218,15 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
     public IPage<APPNetworkDriverRunningWaterRecordVO> runningWaterList(NetworkDriverPageParam param) {
         Long userNo = TokenUtil.getLoginUserInfo().getUserNo();
         param.setUserNo(userNo);
-        return networkDriverRunningWaterRecordDao.runningWaterList(param);
+        IPage<APPNetworkDriverRunningWaterRecordVO> page = networkDriverRunningWaterRecordDao.runningWaterList(param);
+        if (NetworkDriverAccountEnum.FundType.EXPENDITURE.getCode().equals(param.getFundType())) {
+            if (CollectionUtil.isNotEmpty(page.getRecords())) {
+                for (APPNetworkDriverRunningWaterRecordVO record : page.getRecords()) {
+                    record.setAlterationBalance(record.getAlterationBalance().negate());
+                }
+            }
+        }
+        return page;
     }
 
     @Override