From f65ee31cd03434c5b3868545660b65f9ed538138 Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Tue, 20 Jun 2023 01:21:33 +0800 Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B46=E6=9C=8820=E6=97=A5=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=94=99=E8=AF=AF=E7=9A=84=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SyncTFwdtShryxx.java | 7 +-- .../tools/ChangeTingKeTongJi.java | 46 ++++++++++++++++++- 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtShryxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtShryxx.java index 650ed40b..9de9d00b 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtShryxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtShryxx.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.compress.utils.Lists; +import org.apache.commons.lang.StringUtils; import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; import org.jeecg.modules.kc.grab.exports.entity.TFwdtShryxx; import org.jeecg.modules.kc.grab.exports.service.ITFwdtShryxxService; @@ -61,9 +62,9 @@ public class SyncTFwdtShryxx extends BaseSync { outDataList.add(BeanUtil.toBean(x, Xxhbshryxx.class)); if(whiteList.contains(x.getZwmc())){ KcTksfrzb y = new KcTksfrzb(); - y.setGh(x.getGh()); - y.setXm(x.getXm()); - y.setZwmc(x.getZwmc()); + y.setGh(StringUtils.trim(x.getGh())); + y.setXm(StringUtils.trim(x.getXm())); + y.setZwmc(StringUtils.trim(x.getZwmc())); y.setFlag("2"); saveList.add(y); } 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 44afc3ec..8574fcb3 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 @@ -12,6 +12,8 @@ import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang.StringUtils; import org.jeecg.modules.kc.grab.imports.entity.Xxhbuser; import org.jeecg.modules.kc.grab.imports.service.IXxhbuserService; +import org.jeecg.modules.kc.kcCasusers.entity.KcCasusers; +import org.jeecg.modules.kc.kcCasusers.service.IKcCasusersService; import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig; import org.jeecg.modules.kc.kcSysConfig.service.IKcSysConfigService; import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory; @@ -53,6 +55,9 @@ public class ChangeTingKeTongJi { @Autowired private IKcTingkeService kcTingkeService; + @Autowired + private IKcCasusersService kcCasusersService; + public KcXqxnHistory getXqConfig(){ @@ -161,7 +166,7 @@ public class ChangeTingKeTongJi { String currentTkyq = currentData.getTkyq(); if(StringUtils.isNotBlank(currentTkyq)){ int tkyq = Integer.parseInt(currentTkyq); - int xtkyq = Integer.parseInt(x.getTkyq()); + int xtkyq = Integer.parseInt(StringUtils.defaultString(x.getTkyq(),"0")); x.setZwmc(currentZwmc + "、" + x.getZwmc()); if(tkyq > xtkyq){ x.setTkyq(String.valueOf(tkyq)); @@ -177,6 +182,15 @@ 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); @@ -220,6 +234,14 @@ public class ChangeTingKeTongJi { tj.setTksf(currentData.getZwmc()); tj.setYskcs(currentData.getTkyq()); } + if(StringUtils.isBlank(tj.getJsxm())){//补充教师姓名 + if(casuserMap.containsKey(xuserId)){ + KcCasusers casuser = casuserMap.get(xuserId); + if(casuser != null) { + tj.setJsxm(casuser.getCn()); + } + } + } tj.setTkxttj(String.valueOf(x.getPkNum())); addTjList.add(tj); }); @@ -305,13 +327,15 @@ public class ChangeTingKeTongJi { String currentTkyq = currentData.getTkyq(); if(StringUtils.isNotBlank(currentTkyq)){ int tkyq = Integer.parseInt(currentTkyq); - int xtkyq = Integer.parseInt(x.getTkyq()); + int xtkyq = Integer.parseInt(StringUtils.defaultString(x.getTkyq(),"0")); x.setZwmc(currentZwmc + "、" + x.getZwmc()); if(tkyq > xtkyq){ x.setTkyq(String.valueOf(tkyq)); }else{ x.setTkyq(String.valueOf(xtkyq)); } + }else{ + x.setZwmc(currentZwmc + "、" + x.getZwmc()); } tksfMap.put(x.getGh(),x); }else { @@ -319,6 +343,15 @@ 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)); @@ -346,6 +379,15 @@ public class ChangeTingKeTongJi { } } } + if(StringUtils.isBlank(kcTingke.getJsxm())){//补充教师姓名 + if(casuserMap.containsKey(userId)){ + KcCasusers casuser = casuserMap.get(userId); + if(casuser != null) { + kcTingke.setJsxm(casuser.getCn()); + } + } + } + kcTingkeService.save(kcTingke);