From 8d3b664cb1218bb49c56fecf6896940377a7e5e8 Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Tue, 20 Jun 2023 15:30:46 +0800 Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B46=E6=9C=8820=E6=97=A5=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TingKeStatisticsController.java | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java index 158039b2..b083805c 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java @@ -1,5 +1,6 @@ package org.jeecg.modules.kc.statistics; +import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -17,6 +18,7 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi; import org.jeecg.modules.kc.grab.imports.entity.Xxhbuser; import org.jeecg.modules.kc.grab.imports.service.IXxhbuserService; import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory; @@ -68,6 +70,9 @@ public class TingKeStatisticsController { @Autowired private IKcXqxnHistoryService kcXqxnHistoryService; + @Autowired + private ChangeTingKeTongJi changeTingKeTongJi; + public IPage loadPageData(KcEvaluationVo evaluation,QueryWrapper queryWrapper,Page page){ queryWrapper.isNotNull("a.upuserid"); @@ -96,12 +101,18 @@ public class TingKeStatisticsController { //补充搜索 if(StringUtils.isNotBlank(evaluation.getXqxn())){ - List xqxnHistoryList = kcXqxnHistoryList.stream().filter(x -> StringUtils.equals(x.getTitle(),evaluation.getXqxn())).collect(Collectors.toList()); - if(xqxnHistoryList != null && !xqxnHistoryList.isEmpty()){ - KcXqxnHistory xqxnHistory = xqxnHistoryList.get(0); - queryWrapper.ge("a.up_date",xqxnHistory.getStartTime()); - queryWrapper.le("a.up_date",xqxnHistory.getEndTime()); - } + KcXqxnHistory common = changeTingKeTongJi.getXqConfig(evaluation.getXqxn()); + Date startSjDate = common.getStartTime(); + Date endSjDate = common.getEndTime(); + String startSj = DateUtil.format(startSjDate, DatePattern.NORM_DATETIME_FORMAT); + String endSj = DateUtil.format(endSjDate,DatePattern.NORM_DATETIME_FORMAT); + String xqxn = common.getTitle(); + + queryWrapper.apply("a.up_date >= STR_TO_DATE('"+ startSj +"', '%Y-%m-%d') "); + queryWrapper.apply("a.up_date <= STR_TO_DATE('"+ endSj +"', '%Y-%m-%d') "); + +// queryWrapper.ge("a.up_date",xqxnHistory.getStartTime()); +// queryWrapper.le("a.up_date",xqxnHistory.getEndTime()); } IPage pageList = service.selectPageAndKcmc(page, queryWrapper); //---------------------补数据1------------------------------------------