diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/KcExportConfigTpkwcqkjzglxMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/KcExportConfigTpkwcqkjzglxMapper.java index 12cbb395..a7febdbe 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/KcExportConfigTpkwcqkjzglxMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/KcExportConfigTpkwcqkjzglxMapper.java @@ -40,4 +40,8 @@ public interface KcExportConfigTpkwcqkjzglxMapper extends BaseMapper getListQtzrjsChar(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx1); List getListByCodeXytktj(KcExportConfigTpkwcqkjzglxXytktj kcExportConfigTpkwcqkjzglxXytktj); + + KcExportConfigTpkwcqkjzglx getDqxqtjlist(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx); + + List getBxqSaveList(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/xml/KcExportConfigTpkwcqkjzglxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/xml/KcExportConfigTpkwcqkjzglxMapper.xml index 5363e5ea..a06a1bc0 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/xml/KcExportConfigTpkwcqkjzglxMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/xml/KcExportConfigTpkwcqkjzglxMapper.xml @@ -249,4 +249,34 @@ + + + + + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/IKcExportConfigTpkwcqkjzglxService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/IKcExportConfigTpkwcqkjzglxService.java index 1f18c023..f8d00d2a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/IKcExportConfigTpkwcqkjzglxService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/IKcExportConfigTpkwcqkjzglxService.java @@ -39,4 +39,7 @@ public interface IKcExportConfigTpkwcqkjzglxService extends IService getListQtzrjsChar(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx); List getListByCodeXytktj(QueryWrapper queryWrapper,KcExportConfigTpkwcqkjzglxXytktj KcExportConfigTpkwcqkjzglxXytktj); + + //获取是否有本学期数据 + List getSfybxqsj(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/impl/KcExportConfigTpkwcqkjzglxServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/impl/KcExportConfigTpkwcqkjzglxServiceImpl.java index 2be8a5ca..79b5797a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/impl/KcExportConfigTpkwcqkjzglxServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/impl/KcExportConfigTpkwcqkjzglxServiceImpl.java @@ -18,6 +18,7 @@ import org.jeecg.modules.kc.grab.imports.service.IXxhbuserService; import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig; import org.jeecg.modules.kc.kcSysConfig.service.IKcSysConfigService; import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory; +import org.jeecg.modules.kc.kcXqxnHistory.service.IKcXqxnHistoryService; import org.jeecg.modules.kc.tksf.kctksfyq.entity.KcTksfyq; import org.jeecg.modules.kc.tksf.kctksfyq.service.IKcTksfyqService; import org.jeecg.modules.system.service.impl.SysBaseApiImpl; @@ -51,6 +52,9 @@ public class KcExportConfigTpkwcqkjzglxServiceImpl extends ServiceImpl infolist = baseMapper.getListByCodeXytktj(kcExportConfigTpkwcqkjzglxXytktj); return infolist; } + + @Override + public List getSfybxqsj() { + try { + QueryWrapper kcXqxnHistoryQueryWrapper = new QueryWrapper<>(); + kcXqxnHistoryQueryWrapper.orderByDesc("start_time"); + List historyList = kcXqxnHistoryService.list(kcXqxnHistoryQueryWrapper); + String dqxq = historyList.get(0).getTitle(); + + KcExportConfigTpkwcqkjzglx KcExportConfigTpkwcqkjzglx = new KcExportConfigTpkwcqkjzglx(); + KcExportConfigTpkwcqkjzglx.setXqxn(dqxq); + KcExportConfigTpkwcqkjzglx tjsj =baseMapper.getDqxqtjlist(KcExportConfigTpkwcqkjzglx); + String znum = tjsj.getZnum(); + if(StringUtils.equals("0",znum)){ + String syxq = historyList.get(1).getTitle();//上一学期 + //获取本学期新增数据 + KcExportConfigTpkwcqkjzglx.setType(syxq); + List savelist = baseMapper.getBxqSaveList(KcExportConfigTpkwcqkjzglx); + return savelist; + } + }catch (Exception e) { + e.printStackTrace(); + } + return null; + } } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcktStat.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcktStat.java index 33e06350..b367f726 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcktStat.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcktStat.java @@ -73,6 +73,7 @@ public class SyncKcktStat extends BaseSync { //-----------------修改课程表数据------------------------ KcKechengbiao kcKechengbiao = new KcKechengbiao(); kcKechengbiao.setXqxn(kcSysConfig.getFlag1()); + kcKechengbiao.setSkjs("刘婷"); List kckblist = kcKechengbiaoService.getKechengbiaoList(kcKechengbiao); for(KcKechengbiao KcKechengbiaoPar:kckblist){ QueryWrapper kcKechengbiaoQueryWrapper = new QueryWrapper<>(); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJzgXskc.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJzgXskc.java index 6cb3521a..556387e0 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJzgXskc.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJzgXskc.java @@ -64,6 +64,10 @@ public class SyncTJzgXskc extends BaseSync { * @param param */ public void run(Map param){ + + + + //查询数据 List inDataList = expService.list(); List outDataList = Lists.newArrayList(); @@ -77,6 +81,7 @@ public class SyncTJzgXskc extends BaseSync { //清洗数据 inDataList.forEach(x -> { String timestamps = DateUtil.format(x.getTimestamps(), DatePattern.NORM_DATETIME_PATTERN); + String gh = x.getGh(); outDataList.add(BeanUtil.toBean(x, Xxhbxskc.class)); Xxhbuser outUserData = BeanUtil.toBean(x, Xxhbuser.class); outUserData.setTimestamps(timestamps); @@ -186,22 +191,36 @@ public class SyncTJzgXskc extends BaseSync { if(saveList != null){ - try { - exportConfigTpkwcqkjzglxService.saveBatch(saveList); - }catch (Exception e){ - e.printStackTrace(); - errorMessage = e.getMessage(); - } - Xxhbsynclog updateLog = new Xxhbsynclog(); - updateLog.setSyncRowNum(String.valueOf(outDataList.size())); - updateLog.setOratabname("T_JZG_XSKC-清洗至kc_export_config_tpkwcqkjzglx，新增数据");//oracle表名 - updateLog.setOratabnum(inDataList.size());//oracle表数量 - updateLog.setTablenum(0);//mysql表数量 - updateLog.setSyncnum(saveList.size());//本次同步数据量 - updateLog.setSynctype("0");//同步类型 0全量 1增量 - updateLog.setErrormessage(errorMessage); - saveLog(xxhbsynclog,Xxhbxskc.class); + List listA = exportConfigTpkwcqkjzglxService.getSfybxqsj(); + if(listA != null){ + exportConfigTpkwcqkjzglxService.saveBatch(listA); + Xxhbsynclog updateLog = new Xxhbsynclog(); + updateLog.setSyncRowNum(String.valueOf(listA.size())); + updateLog.setOratabname("T_JZG_XSKC-清洗至kc_export_config_tpkwcqkjzglx，新增数据");//oracle表名 + updateLog.setOratabnum(listA.size());//oracle表数量 + updateLog.setTablenum(0);//mysql表数量 + updateLog.setSyncnum(listA.size());//本次同步数据量 + updateLog.setSynctype("0");//同步类型 0全量 1增量 + updateLog.setErrormessage(errorMessage); + saveLog(xxhbsynclog,Xxhbxskc.class); + }else{ + try { + exportConfigTpkwcqkjzglxService.saveBatch(saveList); + }catch (Exception e){ + e.printStackTrace(); + errorMessage = e.getMessage(); + } + Xxhbsynclog updateLog = new Xxhbsynclog(); + updateLog.setSyncRowNum(String.valueOf(outDataList.size())); + updateLog.setOratabname("T_JZG_XSKC-清洗至kc_export_config_tpkwcqkjzglx，新增数据");//oracle表名 + updateLog.setOratabnum(inDataList.size());//oracle表数量 + updateLog.setTablenum(0);//mysql表数量 + updateLog.setSyncnum(saveList.size());//本次同步数据量 + updateLog.setSynctype("0");//同步类型 0全量 1增量 + updateLog.setErrormessage(errorMessage); + saveLog(xxhbsynclog,Xxhbxskc.class); + } } } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcJiaoshirongliangController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcJiaoshirongliangController.java index 3315e1bd..562751b0 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcJiaoshirongliangController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcJiaoshirongliangController.java @@ -66,6 +66,9 @@ public class KcJiaoshirongliangController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(kcJiaoshirongliang, req.getParameterMap()); + queryWrapper.orderByAsc("jzwmc"); + queryWrapper.orderByAsc("lc"); + queryWrapper.orderByAsc("jsmc"); Page page = new Page(pageNo, pageSize); IPage pageList = kcJiaoshirongliangService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml index b84ace07..3207d532 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml @@ -78,6 +78,10 @@ ELSE '' END as xq, jgh,xnxq,jzglb,1 as sfcj,sfxsk as skxs,'' as sfzc,'' as bz,'' as zt,kcdl,#{xqxn} as xqxn from xxhbkckb t,kc_jieci jc where concat(substring(sksj,2,2),'、',substring(sksj,4,2)) = jc.jieci and t.kcdl != '毕业设计' and (t.jgh is not null or t.JKZC is not null) + + and t.xm =#{skjs} + +