diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java index 15282ac3..d4c0bcb4 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java @@ -480,7 +480,8 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController0))"); // queryWrapper.apply("dwmc in (select kkdw from kc_kkdw21_view)"); // Step.2 获取导出数据 - List exportList = service.list(queryWrapper); + queryWrapper.groupBy("gh,xm"); + List exportList = service.groupTklxList(queryWrapper); Set xqxnSet = exportList.stream().filter(x -> StringUtils.isNotBlank(x.getXqxn())).map(KcExportConfigTpkwcqkjzglx::getXqxn).collect(Collectors.toSet()); //根据当前学期学年,硬合并出来一个数据 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 a7febdbe..c19a5d3f 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 @@ -44,4 +44,6 @@ public interface KcExportConfigTpkwcqkjzglxMapper extends BaseMapper getBxqSaveList(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx); + + List groupTklxList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } 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 a06a1bc0..a16b0988 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 @@ -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} + + \ 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 f8d00d2a..4aa06bd6 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 @@ -42,4 +42,6 @@ public interface IKcExportConfigTpkwcqkjzglxService extends IService getSfybxqsj(); + + List groupTklxList(QueryWrapper queryWrapper); } 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 79b5797a..941fc823 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 @@ -367,4 +367,9 @@ public class KcExportConfigTpkwcqkjzglxServiceImpl extends ServiceImpl groupTklxList(QueryWrapper queryWrapper) { + return baseMapper.groupTklxList(queryWrapper); + } } 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 b367f726..e478f0da 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,7 +73,7 @@ public class SyncKcktStat extends BaseSync { //-----------------修改课程表数据------------------------ KcKechengbiao kcKechengbiao = new KcKechengbiao(); kcKechengbiao.setXqxn(kcSysConfig.getFlag1()); - kcKechengbiao.setSkjs("刘婷"); +// 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/jiaoshi/controller/KcZhihuijiaoshiController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiController.java index 5a669258..50d53757 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiController.java @@ -108,6 +108,7 @@ public class KcZhihuijiaoshiController extends JeecgController page = new Page<>(pageNo, pageSize); queryWrapper.orderByAsc("sort"); + queryWrapper.orderByDesc("xm"); IPage pageList = kcZhihuijiaoshiService.page(page, queryWrapper); log.info("01: {}",timer.intervalRestart()); 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 b71ce30a..b68817b4 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 @@ -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; } 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 55af24ba..44652411 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 @@ -87,6 +87,12 @@ and js.jsbh is not NULL + + and js.jsbh is not NULL + + + and js.jsbh is NULL + and jxljbxx.jzwh = #{kcKetangbiao.jzwh}