修改bug

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<KcKetangbiao> KcKetangbiaoQueryWrapper = new QueryWrapper<>();
             KcKetangbiaoQueryWrapper.eq("xnxq",kcSysConfig.getFlag1());

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;
+
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKechengbiaoMapper.java

@@ -31,4 +31,6 @@ public interface KcKechengbiaoMapper extends BaseMapper<KcKechengbiao> {
     List<KcKechengbiao> getKechengbiaoList(KcKechengbiao kcKechengbiao);
 
     void saveOne(KcKechengbiao kcKechengbiaoPar);
+
+    void removeCfsj(KcKechengbiao kcKechengbiao);
 }

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})
     </insert>
+
+    <delete id="removeCfsj" parameterType="org.jeecg.modules.kc.ktgl.entity.KcKechengbiao">
+        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)
+    </delete>
 </mapper>

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml

@@ -35,7 +35,7 @@
 
     <select id="getKclblist" parameterType="org.jeecg.modules.kc.ktgl.entity.KcKetangbiao"  resultType="org.jeecg.modules.kc.ktgl.entity.KcKetangbiao">
         select ktb.*,if(yy.id is null,0,1) as sfyy,yy.isdeleted, case when js.jsbh is NULL then 0 else 1 end sfyzhjs,
-        if(jc.hhjs is null,'00:00:00',concat(substr(jc.hhjs,1,2),':',substr(jc.hhjs,3,4),':00')) as jssj,kcb.szkc,IF(tkxx.kcmc is null,'0','1') as sftkb
+        if(jc.hhjs is null,'00:00:00',concat(substr(jc.hhjs,1,2),':',substr(jc.hhjs,3,4),':00')) as jssj,kcb.szkc,IF(tkxx.kcmc is null,'0','1') as sftkb,tkxx.tksy
         from kc_ketangbiao ktb
         left join (select * from kc_yuyue where userid = #{kcKetangbiao.userid}) yy on ktb.id = yy.ketangbiaoid
         LEFT JOIN (SELECT DISTINCT jsbh, jsmc from  kc_zhihuijiaoshi where sfyx=0) js on  ktb.jsbh = js.jsbh
@@ -43,7 +43,7 @@
         left join xxhbjxljbxx jxljbxx on jsjbxx.jxlh = jxljbxx.jzwh
         left join kc_jieci jc on ktb.hh = jc.jieci
         left join kc_kechengbiao kcb on kcb.kcmc = ktb.kcmc and kcb.kcxz = ktb.kcxz and kcb.skjs = ktb.skjs and kcb.skdd=ktb.skdd and kcb.kkdw = ktb.kkdw and kcb.kcbh = ktb.kcbh and kcb.id = ktb.kechengbiaoid
-        left join (select distinct  tkxx.xm,tkxx.kcmc,concat(substring(tkxx.skrq,1,4),'-',substring(tkxx.skrq,5,2),'-',substring(tkxx.skrq,7,2)) as skrq,tkxx.skjs from xxhbtkxx tkxx where tkxx.skrq is not null) tkxx
+        left join (select distinct  tkxx.xm,tkxx.kcmc,concat(substring(tkxx.skrq,1,4),'-',substring(tkxx.skrq,5,2),'-',substring(tkxx.skrq,7,2)) as skrq,tkxx.skjs,tkxx.tksy from xxhbtkxx tkxx where tkxx.skrq is not null) tkxx
         on ktb.kcmc =tkxx.kcmc and ktb.skrq = tkxx.skrq and ktb.skdd=tkxx.skjs and ktb.skjs = tkxx.xm
         <where>
             and ktb.is_delete = 0

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKechengbiaoService.java

@@ -29,4 +29,6 @@ public interface IKcKechengbiaoService extends IService<KcKechengbiao> {
     List<KcKechengbiao> getKechengbiaoList(KcKechengbiao kcKechengbiao);
 
     void saveOne(KcKechengbiao kcKechengbiaoPar);
+
+    void removeCfsj(KcKechengbiao kcKechengbiao);
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKechengbiaoServiceImpl.java

@@ -56,4 +56,9 @@ public class KcKechengbiaoServiceImpl extends ServiceImpl<KcKechengbiaoMapper, K
         baseMapper.saveOne(kcKechengbiaoPar);
     }
 
+    @Override
+    public void removeCfsj(KcKechengbiao kcKechengbiao) {
+        baseMapper.removeCfsj(kcKechengbiao);
+    }
+
 }