From bb9ab33386cbde23fd262e49324358218395646b Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 24 Oct 2023 20:48:05 +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/SyncKcktStat.java | 8 ++++++-- .../modules/kc/ktgl/entity/KcKetangbiao.java | 3 +++ .../kc/ktgl/mapper/KcKechengbiaoMapper.java | 2 ++ .../kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml | 15 +++++++++++++++ .../kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml | 4 ++-- .../kc/ktgl/service/IKcKechengbiaoService.java | 2 ++ .../service/impl/KcKechengbiaoServiceImpl.java | 5 +++++ 7 files changed, 35 insertions(+), 4 deletions(-) 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 db5b884b..184c66a6 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 @@ -80,11 +80,9 @@ public class SyncKcktStat extends BaseSync { kcKechengbiaoQueryWrapper.eq("kcmc",KcKechengbiaoPar.getKcmc()); kcKechengbiaoQueryWrapper.eq("jgh",KcKechengbiaoPar.getJgh()); kcKechengbiaoQueryWrapper.eq("skjs",KcKechengbiaoPar.getSkjs()); -// kcKechengbiaoQueryWrapper.eq("zc",KcKechengbiaoPar.getZc()); kcKechengbiaoQueryWrapper.eq("rwbh",KcKechengbiaoPar.getRwbh()); kcKechengbiaoQueryWrapper.eq("kkdwid",KcKechengbiaoPar.getKkdwid()); kcKechengbiaoQueryWrapper.eq("kcxz",KcKechengbiaoPar.getKcxz()); -// kcKechengbiaoQueryWrapper.eq("jsbh",KcKechengbiaoPar.getJsbh()); kcKechengbiaoQueryWrapper.eq("skdd",KcKechengbiaoPar.getSkdd()); kcKechengbiaoQueryWrapper.eq("sksj",KcKechengbiaoPar.getSksj()); kcKechengbiaoQueryWrapper.eq("jkzc",KcKechengbiaoPar.getJkzc()); @@ -105,6 +103,12 @@ public class SyncKcktStat extends BaseSync { } //-----------------初始化数据------------------------ + //------------------去除课程表重复数据 20231024新增----------------- + KcKechengbiao KcKechengbiao = new KcKechengbiao(); + KcKechengbiao.setXqxn(kcSysConfig.getFlag1()); + kcKechengbiaoService.removeCfsj(KcKechengbiao); + //------------------去除课程表重复数据 20231024新增----------------- + //-------------------删除本年的课程数据冰倩是当天及以后的---------------------- QueryWrapper KcKetangbiaoQueryWrapper = new QueryWrapper<>(); KcKetangbiaoQueryWrapper.eq("xnxq",kcSysConfig.getFlag1()); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java index 07ed2311..92001b35 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java @@ -310,4 +310,7 @@ public class KcKetangbiao implements Serializable { @TableField(exist = false) private String sftkb; + @TableField(exist = false) + private String tksy; + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKechengbiaoMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKechengbiaoMapper.java index edca7265..6bd441d0 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKechengbiaoMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKechengbiaoMapper.java @@ -31,4 +31,6 @@ public interface KcKechengbiaoMapper extends BaseMapper { List getKechengbiaoList(KcKechengbiao kcKechengbiao); void saveOne(KcKechengbiao kcKechengbiaoPar); + + void removeCfsj(KcKechengbiao kcKechengbiao); } 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 1b0524c8..fa7edced 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 @@ -87,4 +87,19 @@ #{wwks},#{wwjs},#{zbfs},#{hyh},#{hymm},#{kclj},#{beizhu},#{zbpx},#{kkdwid}, #{jrfs},#{ewmwj},#{qmc},#{qlx},#{leixing},#{isqzyz},#{jkzc1},#{xf},#{xq},#{jgh},#{xnxq},#{jzglb},#{sfcj},#{skxs},#{sfzc},#{bz},#{zt},#{kcdl},#{xqxn}) + + + DELETE FROM kc_kechengbiao + WHERE xqxn = #{xqxn} + AND id NOT IN ( + SELECT maxid FROM + ( SELECT + kcbh,kcmc,skjs,zc,xkrs,pkrs,rwbh,kkdw,kcxz,skdd,sksj,jkzc,hh,WEEK,hhks,hhjs,zbfs,kkdwid,jkzc1,xf,xq,jgh,jzglb,sfcj,szkc,xqxn,max( id ) AS maxid + FROM kc_kechengbiao t + WHERE xqxn = #{xqxn} + + GROUP BY + kcbh,kcmc,skjs,zc,xkrs,pkrs,rwbh,kkdw,kcxz,skdd,sksj,jkzc,hh,WEEK,hhks,hhjs,zbfs,kkdwid,jkzc1,xf,xq,jgh,jzglb,sfcj,szkc,xqxn + ) a) + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml index 2a43f488..17f0a497 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml @@ -35,7 +35,7 @@