From eabf546972cbe4bfe702f43e745dff51a40044ac Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Wed, 14 Jun 2023 09:27:31 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B46=E6=9C=8814=E6=97=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E7=BB=9F=E8=AE=A1=E7=9A=84=E6=90=9C=E7=B4=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TingKeStatisticsController.java           | 43 +++++++++++++------
 pom.xml                                       |  8 ++--
 2 files changed, 34 insertions(+), 17 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 33871c64..86101023 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
@@ -32,6 +32,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 调查问卷-答案表
@@ -67,7 +68,31 @@ public class TingKeStatisticsController{
         QueryWrapper<KcEvaluation> queryWrapper = QueryGenerator.initQueryWrapper(evaluation, req.getParameterMap());
         queryWrapper.isNotNull("upuserid");
         queryWrapper.isNotNull("minkcid");
-        Page<KcEvaluation> page = new Page<KcEvaluation>(pageNo, pageSize);
+
+        List<KcXqxnHistory> kcXqxnHistoryList = kcXqxnHistoryService.list();
+        //查询所在单位
+        List<Xxhbuser> szdwList =  xxhbuserService.list();
+        Map<String, Xxhbuser> szdwMap = Maps.newHashMap();
+        szdwList.forEach(x -> {
+            szdwMap.put(x.getGh(),x);
+        });
+
+        //补充搜索
+        if(StringUtils.isNotBlank(evaluation.getXqxn())){
+            List<KcXqxnHistory> 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());
+            }
+        }
+        if(StringUtils.isNotBlank(evaluation.getDwmc())){
+            List<Xxhbuser> xxhbuserList = szdwList.stream().filter(x -> StringUtils.equals(x.getDwh(),evaluation.getDwmc())).collect(Collectors.toList());
+            Set<String> ghSet = xxhbuserList.stream().map(x -> x.getGh()).collect(Collectors.toSet());
+            queryWrapper.in("upuserid",ghSet);
+        }
+
+        Page<KcEvaluation> page = new Page<>(pageNo, pageSize);
         IPage<KcEvaluation> pageList = kcEvaluationService.page(page, queryWrapper);
 
         //---------------------补数据1------------------------------------------
@@ -87,19 +112,11 @@ public class TingKeStatisticsController{
             String xuserId = String.valueOf(ixuserId);
             tjSet.add(xuserId);
         });
+
+        if(tjSet.isEmpty()){
+            return Result.OK(new Page<>());
+        }
         //---------------------补数据2------------------------------------------
-        //查询所在单位
-        QueryWrapper<Xxhbuser> szdwQw = new QueryWrapper<>();
-        szdwQw.in("gh",tjSet);
-        List<Xxhbuser> szdwList =  xxhbuserService.list(szdwQw);
-        Map<String, Xxhbuser> szdwMap = Maps.newHashMap();
-        szdwList.forEach(x -> {
-            szdwMap.put(x.getGh(),x);
-        });
-
-
-//      QueryWrapper<KcXqxnHistory> kcXqxnHistoryQueryWrapper = new QueryWrapper<KcXqxnHistory>();
-        List<KcXqxnHistory> kcXqxnHistoryList = kcXqxnHistoryService.list();
 
         //查询听课身份
         QueryWrapper<KcTksfrzb> tksfQw = new QueryWrapper<>();
diff --git a/pom.xml b/pom.xml
index ef523826..a98c0338 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,10 +138,10 @@
 			<artifactId>pegdown</artifactId>
 			<version>${pegdown.version}</version>
 		</dependency>
-        <dependency>
-            <groupId>org.jeecgframework.boot</groupId>
-            <artifactId>jeecg-boot-base-core</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.jeecgframework.boot</groupId>-->
+<!--            <artifactId>jeecg-boot-base-core</artifactId>-->
+<!--        </dependency>-->
 
     </dependencies>