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 casuserQw = new QueryWrapper<>(); - //casuserQw.in("gh",tjSet); - List casuserList = kcCasusersService.list(casuserQw); - Map casuserMap = Maps.newHashMap(); - casuserList.forEach(x -> { - casuserMap.put(x.getUser(),x); - }); - //删除已有听课数据重新生成 QueryWrapper 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 casuserQw = new QueryWrapper<>(); - casuserQw.eq("user",userId); - List casuserList = kcCasusersService.list(casuserQw); - Map 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()); } } }