From 2b64c778ff416eddce8d194b3d6b4dbad9b810bb Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Thu, 11 Jun 2026 17:32:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E4=B8=80=E6=97=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=87=AA=E5=8A=A8=E6=89=A9=E5=B1=95=E4=B8=BA?= =?UTF-8?q?=E5=BD=93=E5=A4=A9=E7=9A=840=E7=82=B9~23=E7=82=B959=E5=88=8659?= =?UTF-8?q?=E7=A7=92=EF=BC=9A1=E3=80=81=E8=B4=A6=E6=88=B7=E6=80=BB?= =?UTF-8?q?=E9=A2=9D=E8=B6=8B=E5=8A=BF=EF=BC=9B2=E3=80=81=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=AB=AF=E5=88=86=E6=9E=90=E9=A1=B5=E8=B4=A6=E6=88=B7?= =?UTF-8?q?=E6=95=B0=E9=87=8F/=E7=BB=84=E7=BB=87=E6=95=B0=E9=87=8F/?= =?UTF-8?q?=E8=B4=A6=E6=88=B7=E8=B5=84=E9=87=91=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cf/imes/framework/common/pojo/CommonStatisticsReqVO.java | 3 +++ .../framework/common/util/time/StatisticsChangeUtils.java | 2 +- .../service/funds/organamount/OrganAmountServiceImpl.java | 2 ++ .../service/funds/statistics/FundsStatisticsServiceImpl.java | 2 ++ .../cf/imes/module/system/service/organ/OrganServiceImpl.java | 1 + .../imes/module/system/service/user/AdminUserServiceImpl.java | 2 ++ .../funds/incomeandexpense/IncomeExpenseDetailsMapper.xml | 4 ++-- .../src/main/resources/mapper/organ/OrganMapper.xml | 4 ++-- .../src/main/resources/mapper/process/AdminUserMapper.xml | 4 ++-- 9 files changed, 17 insertions(+), 7 deletions(-) diff --git a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/pojo/CommonStatisticsReqVO.java b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/pojo/CommonStatisticsReqVO.java index 50be3ec21..be5f45bc4 100644 --- a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/pojo/CommonStatisticsReqVO.java +++ b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/pojo/CommonStatisticsReqVO.java @@ -7,6 +7,7 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDate; +import java.time.LocalDateTime; /** * 通用统计 ReqVO @@ -19,6 +20,8 @@ public class CommonStatisticsReqVO { @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate[] createTime; + private LocalDateTime[] createTimeForQry = null; + /** * 统计维度单位 */ diff --git a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/time/StatisticsChangeUtils.java b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/time/StatisticsChangeUtils.java index 5519984f2..9b1b1a065 100644 --- a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/time/StatisticsChangeUtils.java +++ b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/time/StatisticsChangeUtils.java @@ -118,7 +118,7 @@ public class StatisticsChangeUtils { Integer unit = reqVO.getUnit(); // 计算时间跨度 getTimeSpan(reqVO); -// 计算后的开始和结束时间 + // 计算后的开始和结束时间 LocalDate startDate = ObjectUtil.clone(reqVO.getCreateTime()[0]); LocalDate endDate = ObjectUtil.clone(reqVO.getCreateTime()[1]); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountServiceImpl.java index 3175cb25d..f0e587a03 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountServiceImpl.java @@ -3,6 +3,7 @@ package com.cf.imes.module.system.service.funds.organamount; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.util.ObjectUtil; +import com.cf.imes.framework.common.util.date.LocalDateTimeUtils; import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils; import com.cf.imes.module.system.controller.admin.funds.organamount.vo.ManageAmountOverviewRespVO; import com.cf.imes.module.system.controller.admin.funds.organamount.vo.OrganAmountGroupByCreateTimeRespVO; @@ -106,6 +107,7 @@ public class OrganAmountServiceImpl implements OrganAmountService { List> series = new ArrayList<>(); Map orgAmountSeriesItem = new HashMap<>(); + reqVO.setCreateTimeForQry(LocalDateTimeUtils.generateTimeSection(reqVO.getCreateTime())); // 查询组织收支趋势统计 Map> organIncomeExpenseGroupByCreateTimeRespMap = incomeExpenseDetailsMapper.selectOrganIncomeExpenseTrendGroupByCreateTime(reqVO, queryOrg ? organId : null).stream() .sorted(Comparator.naturalOrder()) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/statistics/FundsStatisticsServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/statistics/FundsStatisticsServiceImpl.java index d5559f7f6..eeb3f4405 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/statistics/FundsStatisticsServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/statistics/FundsStatisticsServiceImpl.java @@ -1,5 +1,6 @@ package com.cf.imes.module.system.service.funds.statistics; +import com.cf.imes.framework.common.util.date.LocalDateTimeUtils; import com.cf.imes.framework.common.util.i18n.core.util.I18nUtils; import com.cf.imes.module.system.controller.admin.statistics.vo.OrgStatusGroupStatisticsReqVO; import com.cf.imes.module.system.dal.dataobject.funds.statistics.FundsTradeTypeGroupStatisticsDO; @@ -42,6 +43,7 @@ public class FundsStatisticsServiceImpl implements FundsStatisticsService { // 所有的日期集合 List dateList = getDateList(reqVO); + reqVO.setCreateTimeForQry(LocalDateTimeUtils.generateTimeSection(reqVO.getCreateTime())); // 销售额Map LinkedHashMap> purchaseMap = incomeExpenseDetailsMapper.selectTotalSalesTrendGroupByCreateTime(reqVO).stream() .sorted(Comparator.naturalOrder()) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java index 534336693..10298b7d9 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java @@ -753,6 +753,7 @@ public class OrganServiceImpl implements OrganService { // 所有的日期集合 List dateList = getDateList(reqVO); + reqVO.setCreateTimeForQry(LocalDateTimeUtils.generateTimeSection(reqVO.getCreateTime())); // 组织有效数量 Map> orderNotLapseRespMap = organMapper.selectOrgCountAddByOrderDate(reqVO).stream() .sorted(Comparator.naturalOrder()) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/user/AdminUserServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/user/AdminUserServiceImpl.java index 14eb29d7e..3da4e2a65 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/user/AdminUserServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/user/AdminUserServiceImpl.java @@ -12,6 +12,7 @@ import com.cf.imes.framework.common.enums.UserTypeEnum; import com.cf.imes.framework.common.exception.ServiceException; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.util.collection.CollectionUtils; +import com.cf.imes.framework.common.util.date.LocalDateTimeUtils; import com.cf.imes.framework.common.util.i18n.core.util.I18nUtils; import com.cf.imes.framework.common.util.json.JsonUtils; import com.cf.imes.framework.common.util.monitor.TracerUtils; @@ -876,6 +877,7 @@ public class AdminUserServiceImpl implements AdminUserService { // 所有的日期集合 List dateList = getDateList(reqVO); + reqVO.setCreateTimeForQry(LocalDateTimeUtils.generateTimeSection(reqVO.getCreateTime())); // 新增数量Map LinkedHashMap> userAddMap = userMapper.selectUserStatusGroupStatistics(reqVO, false).stream() .sorted(Comparator.naturalOrder()) diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/incomeandexpense/IncomeExpenseDetailsMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/incomeandexpense/IncomeExpenseDetailsMapper.xml index 9d904c780..219bbc3d4 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/incomeandexpense/IncomeExpenseDetailsMapper.xml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/incomeandexpense/IncomeExpenseDetailsMapper.xml @@ -21,7 +21,7 @@ select COALESCE(sum(amount) ,0) as amount from income_expense_details - where create_time between #{req.createTime[0]} and #{req.createTime[1]} + where create_time between #{req.createTimeForQry[0]} and #{req.createTimeForQry[1]} and deleted = false and organ_id = #{organId} @@ -34,7 +34,7 @@ select COALESCE(sum(amount) ,0) as amount from income_expense_details - where create_time between #{req.createTime[0]} and #{req.createTime[1]} + where create_time between #{req.createTimeForQry[0]} and #{req.createTimeForQry[1]} and deleted = false GROUP BY date diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/organ/OrganMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/organ/OrganMapper.xml index fdb7a4be5..7a9d231cd 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/organ/OrganMapper.xml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/organ/OrganMapper.xml @@ -43,7 +43,7 @@ select count(o.id) as orgCount from system_organization o - where o.update_time between #{req.createTime[0]} and #{req.createTime[1]} + where o.update_time between #{req.createTimeForQry[0]} and #{req.createTimeForQry[1]} and o.deleted = 1 group by date; @@ -68,7 +68,7 @@ select count(o.id) as orgCount from system_organization o - where o.create_time between #{req.createTime[0]} and #{req.createTime[1]} + where o.create_time between #{req.createTimeForQry[0]} and #{req.createTimeForQry[1]} and o.deleted = 0 group by date; diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/AdminUserMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/AdminUserMapper.xml index 1f840ff2f..244459aa0 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/AdminUserMapper.xml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/AdminUserMapper.xml @@ -97,10 +97,10 @@ from system_users o where - o.update_time between #{req.createTime[0]} and #{req.createTime[1]} + o.update_time between #{req.createTimeForQry[0]} and #{req.createTimeForQry[1]} - o.create_time between #{req.createTime[0]} and #{req.createTime[1]} + o.create_time between #{req.createTimeForQry[0]} and #{req.createTimeForQry[1]} and o.deleted = #{deleted} group by date;