From 98e02eaf251f2b34b448ccfebedb640afbb07a4a Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Sun, 18 Jun 2023 19:23:44 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B46=E6=9C=8818=E6=97=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=90=8C=E6=AD=A5=E5=92=8C=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SyncTFwdtBkjxtkpj.java                    | 26 ++++++++++++++++++-
 .../TingKeStatisticsController.java           | 18 +++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtBkjxtkpj.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtBkjxtkpj.java
index f30fdae6..bb6f399d 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtBkjxtkpj.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtBkjxtkpj.java
@@ -1,9 +1,12 @@
 package org.jeecg.modules.kc.grab.SynchronizationService;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.compress.utils.Lists;
+import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync;
 import org.jeecg.modules.kc.grab.exports.entity.TFwdtBkjxtkpj;
@@ -66,6 +69,25 @@ public class SyncTFwdtBkjxtkpj extends BaseSync {
      */
     public void run(Map<String, Object> param){
 
+        DateTime now = DateUtil.date();
+
+        boolean isAll = false;
+        if(param != null){
+            if(param.containsKey("isAll")){
+                String isAllStr = (String)param.get("isAll");
+                if(StringUtils.isNotBlank(isAllStr)){
+                    isAll = Boolean.parseBoolean(isAllStr);
+                }
+            }
+//            if(param.containsKey("nowDay")){
+//                String nowDayStr = (String)param.get("nowDay");
+//                if(StringUtils.isNotBlank(nowDayStr)){
+//                    now = DateUtil.parse(nowDayStr, "yyyy-MM-dd");
+//                }
+//            }
+
+        }
+
 
         //查询数据
         Date date = new Date();//获取当前时间
@@ -74,7 +96,9 @@ public class SyncTFwdtBkjxtkpj extends BaseSync {
         calendar.add(Calendar.DAY_OF_MONTH, -1);//当前时间前去一天
         QueryWrapper<TFwdtBkjxtkpj> queryWrapper = new QueryWrapper<>();
 //        queryWrapper.like("timestamps", DateUtils.formatDate(calendar.getTime(),"yyyy-MM-dd"));//增量数据
-        queryWrapper.apply("trunc(timestamps,'dd') = to_date('"+DateUtils.formatDate(calendar.getTime(),"yyyy-MM-dd")+"','yyyy-mm-dd')");
+        if(!isAll){
+            queryWrapper.apply("trunc(timestamps,'dd') = to_date('"+DateUtils.formatDate(calendar.getTime(),"yyyy-MM-dd")+"','yyyy-mm-dd')");
+        }
         List<TFwdtBkjxtkpj> inDataList = tfwdtBkjxtkpjService.list(queryWrapper);
         List<Xxhbbkjxtkpj> outDataList = Lists.newArrayList();
 
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 c775e9cd..37bbee73 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
@@ -110,12 +110,20 @@ public class TingKeStatisticsController {
         sourceDictMap.put(1,"老系统");
         sourceDictMap.put(2,"服务大厅");
         sourceDictMap.put(3,"线下纸质");
+        Map<String,String> pjlblxMap = Maps.newHashMap();
+        //0：门户添加，1：老系统，2：政务大厅，3后台导入
+//		 sourceDictMap.put(0,"课程中心");
+//		 sourceDictMap.put(1,"老系统");
+        pjlblxMap.put("2","线上课堂评价表");
+        pjlblxMap.put("3","听课记录表");
+        pjlblxMap.put("4","同行评价表");
         //---------------------补数据1------------------------------------------
 
         Set<String> tjSet = Sets.newHashSet();
         pageList.getRecords().forEach(x -> {
             //补充信息
             x.setSourceName(sourceDictMap.get(x.getSource()));//数据来源
+            x.setPjlblx(pjlblxMap.get(x.getPjlblx()));
             Integer ixuserId = x.getUpuserid();
             String xuserId = String.valueOf(ixuserId);
             tjSet.add(xuserId);
@@ -224,12 +232,22 @@ public class TingKeStatisticsController {
         sourceDictMap.put(1,"老系统");
         sourceDictMap.put(2,"服务大厅");
         sourceDictMap.put(3,"线下纸质");
+
+        Map<String,String> pjlblxMap = Maps.newHashMap();
+        //0：门户添加，1：老系统，2：政务大厅，3后台导入
+//		 sourceDictMap.put(0,"课程中心");
+//		 sourceDictMap.put(1,"老系统");
+        pjlblxMap.put("2","线上课堂评价表");
+        pjlblxMap.put("3","听课记录表");
+        pjlblxMap.put("4","同行评价表");
+
         //---------------------补数据1------------------------------------------
 
         Set<String> tjSet = Sets.newHashSet();
         pageList.getRecords().forEach(x -> {
             //补充信息
             x.setSourceName(sourceDictMap.get(x.getSource()));//数据来源
+            x.setPjlblx(pjlblxMap.get(x.getPjlblx()));
             Integer ixuserId = x.getUpuserid();
             String xuserId = String.valueOf(ixuserId);
             tjSet.add(xuserId);