From 740d91482f4a6a19bcb5a47cd5c71aa404171ba7 Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Tue, 20 Jun 2023 01:29:01 +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=E5=90=8D=E7=A7=B0=E6=9D=A5=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/ChangeTingKeTongJi.java             | 35 ++++---------------
 1 file changed, 6 insertions(+), 29 deletions(-)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/tools/ChangeTingKeTongJi.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/tools/ChangeTingKeTongJi.java
index 8574fcb3..68149935 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/tools/ChangeTingKeTongJi.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/tools/ChangeTingKeTongJi.java
@@ -55,11 +55,6 @@ public class ChangeTingKeTongJi {
     @Autowired
     private IKcTingkeService kcTingkeService;
 
-    @Autowired
-    private IKcCasusersService kcCasusersService;
-
-
-
     public KcXqxnHistory getXqConfig(){
         return getXqConfig(null);
     }
@@ -182,15 +177,6 @@ public class ChangeTingKeTongJi {
                 }
             });
 
-            //查询casUser
-            QueryWrapper<KcCasusers> casuserQw = new QueryWrapper<>();
-            //casuserQw.in("gh",tjSet);
-            List<KcCasusers> casuserList =  kcCasusersService.list(casuserQw);
-            Map<String, KcCasusers> casuserMap = Maps.newHashMap();
-            casuserList.forEach(x -> {
-                casuserMap.put(x.getUser(),x);
-            });
-
             //删除已有听课数据重新生成
             QueryWrapper<KcTkcstj> tjQw = new QueryWrapper<>();
             tjQw.eq(StringUtils.isNotBlank(userId),"jgh",userId);
@@ -235,10 +221,10 @@ public class ChangeTingKeTongJi {
                     tj.setYskcs(currentData.getTkyq());
                 }
                 if(StringUtils.isBlank(tj.getJsxm())){//补充教师姓名
-                    if(casuserMap.containsKey(xuserId)){
-                        KcCasusers casuser = casuserMap.get(xuserId);
+                    if(szdwMap.containsKey(xuserId)){
+                        Xxhbuser casuser = szdwMap.get(xuserId);
                         if(casuser != null) {
-                            tj.setJsxm(casuser.getCn());
+                            tj.setJsxm(casuser.getXm());
                         }
                     }
                 }
@@ -343,15 +329,6 @@ public class ChangeTingKeTongJi {
             }
         });
 
-        //查询casUser
-        QueryWrapper<KcCasusers> casuserQw = new QueryWrapper<>();
-        casuserQw.eq("user",userId);
-        List<KcCasusers> casuserList =  kcCasusersService.list(casuserQw);
-        Map<String, KcCasusers> casuserMap = Maps.newHashMap();
-        casuserList.forEach(x -> {
-            casuserMap.put(x.getUser(),x);
-        });
-
         //组合数据
         KcTingke kcTingke = new KcTingke();
         kcTingke.setTingketime(DateUtil.format(tkSj, DatePattern.NORM_DATETIME_FORMAT));
@@ -380,10 +357,10 @@ public class ChangeTingKeTongJi {
             }
         }
         if(StringUtils.isBlank(kcTingke.getJsxm())){//补充教师姓名
-            if(casuserMap.containsKey(userId)){
-                KcCasusers casuser = casuserMap.get(userId);
+            if(szdwMap.containsKey(userId)){
+                Xxhbuser casuser = szdwMap.get(userId);
                 if(casuser != null) {
-                    kcTingke.setJsxm(casuser.getCn());
+                    kcTingke.setJsxm(casuser.getXm());
                 }
             }
         }