From 8234dda9333211615108d3e7e13f1600ee734731 Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Thu, 15 Jun 2023 10:11:55 +0800 Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B46=E6=9C=8815=E6=97=A5=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=AF=84=E8=AF=BE=E9=87=8F=E8=A1=A8=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E5=92=8C=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qa/controller/KcEvaluationController.java | 12 +++++------ .../kc/qa/mapper/KcEvaluationMapper.java | 2 ++ .../kc/qa/mapper/xml/KcEvaluationMapper.xml | 7 +++++++ .../kc/qa/service/IKcEvaluationService.java | 2 ++ .../service/impl/KcEvaluationServiceImpl.java | 5 +++++ .../TingKeStatisticsController.java | 20 +++++++++---------- 6 files changed, 32 insertions(+), 16 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java index 5c454ea5..71e41292 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java @@ -251,10 +251,10 @@ public class KcEvaluationController extends JeecgController exportList = kcEvaluationService.selectKkdwExportList(kcEvaluation); Map sourceDictMap = Maps.newHashMap(); //0：门户添加，1：老系统，2：政务大厅，3后台导入 - sourceDictMap.put(0,"门户添加"); + sourceDictMap.put(0,"信息中心"); sourceDictMap.put(1,"老系统"); - sourceDictMap.put(2,"政务大厅"); - sourceDictMap.put(3,"后台导入"); + sourceDictMap.put(2,"服务大厅"); + sourceDictMap.put(3,"线下纸质"); //更改字典项 exportList.forEach(x -> { x.setSourceName(sourceDictMap.get(x.getSource())); @@ -353,10 +353,10 @@ public class KcEvaluationController extends JeecgController sourceDictMap = Maps.newHashMap(); //0：门户添加，1：老系统，2：政务大厅，3后台导入 - sourceDictMap.put(0,"门户添加"); + sourceDictMap.put(0,"信息中心"); sourceDictMap.put(1,"老系统"); - sourceDictMap.put(2,"政务大厅"); - sourceDictMap.put(3,"后台导入"); + sourceDictMap.put(2,"服务大厅"); + sourceDictMap.put(3,"线下纸质"); //更改字典项 exportList.forEach(x -> { x.setSourceName(sourceDictMap.get(x.getSource())); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationMapper.java index 04633826..8c9c24a8 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationMapper.java @@ -31,4 +31,6 @@ public interface KcEvaluationMapper extends BaseMapper { List selectPkmxExportList(KcEvaluationPkmx kcEvaluationPkmx); List keTangList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + List selectPageAndKcmc(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml index f5eaabfb..285d75fd 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml @@ -393,5 +393,12 @@ ${ew.customSqlSegment} + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationService.java index fee7ac02..5728f32b 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationService.java @@ -32,4 +32,6 @@ public interface IKcEvaluationService extends IService { List selectPkmxExportList(KcEvaluationPkmx kcEvaluationPkmx); IPage keTangList(Page page, QueryWrapper queryWrapper); + + IPage selectPageAndKcmc(Page page, QueryWrapper queryWrapper); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationServiceImpl.java index db2d1a1e..83988ca8 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationServiceImpl.java @@ -105,4 +105,9 @@ public class KcEvaluationServiceImpl extends ServiceImpl selectPageAndKcmc(Page page, QueryWrapper queryWrapper) { + return page.setRecords(baseMapper.selectPageAndKcmc(page,queryWrapper)); + } + } 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 86101023..e9f157bb 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 @@ -65,9 +65,9 @@ public class TingKeStatisticsController{ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(evaluation, req.getParameterMap()); - queryWrapper.isNotNull("upuserid"); - queryWrapper.isNotNull("minkcid"); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper("a",evaluation, req.getParameterMap()); + queryWrapper.isNotNull("a.upuserid"); + queryWrapper.isNotNull("a.minkcid"); List kcXqxnHistoryList = kcXqxnHistoryService.list(); //查询所在单位 @@ -82,26 +82,26 @@ public class TingKeStatisticsController{ 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("up_date",xqxnHistory.getStartTime()); - queryWrapper.le("up_date",xqxnHistory.getEndTime()); + queryWrapper.ge("a.up_date",xqxnHistory.getStartTime()); + queryWrapper.le("a.up_date",xqxnHistory.getEndTime()); } } if(StringUtils.isNotBlank(evaluation.getDwmc())){ List xxhbuserList = szdwList.stream().filter(x -> StringUtils.equals(x.getDwh(),evaluation.getDwmc())).collect(Collectors.toList()); Set ghSet = xxhbuserList.stream().map(x -> x.getGh()).collect(Collectors.toSet()); - queryWrapper.in("upuserid",ghSet); + queryWrapper.in("a.upuserid",ghSet); } Page page = new Page<>(pageNo, pageSize); - IPage pageList = kcEvaluationService.page(page, queryWrapper); + IPage pageList = kcEvaluationService.selectPageAndKcmc(page, queryWrapper); //---------------------补数据1------------------------------------------ Map sourceDictMap = Maps.newHashMap(); //0：门户添加，1：老系统，2：政务大厅，3后台导入 - sourceDictMap.put(0,"门户添加"); + sourceDictMap.put(0,"信息中心"); sourceDictMap.put(1,"老系统"); - sourceDictMap.put(2,"政务大厅"); - sourceDictMap.put(3,"后台导入"); + sourceDictMap.put(2,"服务大厅"); + sourceDictMap.put(3,"线下纸质"); //---------------------补数据1------------------------------------------ Set tjSet = Sets.newHashSet();