修改bug

jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java

@@ -480,7 +480,8 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
 //		queryWrapper.apply("(zt = '在职' or (zt= '退休' and ytkcs-0 >0))");
 //		queryWrapper.apply("dwmc in (select kkdw from kc_kkdw21_view)");
 		// Step.2 获取导出数据
-		List<KcExportConfigTpkwcqkjzglx> exportList = service.list(queryWrapper);
+		queryWrapper.groupBy("gh,xm");
+		List<KcExportConfigTpkwcqkjzglx> exportList = service.groupTklxList(queryWrapper);
 
 		Set<String> xqxnSet = exportList.stream().filter(x -> StringUtils.isNotBlank(x.getXqxn())).map(KcExportConfigTpkwcqkjzglx::getXqxn).collect(Collectors.toSet());
 		//根据当前学期学年，硬合并出来一个数据

jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/KcExportConfigTpkwcqkjzglxMapper.java

@@ -44,4 +44,6 @@ public interface KcExportConfigTpkwcqkjzglxMapper extends BaseMapper<KcExportCon
     KcExportConfigTpkwcqkjzglx getDqxqtjlist(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx);
 
     List<KcExportConfigTpkwcqkjzglx> getBxqSaveList(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx);
+
+    List<KcExportConfigTpkwcqkjzglx> groupTklxList(@Param(Constants.WRAPPER) QueryWrapper<KcExportConfigTpkwcqkjzglx> queryWrapper);
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/xml/KcExportConfigTpkwcqkjzglxMapper.xml

@@ -155,7 +155,7 @@
         count( 'x' ) AS pj_sum
         FROM
         kc_evaluation a,
-        ( SELECT start_time, end_time FROM kc_xqxn_history WHERE title = '2023秋' ) b,
+        ( select bxqkssj as start_time , bxqkssj as end_time FROM kc_xqxn_history WHERE id = '1') b,
         (
         SELECT
         xqxn,
@@ -270,7 +270,7 @@
         xm,
         sf,
         zt,
-        ytkcs,
+        ytkcs,+
         rjzy,
         #{xqxn} AS xqxn
         FROM
@@ -279,4 +279,10 @@
         xqxn = #{type}
     </select>
 
+
+        <select id="groupTklxList" resultType="org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx">
+            select max(id) as id,gh,GROUP_CONCAT(tklx) as tklx,dwmc,xm,sf,zt,max(ytkcs) as ytkcs,rjzy,xqxn
+            from kc_export_config_tpkwcqkjzglx
+            ${ew.customSqlSegment}
+        </select>
 </mapper>

jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/IKcExportConfigTpkwcqkjzglxService.java

@@ -42,4 +42,6 @@ public interface IKcExportConfigTpkwcqkjzglxService extends IService<KcExportCon
 
     //获取是否有本学期数据
     List<KcExportConfigTpkwcqkjzglx> getSfybxqsj();
+
+    List<KcExportConfigTpkwcqkjzglx> groupTklxList(QueryWrapper<KcExportConfigTpkwcqkjzglx> queryWrapper);
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/impl/KcExportConfigTpkwcqkjzglxServiceImpl.java

@@ -367,4 +367,9 @@ public class KcExportConfigTpkwcqkjzglxServiceImpl extends ServiceImpl<KcExportC
         }
         return null;
     }
+
+    @Override
+    public List<KcExportConfigTpkwcqkjzglx> groupTklxList(QueryWrapper<KcExportConfigTpkwcqkjzglx> queryWrapper) {
+        return baseMapper.groupTklxList(queryWrapper);
+    }
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcktStat.java

@@ -73,7 +73,7 @@ public class SyncKcktStat extends BaseSync {
             //-----------------修改课程表数据------------------------
             KcKechengbiao kcKechengbiao = new KcKechengbiao();
             kcKechengbiao.setXqxn(kcSysConfig.getFlag1());
-            kcKechengbiao.setSkjs("刘婷");
+//            kcKechengbiao.setSkjs("刘婷");
             List<KcKechengbiao> kckblist = kcKechengbiaoService.getKechengbiaoList(kcKechengbiao);
             for(KcKechengbiao KcKechengbiaoPar:kckblist){
                 QueryWrapper<KcKechengbiao> kcKechengbiaoQueryWrapper = new QueryWrapper<>();

jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiController.java

@@ -108,6 +108,7 @@ public class KcZhihuijiaoshiController extends JeecgController<KcZhihuijiaoshi,
 		 TimeInterval timer = DateUtil.timer();
 		 Page<KcZhihuijiaoshi> page = new Page<>(pageNo, pageSize);
 		 queryWrapper.orderByAsc("sort");
+		 queryWrapper.orderByDesc("xm");
 		 IPage<KcZhihuijiaoshi> pageList = kcZhihuijiaoshiService.page(page, queryWrapper);
 
 		 log.info("01: {}",timer.intervalRestart());

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java

@@ -207,6 +207,7 @@ public class KcKetangbiao implements Serializable {
 	/**是否停课*/
 	@Excel(name = "是否停课", width = 15)
     @ApiModelProperty(value = "是否停课")
+    @Dict(dicCode = "sftk_kc")
     private java.lang.Integer sftk;
 	/**停课原因*/
 	@Excel(name = "停课原因", width = 15)
@@ -223,6 +224,7 @@ public class KcKetangbiao implements Serializable {
 	/**上课形式，0-线上，1-线下，2-线上线下混合*/
 	@Excel(name = "上课形式，0-线上，1-线下，2-线上线下混合", width = 15)
     @ApiModelProperty(value = "上课形式，0-线上，1-线下，2-线上线下混合")
+    @Dict(dicCode = "sftk_kc")
     private java.lang.Integer skxs;
 	/**未知*/
 	@Excel(name = "未知", width = 15)
@@ -320,4 +322,6 @@ public class KcKetangbiao implements Serializable {
 	@TableField(exist = false)
 	private KcJiaoshirongliang jiaoshirongliang;
 
+    @TableField(exist = false)
+    private String zhjs;
 }

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

@@ -87,6 +87,12 @@
             <if test="kcKetangbiao.sfyzhjs!=null and kcKetangbiao.sfyzhjs!=''">
                 and js.jsbh is not NULL
             </if>
+            <if test='kcKetangbiao.zhjs!=null and kcKetangbiao.zhjs!="" and  kcKetangbiao.zhjs=="1"'>
+                and js.jsbh is not NULL
+            </if>
+            <if test='kcKetangbiao.zhjs!=null and kcKetangbiao.zhjs!="" and  kcKetangbiao.zhjs=="0"'>
+                and js.jsbh is NULL
+            </if>
             <if test="kcKetangbiao.jzwh!=null and kcKetangbiao.jzwh!=''">
                 and jxljbxx.jzwh = #{kcKetangbiao.jzwh}
             </if>