This commit is contained in:
2025-10-03 16:56:50 +08:00
parent 31a0c1d249
commit c7a4342694
2 changed files with 4 additions and 4 deletions

View File

@@ -50,7 +50,7 @@ public interface OfficialGoldRecordMapperExpand {
List<OfficialGoldRecordVo> getOfficialGoldRecordList(@Param("record") Map record, @Param("start") Integer start, @Param("pageSize") Integer pageSize); List<OfficialGoldRecordVo> getOfficialGoldRecordList(@Param("record") Map record, @Param("start") Integer start, @Param("pageSize") Integer pageSize);
int getOfficialGoldRecordCount(@Param("record") Map record); int getOfficialGoldRecordCount(@Param("record") Map record);
long getTotalNum(@Param("record") Map record); Long getTotalNum(@Param("record") Map record);
BigDecimal getTotalAmountByAdminId(@Param("`type`") Byte type, BigDecimal getTotalAmountByAdminId(@Param("`type`") Byte type,
@Param("adminId") Integer adminId, @Param("adminId") Integer adminId,

View File

@@ -3,8 +3,8 @@ package com.accompany.admin.service.record;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.accompany.admin.mapper.OfficialGoldRecordMapper; import com.accompany.admin.mapper.OfficialGoldRecordMapper;
import com.accompany.admin.mapper.OfficialGoldRecordMapperExpand; import com.accompany.admin.mapper.OfficialGoldRecordMapperExpand;
import com.accompany.admin.model.OfficialGoldRecord;
import com.accompany.admin.model.AdminUser; import com.accompany.admin.model.AdminUser;
import com.accompany.admin.model.OfficialGoldRecord;
import com.accompany.admin.service.system.AdminUserService; import com.accompany.admin.service.system.AdminUserService;
import com.accompany.admin.vo.OfficialGoldAllRecordVo; import com.accompany.admin.vo.OfficialGoldAllRecordVo;
import com.accompany.admin.vo.OfficialGoldRecordVo; import com.accompany.admin.vo.OfficialGoldRecordVo;
@@ -589,10 +589,10 @@ public class OfficialGoldRecordService extends BaseService {
vo.setCurrencyTypeDesc(currencyTypeDesc); vo.setCurrencyTypeDesc(currencyTypeDesc);
} }
int count = officialGoldRecordMapperExpand.getOfficialGoldRecordCount(record); int count = officialGoldRecordMapperExpand.getOfficialGoldRecordCount(record);
long totalNum = officialGoldRecordMapperExpand.getTotalNum(record); Long totalNum = officialGoldRecordMapperExpand.getTotalNum(record);
data.put("rows", list); data.put("rows", list);
data.put("total", count); data.put("total", count);
data.put("totalNum", totalNum); data.put("totalNum", totalNum == null ? 0L : totalNum);
return data; return data;
} }