From 022482ac239f57afd8dae4c7b430729e8fba81a3 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Fri, 9 Jun 2023 22:13:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../grab/SynchronizationService/SyncTBks.java | 19 ++++++++-- .../grab/SynchronizationService/SyncTDw.java | 19 ++++++++-- .../SyncTFwdtShryxx.java | 36 ++++++++++++++++--- .../SyncTJwJsjbxxb.java | 23 ++++++++++-- .../SyncTJwJxljbxxb.java | 25 +++++++++---- .../SynchronizationService/SyncTJwKcapzb.java | 23 ++++++++++-- .../SynchronizationService/SyncTJwKckb.java | 21 +++++++++-- .../SynchronizationService/SyncTJwKcxxb.java | 21 +++++++++-- .../SynchronizationService/SyncTJwTkkcb.java | 23 ++++++++++-- .../SynchronizationService/SyncTJwTkxx.java | 22 ++++++++++-- .../SynchronizationService/SyncTJwXsxkb.java | 22 ++++++++++-- .../SynchronizationService/SyncTZzbLdxx.java | 19 ++++++++-- .../kc/grab/imports/entity/Xxhbbks.java | 4 +++ .../kc/grab/imports/entity/Xxhbdw.java | 8 ++--- .../kc/grab/imports/entity/Xxhbjsjbxx.java | 10 +++--- .../kc/grab/imports/entity/Xxhbjxljbxx.java | 9 ++--- .../kc/grab/imports/entity/Xxhbkcapzb.java | 9 ++--- .../kc/grab/imports/entity/Xxhbkckb.java | 9 ++--- .../kc/grab/imports/entity/Xxhbkcxxb.java | 9 ++--- .../kc/grab/imports/entity/Xxhbldxx.java | 9 ++--- .../kc/grab/imports/entity/Xxhbshryxx.java | 5 +++ .../kc/grab/imports/entity/Xxhbsynclog.java | 9 +++++ .../kc/grab/imports/entity/Xxhbtkkcb.java | 9 ++--- .../kc/grab/imports/entity/Xxhbtkxx.java | 8 ++--- .../kc/grab/imports/entity/Xxhbxsxkb.java | 9 ++--- .../kc/grab/imports/mapper/XxhbbksMapper.java | 1 + .../kc/grab/imports/mapper/XxhbdwMapper.java | 1 + .../grab/imports/mapper/XxhbjsjbxxMapper.java | 1 + .../imports/mapper/XxhbjxljbxxMapper.java | 1 + .../grab/imports/mapper/XxhbkcapzbMapper.java | 1 + .../grab/imports/mapper/XxhbkckbMapper.java | 1 + .../grab/imports/mapper/XxhbkcxxbMapper.java | 1 + .../grab/imports/mapper/XxhbldxxMapper.java | 1 + .../grab/imports/mapper/XxhbshryxxMapper.java | 1 + .../grab/imports/mapper/XxhbtkkcbMapper.java | 1 + .../grab/imports/mapper/XxhbtkxxMapper.java | 2 ++ .../grab/imports/mapper/XxhbxsxkbMapper.java | 1 + .../grab/imports/mapper/xml/XxhbbksMapper.xml | 3 ++ .../grab/imports/mapper/xml/XxhbdwMapper.xml | 3 ++ .../imports/mapper/xml/XxhbjsjbxxMapper.xml | 3 ++ .../imports/mapper/xml/XxhbjxljbxxMapper.xml | 3 ++ .../imports/mapper/xml/XxhbkcapzbMapper.xml | 3 ++ .../imports/mapper/xml/XxhbkckbMapper.xml | 3 ++ .../imports/mapper/xml/XxhbkcxxbMapper.xml | 3 ++ .../imports/mapper/xml/XxhbldxxMapper.xml | 3 ++ .../imports/mapper/xml/XxhbshryxxMapper.xml | 3 ++ .../imports/mapper/xml/XxhbtkkcbMapper.xml | 3 ++ .../imports/mapper/xml/XxhbtkxxMapper.xml | 5 +++ .../imports/mapper/xml/XxhbxsxkbMapper.xml | 3 ++ .../grab/imports/service/IXxhbbksService.java | 1 + .../grab/imports/service/IXxhbdwService.java | 1 + .../imports/service/IXxhbjsjbxxService.java | 2 ++ .../imports/service/IXxhbjxljbxxService.java | 2 ++ .../imports/service/IXxhbkcapzbService.java | 1 + .../imports/service/IXxhbkckbService.java | 1 + .../imports/service/IXxhbkcxxbService.java | 1 + .../imports/service/IXxhbldxxService.java | 1 + .../imports/service/IXxhbshryxxService.java | 1 + .../imports/service/IXxhbtkkcbService.java | 1 + .../imports/service/IXxhbtkxxService.java | 1 + .../imports/service/IXxhbxsxkbService.java | 2 ++ .../service/impl/XxhbbksServiceImpl.java | 5 +++ .../service/impl/XxhbdwServiceImpl.java | 5 +++ .../service/impl/XxhbjsjbxxServiceImpl.java | 5 +++ .../service/impl/XxhbjxljbxxServiceImpl.java | 5 +++ .../service/impl/XxhbkcapzbServiceImpl.java | 5 +++ .../service/impl/XxhbkckbServiceImpl.java | 5 +++ .../service/impl/XxhbkcxxbServiceImpl.java | 5 +++ .../service/impl/XxhbldxxServiceImpl.java | 5 +++ .../service/impl/XxhbshryxxServiceImpl.java | 5 +++ .../service/impl/XxhbtkkcbServiceImpl.java | 5 +++ .../service/impl/XxhbtkxxServiceImpl.java | 5 +++ .../service/impl/XxhbxsxkbServiceImpl.java | 5 +++ .../controller/KcZzYbtkbController.java | 2 +- .../tktj/controller/KcTingkeController.java | 10 ++++++ .../kc/tktj/mapper/KcTingkeMapper.java | 2 ++ .../kc/tktj/mapper/xml/KcTingkeMapper.xml | 9 +++++ .../kc/tktj/service/IKcTingkeService.java | 2 ++ .../service/impl/KcTingkeServiceImpl.java | 5 +++ 79 files changed, 460 insertions(+), 76 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTBks.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTBks.java index bacc37e1..85ed32fb 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTBks.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTBks.java @@ -49,10 +49,25 @@ public class SyncTBks extends BaseSync { inDataList.forEach(x -> outDataList.add(BeanUtil.toBean(x, Xxhbbks.class))); //保存到胃 - xxhbbksService.syncList(outDataList); - + int syncnum=0; + String errorMessage = ""; + try { + xxhbbksService.syncList(outDataList); + syncnum = outDataList.size(); + }catch (Exception e){ + e.printStackTrace(); + errorMessage = e.getMessage(); + } + Xxhbbks xxhbbks = xxhbbksService.getSumnum(); + int mysqlnum=xxhbbks.getMysqlnum(); Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size())); + xxhbsynclog.setOratabname("T_BKS");//oracle表名 + xxhbsynclog.setOratabnum(inDataList.size());//oracle表数量 + xxhbsynclog.setTablenum(mysqlnum);//mysql表数量 + xxhbsynclog.setSyncnum(syncnum);//本次同步数据量 + xxhbsynclog.setSynctype("0");//同步类型 0全量 1增量 + xxhbsynclog.setErrormessage(errorMessage); saveLog(xxhbsynclog,Xxhbbks.class); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTDw.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTDw.java index 71e5a11e..6159f87c 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTDw.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTDw.java @@ -51,10 +51,25 @@ public class SyncTDw extends BaseSync { inDataList.forEach(x -> outDataList.add(BeanUtil.toBean(x, Xxhbdw.class))); //保存到胃 - impService.syncList(outDataList); - + int syncnum=0; + String errorMessage = ""; + try { + impService.syncList(outDataList); + syncnum = outDataList.size(); + }catch (Exception e){ + e.printStackTrace(); + errorMessage = e.getMessage(); + } + Xxhbdw xxhbdw = impService.getSumnum(); + int mysqlnum=xxhbdw.getMysqlnum(); Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size())); + xxhbsynclog.setOratabname("T_DW");//oracle表名 + xxhbsynclog.setOratabnum(inDataList.size());//oracle表数量 + xxhbsynclog.setTablenum(mysqlnum);//mysql表数量 + xxhbsynclog.setSyncnum(syncnum);//本次同步数据量 + xxhbsynclog.setSynctype("0");//同步类型 0全量 1增量 + xxhbsynclog.setErrormessage(errorMessage); saveLog(xxhbsynclog,Xxhbdw.class); } 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 94b7059a..fd0bab0b 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 @@ -7,6 +7,7 @@ import org.apache.commons.compress.utils.Lists; 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; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks; import org.jeecg.modules.kc.grab.imports.entity.Xxhbshryxx; import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog; import org.jeecg.modules.kc.grab.imports.service.IXxhbshryxxService; @@ -69,7 +70,34 @@ public class SyncTFwdtShryxx extends BaseSync { }); //保存到胃 - impService.syncList(outDataList); + + //保存到胃 + int syncnum=0; + String errorMessage = ""; + try { + impService.syncList(outDataList); + syncnum = outDataList.size(); + }catch (Exception e){ + e.printStackTrace(); + errorMessage = e.getMessage(); + } + Xxhbshryxx xxhbshryxx = impService.getSumnum(); + int mysqlnum=xxhbshryxx.getMysqlnum(); + Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); + xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size())); + xxhbsynclog.setOratabname("t_fwdt_shryxx");//oracle表名 + xxhbsynclog.setOratabnum(inDataList.size());//oracle表数量 + xxhbsynclog.setTablenum(mysqlnum);//mysql表数量 + xxhbsynclog.setSyncnum(syncnum);//本次同步数据量 + xxhbsynclog.setSynctype("0");//同步类型 0全量 1增量 + xxhbsynclog.setErrormessage(errorMessage); + saveLog(xxhbsynclog,Xxhbshryxx.class); + + + + + + //删除旧数据 QueryWrapper rqw = new QueryWrapper<>(); @@ -78,9 +106,9 @@ public class SyncTFwdtShryxx extends BaseSync { kcTksfrzbService.saveBatch(saveList); - Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); - xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size())); - saveLog(xxhbsynclog, Xxhbshryxx.class); +// Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); +// xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size())); +// saveLog(xxhbsynclog, Xxhbshryxx.class); } /** diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwJsjbxxb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwJsjbxxb.java index 567af89a..2124a04b 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwJsjbxxb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwJsjbxxb.java @@ -8,6 +8,7 @@ import org.jeecg.modules.kc.grab.exports.entity.TJwJsjbxx; import org.jeecg.modules.kc.grab.exports.entity.TJwKckb; import org.jeecg.modules.kc.grab.exports.service.ITJwJsjbxxService; import org.jeecg.modules.kc.grab.exports.service.ITJwKckbService; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks; import org.jeecg.modules.kc.grab.imports.entity.Xxhbjsjbxx; import org.jeecg.modules.kc.grab.imports.entity.Xxhbkckb; import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog; @@ -52,12 +53,28 @@ public class SyncTJwJsjbxxb extends BaseSync { //清洗数据 inDataList.forEach(x -> outDataList.add(BeanUtil.toBean(x, Xxhbjsjbxx.class))); - //保存到胃 - impService.syncList(outDataList); + //保存到胃 + int syncnum=0; + String errorMessage = ""; + try { + impService.syncList(outDataList); + syncnum = outDataList.size(); + }catch (Exception e){ + e.printStackTrace(); + errorMessage = e.getMessage(); + } + Xxhbjsjbxx Xxhbjsjbxx = impService.getSumnum(); + int mysqlnum=Xxhbjsjbxx.getMysqlnum(); Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size())); - saveLog(xxhbsynclog, Xxhbkckb.class); + xxhbsynclog.setOratabname("TJwJsjbxx");//oracle表名 + xxhbsynclog.setOratabnum(inDataList.size());//oracle表数量 + xxhbsynclog.setTablenum(mysqlnum);//mysql表数量 + xxhbsynclog.setSyncnum(syncnum);//本次同步数据量 + xxhbsynclog.setSynctype("0");//同步类型 0全量 1增量 + xxhbsynclog.setErrormessage(errorMessage); + saveLog(xxhbsynclog,Xxhbbks.class); } /** diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwJxljbxxb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwJxljbxxb.java index 20f51e5d..3d0086cb 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwJxljbxxb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwJxljbxxb.java @@ -6,9 +6,7 @@ import org.apache.commons.compress.utils.Lists; import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; import org.jeecg.modules.kc.grab.exports.entity.TJwJxljbxx; import org.jeecg.modules.kc.grab.exports.service.ITJwJxljbxxService; -import org.jeecg.modules.kc.grab.imports.entity.Xxhbjxljbxx; -import org.jeecg.modules.kc.grab.imports.entity.Xxhbkckb; -import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog; +import org.jeecg.modules.kc.grab.imports.entity.*; import org.jeecg.modules.kc.grab.imports.service.IXxhbjxljbxxService; import org.quartz.JobExecutionContext; import org.springframework.beans.factory.annotation.Autowired; @@ -50,11 +48,26 @@ public class SyncTJwJxljbxxb extends BaseSync { inDataList.forEach(x -> outDataList.add(BeanUtil.toBean(x, Xxhbjxljbxx.class))); //保存到胃 - impService.syncList(outDataList); - + int syncnum=0; + String errorMessage = ""; + try { + impService.syncList(outDataList); + syncnum = outDataList.size(); + }catch (Exception e){ + e.printStackTrace(); + errorMessage = e.getMessage(); + } + Xxhbjxljbxx Xxhbjxljbxx = impService.getSumnum(); + int mysqlnum=Xxhbjxljbxx.getMysqlnum(); Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size())); - saveLog(xxhbsynclog, Xxhbkckb.class); + xxhbsynclog.setOratabname("TJwJxljbxx");//oracle表名 + xxhbsynclog.setOratabnum(inDataList.size());//oracle表数量 + xxhbsynclog.setTablenum(mysqlnum);//mysql表数量 + xxhbsynclog.setSyncnum(syncnum);//本次同步数据量 + xxhbsynclog.setSynctype("0");//同步类型 0全量 1增量 + xxhbsynclog.setErrormessage(errorMessage); + saveLog(xxhbsynclog, Xxhbjxljbxx.class); } /** diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKcapzb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKcapzb.java index 7ba3413c..9193706d 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKcapzb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKcapzb.java @@ -6,6 +6,8 @@ import org.apache.commons.compress.utils.Lists; import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; import org.jeecg.modules.kc.grab.exports.entity.TJwKcapzb; import org.jeecg.modules.kc.grab.exports.service.ITJwKcapzbService; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbjsjbxx; import org.jeecg.modules.kc.grab.imports.entity.Xxhbkcapzb; import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog; import org.jeecg.modules.kc.grab.imports.service.IXxhbkcapzbService; @@ -49,11 +51,26 @@ public class SyncTJwKcapzb extends BaseSync { inDataList.forEach(x -> outDataList.add(BeanUtil.toBean(x, Xxhbkcapzb.class))); //保存到胃 - impService.syncList(outDataList); - + int syncnum=0; + String errorMessage = ""; + try { + impService.syncList(outDataList); + syncnum = outDataList.size(); + }catch (Exception e){ + e.printStackTrace(); + errorMessage = e.getMessage(); + } + Xxhbkcapzb Xxhbkcapzb = impService.getSumnum(); + int mysqlnum=Xxhbkcapzb.getMysqlnum(); Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size())); - saveLog(xxhbsynclog,Xxhbkcapzb.class); + xxhbsynclog.setOratabname("T_JW_KCAPZB");//oracle表名 + xxhbsynclog.setOratabnum(inDataList.size());//oracle表数量 + xxhbsynclog.setTablenum(mysqlnum);//mysql表数量 + xxhbsynclog.setSyncnum(syncnum);//本次同步数据量 + xxhbsynclog.setSynctype("0");//同步类型 0全量 1增量 + xxhbsynclog.setErrormessage(errorMessage); + saveLog(xxhbsynclog, Xxhbbks.class); } /** diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKckb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKckb.java index 67ac2e3e..f10aa2db 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKckb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKckb.java @@ -6,6 +6,8 @@ import org.apache.commons.compress.utils.Lists; import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; import org.jeecg.modules.kc.grab.exports.entity.TJwKckb; import org.jeecg.modules.kc.grab.exports.service.ITJwKckbService; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbjsjbxx; import org.jeecg.modules.kc.grab.imports.entity.Xxhbkckb; import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog; import org.jeecg.modules.kc.grab.imports.service.IXxhbkckbService; @@ -49,10 +51,25 @@ public class SyncTJwKckb extends BaseSync { inDataList.forEach(x -> outDataList.add(BeanUtil.toBean(x, Xxhbkckb.class))); //保存到胃 - impService.syncList(outDataList); - + int syncnum=0; + String errorMessage = ""; + try { + impService.syncList(outDataList); + syncnum = outDataList.size(); + }catch (Exception e){ + e.printStackTrace(); + errorMessage = e.getMessage(); + } + Xxhbkckb Xxhbkckb = impService.getSumnum(); + int mysqlnum=Xxhbkckb.getMysqlnum(); Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size())); + xxhbsynclog.setOratabname("T_JW_KCKB");//oracle表名 + xxhbsynclog.setOratabnum(inDataList.size());//oracle表数量 + xxhbsynclog.setTablenum(mysqlnum);//mysql表数量 + xxhbsynclog.setSyncnum(syncnum);//本次同步数据量 + xxhbsynclog.setSynctype("0");//同步类型 0全量 1增量 + xxhbsynclog.setErrormessage(errorMessage); saveLog(xxhbsynclog, Xxhbkckb.class); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKcxxb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKcxxb.java index 5098d290..06221b57 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKcxxb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKcxxb.java @@ -6,6 +6,8 @@ import org.apache.commons.compress.utils.Lists; import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; import org.jeecg.modules.kc.grab.exports.entity.TJwKcxxb; import org.jeecg.modules.kc.grab.exports.service.ITJwKcxxbService; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbjsjbxx; import org.jeecg.modules.kc.grab.imports.entity.Xxhbkcxxb; import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog; import org.jeecg.modules.kc.grab.imports.service.IXxhbkcxxbService; @@ -49,10 +51,25 @@ public class SyncTJwKcxxb extends BaseSync { inDataList.forEach(x -> outDataList.add(BeanUtil.toBean(x, Xxhbkcxxb.class))); //保存到胃 - impService.syncList(outDataList); - + int syncnum=0; + String errorMessage = ""; + try { + impService.syncList(outDataList); + syncnum = outDataList.size(); + }catch (Exception e){ + e.printStackTrace(); + errorMessage = e.getMessage(); + } + Xxhbkcxxb Xxhbjsjbxx = impService.getSumnum(); + int mysqlnum=Xxhbjsjbxx.getMysqlnum(); Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size())); + xxhbsynclog.setOratabname("T_JW_KCXXB");//oracle表名 + xxhbsynclog.setOratabnum(inDataList.size());//oracle表数量 + xxhbsynclog.setTablenum(mysqlnum);//mysql表数量 + xxhbsynclog.setSyncnum(syncnum);//本次同步数据量 + xxhbsynclog.setSynctype("0");//同步类型 0全量 1增量 + xxhbsynclog.setErrormessage(errorMessage); saveLog(xxhbsynclog, Xxhbkcxxb.class); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwTkkcb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwTkkcb.java index 5c5dd52c..e1700b67 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwTkkcb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwTkkcb.java @@ -6,6 +6,8 @@ import org.apache.commons.compress.utils.Lists; import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; import org.jeecg.modules.kc.grab.exports.entity.TJwTkkcb; import org.jeecg.modules.kc.grab.exports.service.ITJwTkkcbService; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbjsjbxx; import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog; import org.jeecg.modules.kc.grab.imports.entity.Xxhbtkkcb; import org.jeecg.modules.kc.grab.imports.service.IXxhbtkkcbService; @@ -49,11 +51,26 @@ public class SyncTJwTkkcb extends BaseSync { inDataList.forEach(x -> outDataList.add(BeanUtil.toBean(x, Xxhbtkkcb.class))); //保存到胃 - impService.syncList(outDataList); - + int syncnum=0; + String errorMessage = ""; + try { + impService.syncList(outDataList); + syncnum = outDataList.size(); + }catch (Exception e){ + e.printStackTrace(); + errorMessage = e.getMessage(); + } + Xxhbtkkcb Xxhbtkkcb = impService.getSumnum(); + int mysqlnum=Xxhbtkkcb.getMysqlnum(); Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size())); - saveLog(xxhbsynclog,Xxhbtkkcb.class); + xxhbsynclog.setOratabname("T_JW_TKKCB");//oracle表名 + xxhbsynclog.setOratabnum(inDataList.size());//oracle表数量 + xxhbsynclog.setTablenum(mysqlnum);//mysql表数量 + xxhbsynclog.setSyncnum(syncnum);//本次同步数据量 + xxhbsynclog.setSynctype("0");//同步类型 0全量 1增量 + xxhbsynclog.setErrormessage(errorMessage); + saveLog(xxhbsynclog, Xxhbtkkcb.class); } /** diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwTkxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwTkxx.java index f0c3ba7c..a4f653f4 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwTkxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwTkxx.java @@ -6,6 +6,7 @@ import org.apache.commons.compress.utils.Lists; import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; import org.jeecg.modules.kc.grab.exports.entity.TJwTkxx; import org.jeecg.modules.kc.grab.exports.service.ITJwTkxxService; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbdw; import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog; import org.jeecg.modules.kc.grab.imports.entity.Xxhbtkxx; import org.jeecg.modules.kc.grab.imports.service.IXxhbtkxxService; @@ -49,11 +50,26 @@ public class SyncTJwTkxx extends BaseSync { inDataList.forEach(x -> outDataList.add(BeanUtil.toBean(x, Xxhbtkxx.class))); //保存到胃 - impService.syncList(outDataList); - + int syncnum=0; + String errorMessage = ""; + try { + impService.syncList(outDataList); + syncnum = outDataList.size(); + }catch (Exception e){ + e.printStackTrace(); + errorMessage = e.getMessage(); + } + Xxhbtkxx Xxhbtkxx = impService.getSumnum(); + int mysqlnum=Xxhbtkxx.getMysqlnum(); Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size())); - saveLog(xxhbsynclog, Xxhbtkxx.class); + xxhbsynclog.setOratabname("T_JW_TKXX");//oracle表名 + xxhbsynclog.setOratabnum(inDataList.size());//oracle表数量 + xxhbsynclog.setTablenum(mysqlnum);//mysql表数量 + xxhbsynclog.setSyncnum(syncnum);//本次同步数据量 + xxhbsynclog.setSynctype("0");//同步类型 0全量 1增量 + xxhbsynclog.setErrormessage(errorMessage); + saveLog(xxhbsynclog,Xxhbtkxx.class); } /** diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwXsxkb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwXsxkb.java index 531f968c..8421a231 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwXsxkb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwXsxkb.java @@ -8,6 +8,7 @@ import org.apache.commons.compress.utils.Lists; import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; import org.jeecg.modules.kc.grab.exports.entity.TJwXsxkb; import org.jeecg.modules.kc.grab.exports.service.ITJwXsxkbService; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbdw; import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog; import org.jeecg.modules.kc.grab.imports.entity.Xxhbxsxkb; import org.jeecg.modules.kc.grab.imports.service.IXxhbxsxkbService; @@ -76,11 +77,26 @@ public class SyncTJwXsxkb extends BaseSync { inDataList.forEach(x -> outDataList.add(BeanUtil.toBean(x, Xxhbxsxkb.class))); //保存到胃 - impService.syncList(outDataList,dqw,isDelete); - + int syncnum=0; + String errorMessage = ""; + try { + impService.syncList(outDataList); + syncnum = outDataList.size(); + }catch (Exception e){ + e.printStackTrace(); + errorMessage = e.getMessage(); + } + Xxhbxsxkb Xxhbxsxkb = impService.getSumnum(); + int mysqlnum=Xxhbxsxkb.getMysqlnum(); Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size())); - saveLog(xxhbsynclog, Xxhbxsxkb.class); + xxhbsynclog.setOratabname("T_JW_XSXKB");//oracle表名 + xxhbsynclog.setOratabnum(inDataList.size());//oracle表数量 + xxhbsynclog.setTablenum(mysqlnum);//mysql表数量 + xxhbsynclog.setSyncnum(syncnum);//本次同步数据量 + xxhbsynclog.setSynctype("1");//同步类型 0全量 1增量 + xxhbsynclog.setErrormessage(errorMessage); + saveLog(xxhbsynclog,Xxhbxsxkb.class); } /** diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTZzbLdxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTZzbLdxx.java index f19f7636..ed326fd8 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTZzbLdxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTZzbLdxx.java @@ -57,10 +57,25 @@ public class SyncTZzbLdxx extends BaseSync { inDataList.forEach(x -> outDataList.add(BeanUtil.toBean(x, Xxhbldxx.class))); //保存到胃 - impService.syncList(outDataList); - + int syncnum=0; + String errorMessage = ""; + try { + impService.syncList(outDataList); + syncnum = outDataList.size(); + }catch (Exception e){ + e.printStackTrace(); + errorMessage = e.getMessage(); + } + Xxhbldxx Xxhbldxx = impService.getSumnum(); + int mysqlnum=Xxhbldxx.getMysqlnum(); Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size())); + xxhbsynclog.setOratabname("T_ZZB_LDXX");//oracle表名 + xxhbsynclog.setOratabnum(inDataList.size());//oracle表数量 + xxhbsynclog.setTablenum(mysqlnum);//mysql表数量 + xxhbsynclog.setSyncnum(syncnum);//本次同步数据量 + xxhbsynclog.setSynctype("0");//同步类型 0全量 1增量 + xxhbsynclog.setErrormessage(errorMessage); saveLog(xxhbsynclog,Xxhbldxx.class); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbbks.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbbks.java index 37a2eb6a..0ffeb5f6 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbbks.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbbks.java @@ -1,6 +1,7 @@ package org.jeecg.modules.kc.grab.imports.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -82,4 +83,7 @@ public class Xxhbbks implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "timestamps") private java.util.Date timestamps; + + @TableField(exist = false) + private Integer mysqlnum; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbdw.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbdw.java index 5bca5523..95d3c31b 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbdw.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbdw.java @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -96,4 +94,6 @@ public class Xxhbdw implements Serializable { @Excel(name = "yjbmdwh", width = 15) @ApiModelProperty(value = "yjbmdwh") private java.lang.String yjbmdwh; + @TableField(exist = false) + private Integer mysqlnum; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbjsjbxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbjsjbxx.java index 8f8d566e..ecb48d45 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbjsjbxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbjsjbxx.java @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -130,4 +128,8 @@ public class Xxhbjsjbxx implements Serializable { @Excel(name = "是否可重复利用", width = 15) @ApiModelProperty(value = "是否可重复利用") private java.lang.String sfkcfly; + + + @TableField(exist = false) + private Integer mysqlnum; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbjxljbxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbjxljbxx.java index 52bf260d..13059f81 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbjxljbxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbjxljbxx.java @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -78,4 +76,7 @@ public class Xxhbjxljbxx implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "时间戳") private java.util.Date timestamps; + + @TableField(exist = false) + private Integer mysqlnum; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbkcapzb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbkcapzb.java index 3425f7cd..ffae967f 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbkcapzb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbkcapzb.java @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -144,4 +142,7 @@ public class Xxhbkcapzb implements Serializable { @Excel(name = "选课标志", width = 15) @ApiModelProperty(value = "选课标志") private java.lang.String xkbz; + + @TableField(exist = false) + private Integer mysqlnum; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbkckb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbkckb.java index 18e64c68..cd1e7755 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbkckb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbkckb.java @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -221,4 +219,7 @@ public class Xxhbkckb implements Serializable { @ApiModelProperty(value = "是否需要线上") private java.lang.String sfxsk; + @TableField(exist = false) + private Integer mysqlnum; + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbkcxxb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbkcxxb.java index 9d286d89..378552f6 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbkcxxb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbkcxxb.java @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -148,4 +146,7 @@ public class Xxhbkcxxb implements Serializable { @Excel(name = "素质课程分类代码", width = 15) @ApiModelProperty(value = "素质课程分类代码") private java.lang.String szkcfldm; + + @TableField(exist = false) + private Integer mysqlnum; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbldxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbldxx.java index 8d2d93f4..bf72a17a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbldxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbldxx.java @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -64,4 +62,7 @@ public class Xxhbldxx implements Serializable { @Excel(name = "时间戳", width = 15) @ApiModelProperty(value = "时间戳") private java.lang.String timestamps; + + @TableField(exist = false) + private Integer mysqlnum; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbshryxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbshryxx.java index 45e88cf9..25cffe6d 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbshryxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbshryxx.java @@ -1,5 +1,6 @@ package org.jeecg.modules.kc.grab.imports.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -56,4 +57,8 @@ public class Xxhbshryxx implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "时间戳") private java.util.Date timestamps; + + + @TableField(exist = false) + private Integer mysqlnum; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbsynclog.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbsynclog.java index d2aa4f3a..1c472e8d 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbsynclog.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbsynclog.java @@ -57,4 +57,13 @@ public class Xxhbsynclog implements Serializable { @Excel(name = "同步行数量", width = 15) @ApiModelProperty(value = "同步行数量") private java.lang.String errormessage; + + private java.lang.String oratabname; + private Integer tablenum; + private Integer oratabnum; + private Integer syncnum; + private java.lang.String synctype; + + + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbtkkcb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbtkkcb.java index 0a0f324c..81a3aa29 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbtkkcb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbtkkcb.java @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -140,4 +138,7 @@ public class Xxhbtkkcb implements Serializable { @Excel(name = "timestamps", width = 15) @ApiModelProperty(value = "timestamps") private java.lang.String timestamps; + + @TableField(exist = false) + private Integer mysqlnum; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbtkxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbtkxx.java index 96b6b8dc..d828a062 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbtkxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbtkxx.java @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -136,4 +134,6 @@ public class Xxhbtkxx implements Serializable { @Excel(name = "1-调整时间，2-调整地点，3-更换教师，4-其他", width = 15) @ApiModelProperty(value = "1-调整时间，2-调整地点，3-更换教师，4-其他") private java.lang.String tklx; + @TableField(exist = false) + private Integer mysqlnum; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbxsxkb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbxsxkb.java index 575a4e18..c09722c5 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbxsxkb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbxsxkb.java @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -80,4 +78,7 @@ public class Xxhbxsxkb implements Serializable { @Excel(name = "课程总表编号", width = 15) @ApiModelProperty(value = "课程总表编号") private java.lang.String kcapzbbh; + + @TableField(exist = false) + private Integer mysqlnum; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbbksMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbbksMapper.java index f3779eee..6b2efc23 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbbksMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbbksMapper.java @@ -11,4 +11,5 @@ import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks; */ public interface XxhbbksMapper extends BaseMapper { + Xxhbbks getSumnum(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbdwMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbdwMapper.java index 07bca3c9..b976e005 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbdwMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbdwMapper.java @@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface XxhbdwMapper extends BaseMapper { + Xxhbdw getSumnum(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbjsjbxxMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbjsjbxxMapper.java index 21c72f99..6b5a1e20 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbjsjbxxMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbjsjbxxMapper.java @@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface XxhbjsjbxxMapper extends BaseMapper { + Xxhbjsjbxx getSumnum(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbjxljbxxMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbjxljbxxMapper.java index 3068fa72..4bd145a5 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbjxljbxxMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbjxljbxxMapper.java @@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface XxhbjxljbxxMapper extends BaseMapper { + Xxhbjxljbxx getSumnum(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbkcapzbMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbkcapzbMapper.java index 8bbcc036..313831c2 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbkcapzbMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbkcapzbMapper.java @@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface XxhbkcapzbMapper extends BaseMapper { + Xxhbkcapzb getSumnum(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbkckbMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbkckbMapper.java index fd035c3c..842aa894 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbkckbMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbkckbMapper.java @@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface XxhbkckbMapper extends BaseMapper { + Xxhbkckb getSumnum(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbkcxxbMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbkcxxbMapper.java index 427b5f0e..63f48cd6 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbkcxxbMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbkcxxbMapper.java @@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface XxhbkcxxbMapper extends BaseMapper { + Xxhbkcxxb getSumnum(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbldxxMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbldxxMapper.java index d97d88e8..7baf726a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbldxxMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbldxxMapper.java @@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface XxhbldxxMapper extends BaseMapper { + Xxhbldxx getSumnum(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbshryxxMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbshryxxMapper.java index ee443a25..3b04c28e 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbshryxxMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbshryxxMapper.java @@ -11,4 +11,5 @@ import org.jeecg.modules.kc.grab.imports.entity.Xxhbshryxx; */ public interface XxhbshryxxMapper extends BaseMapper { + Xxhbshryxx getSumnum(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbtkkcbMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbtkkcbMapper.java index 11a750f6..4d7c4d03 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbtkkcbMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbtkkcbMapper.java @@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface XxhbtkkcbMapper extends BaseMapper { + Xxhbtkkcb getSumnum(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbtkxxMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbtkxxMapper.java index 311b29c8..aca2c5ad 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbtkxxMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbtkxxMapper.java @@ -16,4 +16,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface XxhbtkxxMapper extends BaseMapper { boolean updateToKeTang(Wrapper queryWrapper); + + Xxhbtkxx getSumnum(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbxsxkbMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbxsxkbMapper.java index 826eb552..cea96c3a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbxsxkbMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbxsxkbMapper.java @@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface XxhbxsxkbMapper extends BaseMapper { + Xxhbxsxkb getSumnum(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbbksMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbbksMapper.xml index 6cb3b40c..3a2e3525 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbbksMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbbksMapper.xml @@ -2,4 +2,7 @@ + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbdwMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbdwMapper.xml index 9cd537e7..8ddf7ae6 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbdwMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbdwMapper.xml @@ -2,4 +2,7 @@ + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbjsjbxxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbjsjbxxMapper.xml index f3ce5b80..4e5009e6 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbjsjbxxMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbjsjbxxMapper.xml @@ -2,4 +2,7 @@ + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbjxljbxxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbjxljbxxMapper.xml index e15cb99d..5c23180d 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbjxljbxxMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbjxljbxxMapper.xml @@ -2,4 +2,7 @@ + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbkcapzbMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbkcapzbMapper.xml index d796a377..9105ecfb 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbkcapzbMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbkcapzbMapper.xml @@ -2,4 +2,7 @@ + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbkckbMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbkckbMapper.xml index e489be30..92e584fb 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbkckbMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbkckbMapper.xml @@ -2,4 +2,7 @@ + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbkcxxbMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbkcxxbMapper.xml index 17891d7c..0bdc0cd4 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbkcxxbMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbkcxxbMapper.xml @@ -2,4 +2,7 @@ + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbldxxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbldxxMapper.xml index a4b2bade..6f770061 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbldxxMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbldxxMapper.xml @@ -2,4 +2,7 @@ + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbshryxxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbshryxxMapper.xml index e0da494a..cc553eb5 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbshryxxMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbshryxxMapper.xml @@ -2,4 +2,7 @@ + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbtkkcbMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbtkkcbMapper.xml index d39fb07d..ee1d8d64 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbtkkcbMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbtkkcbMapper.xml @@ -2,4 +2,7 @@ + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbtkxxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbtkxxMapper.xml index 90910896..faedead4 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbtkxxMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbtkxxMapper.xml @@ -12,4 +12,9 @@ AND tk.sqrdw = kt.kkdw AND tk.jc = kt.hh + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbxsxkbMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbxsxkbMapper.xml index d225929b..dcfec2f8 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbxsxkbMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbxsxkbMapper.xml @@ -2,4 +2,7 @@ + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbbksService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbbksService.java index 513456a2..c4cc0be6 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbbksService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbbksService.java @@ -28,4 +28,5 @@ public interface IXxhbbksService extends IService { */ boolean syncList(Collection entityList, boolean isDelete); + Xxhbbks getSumnum(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbdwService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbdwService.java index ff0ed9c1..17bded05 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbdwService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbdwService.java @@ -28,4 +28,5 @@ public interface IXxhbdwService extends IService { */ boolean syncList(Collection entityList, boolean isDelete); + Xxhbdw getSumnum(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbjsjbxxService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbjsjbxxService.java index 764d71a6..1f5c995a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbjsjbxxService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbjsjbxxService.java @@ -18,4 +18,6 @@ public interface IXxhbjsjbxxService extends IService { boolean syncList(List outDataList); boolean syncList(Collection entityList, boolean isDelete); + + Xxhbjsjbxx getSumnum(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbjxljbxxService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbjxljbxxService.java index e7caceab..d5abfa81 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbjxljbxxService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbjxljbxxService.java @@ -18,4 +18,6 @@ public interface IXxhbjxljbxxService extends IService { boolean syncList(List outDataList); boolean syncList(Collection entityList, boolean isDelete); + + Xxhbjxljbxx getSumnum(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbkcapzbService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbkcapzbService.java index f69e51c9..a37e3f96 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbkcapzbService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbkcapzbService.java @@ -28,4 +28,5 @@ public interface IXxhbkcapzbService extends IService { */ boolean syncList(Collection entityList, boolean isDelete); + Xxhbkcapzb getSumnum(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbkckbService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbkckbService.java index e7910df0..bcb98e93 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbkckbService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbkckbService.java @@ -28,4 +28,5 @@ public interface IXxhbkckbService extends IService { */ boolean syncList(Collection entityList, boolean isDelete); + Xxhbkckb getSumnum(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbkcxxbService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbkcxxbService.java index 5022eb54..3abec3ce 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbkcxxbService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbkcxxbService.java @@ -28,4 +28,5 @@ public interface IXxhbkcxxbService extends IService { */ boolean syncList(Collection entityList, boolean isDelete); + Xxhbkcxxb getSumnum(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbldxxService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbldxxService.java index bb00f5f6..0d9390e3 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbldxxService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbldxxService.java @@ -28,4 +28,5 @@ public interface IXxhbldxxService extends IService { */ boolean syncList(Collection entityList, boolean isDelete); + Xxhbldxx getSumnum(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbshryxxService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbshryxxService.java index dd1dd5ad..a961eef0 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbshryxxService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbshryxxService.java @@ -27,4 +27,5 @@ public interface IXxhbshryxxService extends IService { */ boolean syncList(Collection entityList, boolean isDelete); + Xxhbshryxx getSumnum(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbtkkcbService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbtkkcbService.java index 61fe4290..dd76abd2 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbtkkcbService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbtkkcbService.java @@ -28,4 +28,5 @@ public interface IXxhbtkkcbService extends IService { */ boolean syncList(Collection entityList, boolean isDelete); + Xxhbtkkcb getSumnum(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbtkxxService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbtkxxService.java index 3a868b36..99b62635 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbtkxxService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbtkxxService.java @@ -36,4 +36,5 @@ public interface IXxhbtkxxService extends IService { */ boolean updateToKeTang(Wrapper queryWrapper); + Xxhbtkxx getSumnum(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbxsxkbService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbxsxkbService.java index 04b002f3..ca688921 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbxsxkbService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbxsxkbService.java @@ -28,4 +28,6 @@ public interface IXxhbxsxkbService extends IService { * @return */ boolean syncList(Collection entityList, QueryWrapper queryWrapper, boolean isDelete); + + Xxhbxsxkb getSumnum(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbbksServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbbksServiceImpl.java index f8f036e5..abfebbc5 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbbksServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbbksServiceImpl.java @@ -34,4 +34,9 @@ public class XxhbbksServiceImpl extends ServiceImpl impl } return this.saveBatch(entityList, 1000); } + + @Override + public Xxhbbks getSumnum() { + return baseMapper.getSumnum(); + } } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbdwServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbdwServiceImpl.java index 269474a1..aeae9663 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbdwServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbdwServiceImpl.java @@ -34,4 +34,9 @@ public class XxhbdwServiceImpl extends ServiceImpl impleme } return this.saveBatch(entityList, 1000); } + + @Override + public Xxhbdw getSumnum() { + return baseMapper.getSumnum(); + } } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbjsjbxxServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbjsjbxxServiceImpl.java index 5af8f1b3..343e755c 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbjsjbxxServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbjsjbxxServiceImpl.java @@ -35,4 +35,9 @@ public class XxhbjsjbxxServiceImpl extends ServiceImpl i } return this.saveBatch(entityList, 1000); } + + @Override + public Xxhbkckb getSumnum() { + return baseMapper.getSumnum(); + } } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbkcxxbServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbkcxxbServiceImpl.java index 6cde239b..9d2d5dec 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbkcxxbServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbkcxxbServiceImpl.java @@ -34,4 +34,9 @@ public class XxhbkcxxbServiceImpl extends ServiceImpl i } return this.saveBatch(entityList, 1000); } + + @Override + public Xxhbldxx getSumnum() { + return baseMapper.getSumnum(); + } } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbshryxxServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbshryxxServiceImpl.java index 31e3b64c..8450cb88 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbshryxxServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbshryxxServiceImpl.java @@ -34,4 +34,9 @@ public class XxhbshryxxServiceImpl extends ServiceImpl i public boolean updateToKeTang(Wrapper queryWrapper) { return baseMapper.updateToKeTang(queryWrapper); } + + @Override + public Xxhbtkxx getSumnum() { + return baseMapper.getSumnum(); + } } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbxsxkbServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbxsxkbServiceImpl.java index a801f8fd..2586c0f4 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbxsxkbServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbxsxkbServiceImpl.java @@ -34,4 +34,9 @@ public class XxhbxsxkbServiceImpl extends ServiceImpl kcKetangbiaoQueryWrapper = new QueryWrapper<>(); kcKetangbiaoQueryWrapper.eq(StringUtils.isNotBlank(KcZzYbtkbPar.getKcbh()),"kcbh",KcZzYbtkbPar.getKcbh()); kcKetangbiaoQueryWrapper.eq(StringUtils.isNotBlank(KcZzYbtkbPar.getKcmc()),"kcmc",KcZzYbtkbPar.getKcmc()); - kcKetangbiaoQueryWrapper.eq(StringUtils.isNotBlank(KcZzYbtkbPar.getSkdd()),"skdd",KcZzYbtkbPar.getSkdd()); +// kcKetangbiaoQueryWrapper.eq(StringUtils.isNotBlank(KcZzYbtkbPar.getSkdd()),"skdd",KcZzYbtkbPar.getSkdd()); kcKetangbiaoQueryWrapper.like("skrq",DateUtil.format(KcZzYbtkbPar.getSkrq(),"yyyy-MM-dd")); kcKetangbiaoQueryWrapper.eq("skjs",KcZzYbtkbPar.getSkjs()); List kcKetangBiaoList = kcKetangbiaoService.list(kcKetangbiaoQueryWrapper); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/controller/KcTingkeController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/controller/KcTingkeController.java index 3f353750..f2050122 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/controller/KcTingkeController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/controller/KcTingkeController.java @@ -405,4 +405,14 @@ public class KcTingkeController extends JeecgController> getSftk(KcTingke kcTingke) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("kechengbiaoid",kcTingke.getKechengbiaoid()); + queryWrapper.eq("userid",kcTingke.getUserid()); + List list = kcTingkeService.getSftk(queryWrapper); + return Result.OK(list); + } + + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/KcTingkeMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/KcTingkeMapper.java index 01f76110..ccbe5a34 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/KcTingkeMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/KcTingkeMapper.java @@ -41,4 +41,6 @@ public interface KcTingkeMapper extends BaseMapper { List selectKkdwExportList(KcKkdw kcKkdw); List selectTkmxExportList(KcTkmx kcTkmx); + + List getSftk(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml index 756d4325..84cdaf63 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml @@ -45,6 +45,9 @@ AND (tk.username like CONCAT('%',#{kcTingke.username},'%') or tk.userid like CONCAT('%',#{kcTingke.username},'%')) + + AND tk.userid =#{userid} + GROUP BY tk.userid, tk.username, college ) tk LEFT JOIN ( SELECT usercode, username, GROUP_CONCAT( assess1 SEPARATOR ',' ) tksf1, GROUP_CONCAT( assess2 SEPARATOR ',' ) tksf2, max( tkyq ) tkyq,assesscode,dwmc @@ -766,4 +769,10 @@ ORDER BY tingketime DESC + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/IKcTingkeService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/IKcTingkeService.java index 6650dd45..01fdc30a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/IKcTingkeService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/IKcTingkeService.java @@ -38,4 +38,6 @@ public interface IKcTingkeService extends IService { List selectKkdwExportList(KcKkdw kcKkdw); List selectTkmxExportList(KcTkmx kcTkmx); + + List getSftk(QueryWrapper queryWrapper); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/impl/KcTingkeServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/impl/KcTingkeServiceImpl.java index 37a044b8..8b7cbf25 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/impl/KcTingkeServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/impl/KcTingkeServiceImpl.java @@ -74,4 +74,9 @@ public class KcTingkeServiceImpl extends ServiceImpl i public List selectTkmxExportList(KcTkmx kcTkmx) { return baseMapper.selectTkmxExportList(kcTkmx); } + + @Override + public List getSftk(QueryWrapper queryWrapper) { + return baseMapper.getSftk(queryWrapper); + } }