diff --git a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/TblUserHelpVo.java b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/TblUserHelpVo.java index 62d038c..e3b7211 100644 --- a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/TblUserHelpVo.java +++ b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/TblUserHelpVo.java @@ -30,6 +30,9 @@ public class TblUserHelpVo { @Parameter(description = "累计处置") private Integer totalacceptance; + @Parameter(description = "近7天的累计处置") //固定查近七天的数据, 和传入的时间筛选无关 + private Integer lastSevenTotal; + @Parameter(description = "交易") private Integer totaldeal; } diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblUserHelpServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblUserHelpServiceImpl.java index 0825226..b324b18 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblUserHelpServiceImpl.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblUserHelpServiceImpl.java @@ -1,5 +1,6 @@ package com.renkang.emergency.service.impl; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; @@ -172,8 +173,10 @@ public class TblUserHelpServiceImpl extends ServiceImpl "1".equals(a.getType())).count()); vo.setDbjy(count); } - // 累计处置 - Integer totalAcceptance = tblUserHelpMapper.getTotalAcceptance(); + // 累计处置 20251212改查询累积处置暂时没有限制 status状态,只有存在呼入记录即代表处理 + LambdaQueryWrapper countWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(StrUtil.isNotEmpty(dto.getCenterId()),TblUserHelp::getCenterId, dto.getCenterId()); + int totalAcceptance = tblUserHelpMapper.selectCount(countWrapper).intValue(); if ("1".equals(dataDetailVO.getTotalDisposalStatus())) { if (dataDetailVO.getTotalDisposal().contains("+")) { vo.setTotalacceptance(totalAcceptance + Integer.parseInt(dataDetailVO.getTotalDisposal().replace("+", "").trim())); @@ -183,6 +186,10 @@ public class TblUserHelpServiceImpl extends ServiceImpl