2023年6月20日 修改名称来源
This commit is contained in:
parent
f65ee31cd0
commit
740d91482f
|
@ -55,11 +55,6 @@ public class ChangeTingKeTongJi {
|
||||||
@Autowired
|
@Autowired
|
||||||
private IKcTingkeService kcTingkeService;
|
private IKcTingkeService kcTingkeService;
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private IKcCasusersService kcCasusersService;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public KcXqxnHistory getXqConfig(){
|
public KcXqxnHistory getXqConfig(){
|
||||||
return getXqConfig(null);
|
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<>();
|
QueryWrapper<KcTkcstj> tjQw = new QueryWrapper<>();
|
||||||
tjQw.eq(StringUtils.isNotBlank(userId),"jgh",userId);
|
tjQw.eq(StringUtils.isNotBlank(userId),"jgh",userId);
|
||||||
|
@ -235,10 +221,10 @@ public class ChangeTingKeTongJi {
|
||||||
tj.setYskcs(currentData.getTkyq());
|
tj.setYskcs(currentData.getTkyq());
|
||||||
}
|
}
|
||||||
if(StringUtils.isBlank(tj.getJsxm())){//补充教师姓名
|
if(StringUtils.isBlank(tj.getJsxm())){//补充教师姓名
|
||||||
if(casuserMap.containsKey(xuserId)){
|
if(szdwMap.containsKey(xuserId)){
|
||||||
KcCasusers casuser = casuserMap.get(xuserId);
|
Xxhbuser casuser = szdwMap.get(xuserId);
|
||||||
if(casuser != null) {
|
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 kcTingke = new KcTingke();
|
||||||
kcTingke.setTingketime(DateUtil.format(tkSj, DatePattern.NORM_DATETIME_FORMAT));
|
kcTingke.setTingketime(DateUtil.format(tkSj, DatePattern.NORM_DATETIME_FORMAT));
|
||||||
|
@ -380,10 +357,10 @@ public class ChangeTingKeTongJi {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(StringUtils.isBlank(kcTingke.getJsxm())){//补充教师姓名
|
if(StringUtils.isBlank(kcTingke.getJsxm())){//补充教师姓名
|
||||||
if(casuserMap.containsKey(userId)){
|
if(szdwMap.containsKey(userId)){
|
||||||
KcCasusers casuser = casuserMap.get(userId);
|
Xxhbuser casuser = szdwMap.get(userId);
|
||||||
if(casuser != null) {
|
if(casuser != null) {
|
||||||
kcTingke.setJsxm(casuser.getCn());
|
kcTingke.setJsxm(casuser.getXm());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue