From 9335be053dccee04929f873f370251e3970c3af9 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 19 Oct 2023 20:00:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=AC=E8=AF=BE=E8=A6=81?= =?UTF-8?q?=E6=B1=82=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../KcExportConfigTpkwcqkjzglxController.java | 24 +++ .../KcExportConfigTpkwcqkjzglxMapper.java | 6 + .../xml/KcExportConfigTpkwcqkjzglxMapper.xml | 7 + .../IKcExportConfigTpkwcqkjzglxService.java | 5 + ...KcExportConfigTpkwcqkjzglxServiceImpl.java | 7 + .../SynchronizationService/SyncKcktStat.java | 172 +++++++++--------- 6 files changed, 135 insertions(+), 86 deletions(-) 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 711232a7..8f6fac77 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 @@ -23,6 +23,8 @@ import org.jeecg.modules.kc.config.service.IKcExportConfigTpkwcqkjzglxService; import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi; import org.jeecg.modules.kc.grab.imports.entity.Xxhbuser; import org.jeecg.modules.kc.grab.imports.service.IXxhbuserService; +import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig; +import org.jeecg.modules.kc.kcSysConfig.service.IKcSysConfigService; import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory; import org.jeecg.modules.kc.qa.entity.KcEvaluation; import org.jeecg.modules.kc.qa.service.IKcEvaluationService; @@ -69,6 +71,8 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController> queryTkyqPageList(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(kcExportConfigTpkwcqkjzglx, req.getParameterMap()); + + KcSysConfig kcSysConfig = kcSysConfigService.getById("1"); + queryWrapper.eq("a.xqxn",kcSysConfig.getFlag1()); + queryWrapper.apply("a.tklx is not null"); + queryWrapper.groupBy("a.tklx,b.item_text,a.xqxn"); + Page page = new Page<>(pageNo, pageSize); + IPage pageList = kcExportConfigTpkwcqkjzglxService.queryTkyqPageList(page, queryWrapper); + + return Result.OK(pageList); + } + } 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 515f3651..ef669cae 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 @@ -1,6 +1,11 @@ package org.jeecg.modules.kc.config.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; import org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx; /** @@ -11,4 +16,5 @@ import org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx; */ public interface KcExportConfigTpkwcqkjzglxMapper extends BaseMapper { + IPage queryTkyqPageList(Page page, @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 5fbe0b50..f56ae5fa 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 @@ -24,4 +24,11 @@ + + + \ 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 885df4aa..0cddc0da 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 @@ -1,5 +1,8 @@ package org.jeecg.modules.kc.config.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx; @@ -12,4 +15,6 @@ import org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx; public interface IKcExportConfigTpkwcqkjzglxService extends IService { void editAll(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx); + + IPage queryTkyqPageList(Page page, 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 f9eb0d35..4f66b07e 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 @@ -2,6 +2,8 @@ package org.jeecg.modules.kc.config.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang.StringUtils; import org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx; @@ -83,4 +85,9 @@ public class KcExportConfigTpkwcqkjzglxServiceImpl extends ServiceImpl queryTkyqPageList(Page page, QueryWrapper queryWrapper) { + return baseMapper.queryTkyqPageList(page,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 9bd8304b..84062370 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 @@ -71,92 +71,92 @@ public class SyncKcktStat extends BaseSync { //-----------------修改课程表数据------------------------ -// KcKechengbiao kcKechengbiao = new KcKechengbiao(); -// kcKechengbiao.setXqxn(kcSysConfig.getFlag1()); -// List kckblist = kcKechengbiaoService.getKechengbiaoList(kcKechengbiao); -// for(KcKechengbiao KcKechengbiaoPar:kckblist){ -// QueryWrapper kcKechengbiaoQueryWrapper = new QueryWrapper<>(); -// kcKechengbiaoQueryWrapper.eq("kcbh",KcKechengbiaoPar.getKcbh()); -// 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()); -// kcKechengbiaoQueryWrapper.eq("xf",KcKechengbiaoPar.getXf()); -// kcKechengbiaoQueryWrapper.eq("xnxq",KcKechengbiaoPar.getXnxq()); -// kcKechengbiaoQueryWrapper.eq("kcdl",KcKechengbiaoPar.getKcdl()); -// -// List KcKechengbiaoInsList = kcKechengbiaoService.list(kcKechengbiaoQueryWrapper); -// if(KcKechengbiaoInsList!=null&&KcKechengbiaoInsList.size()>0){ -// for(KcKechengbiao KcKechengbiao : KcKechengbiaoInsList){ -// BeanUtils.copyProperties(KcKechengbiaoPar,KcKechengbiao); -// kcKechengbiaoService.updateById(KcKechengbiao); -// } -// }else{ -// kcKechengbiaoService.saveOne(KcKechengbiaoPar); -// } -// } -// //-----------------初始化数据------------------------ -// -// //-------------------删除本年的课程数据冰倩是当天及以后的---------------------- -// QueryWrapper KcKetangbiaoQueryWrapper = new QueryWrapper<>(); -// KcKetangbiaoQueryWrapper.eq("xnxq",kcSysConfig.getFlag1()); -// KcKetangbiaoQueryWrapper.ge("skrq",DateUtils.formatDate(dateNow,"yyyy-MM-dd")); -// kcKetangbiaoService.remove(KcKetangbiaoQueryWrapper); -// //-------------------删除本年的课程数据冰倩是当天及以后的---------------------- -// -// String bxqkssj = kcSysConfig.getBxqkssj(); -// //插入数据 -// KcKetangbiao kcKetangbiao = new KcKetangbiao(); -// kcKetangbiao.setXnxq(kcSysConfig.getFlag1()); -// List list = kcKetangbiaoService.selectSyncList(kcKetangbiao); -// List arrayList = new ArrayList<>(); -// for(int i=0;i=DateUtils.parseDate(dasj,"yyyy-MM-dd").getTime()){ -// kcKetangbiaoAddNew.setSkrq(skrq); -// kcKetangbiaoAddNew.setDijizhou(djz); -// kcKetangbiaoAddNew.setXnxq(kcSysConfig.getFlag1()); -// arrayList.add(kcKetangbiaoAddNew); -// } -// } -// }catch (Exception e){ -// e.printStackTrace(); -// } -// } -// kcKetangbiaoService.saveBatch(arrayList); -// -// //修改智慧教室关联的课堂表id-- 清洗智慧教室数据 -// kcKetangbiaoService.updateJsbh(); -// -// //修改智慧教室关联的课堂表id-- 清洗智慧教室数据 -// KcKetangbiao kcKetangbiaoup = new KcKetangbiao(); -// kcKetangbiaoup.setSkxs(1); -// kcKetangbiaoup.setXnxq(kcSysConfig.getFlag1()); -// kcKetangbiaoService.updateSkxs(kcKetangbiaoup); + KcKechengbiao kcKechengbiao = new KcKechengbiao(); + kcKechengbiao.setXqxn(kcSysConfig.getFlag1()); + List kckblist = kcKechengbiaoService.getKechengbiaoList(kcKechengbiao); + for(KcKechengbiao KcKechengbiaoPar:kckblist){ + QueryWrapper kcKechengbiaoQueryWrapper = new QueryWrapper<>(); + kcKechengbiaoQueryWrapper.eq("kcbh",KcKechengbiaoPar.getKcbh()); + 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()); + kcKechengbiaoQueryWrapper.eq("xf",KcKechengbiaoPar.getXf()); + kcKechengbiaoQueryWrapper.eq("xnxq",KcKechengbiaoPar.getXnxq()); + kcKechengbiaoQueryWrapper.eq("kcdl",KcKechengbiaoPar.getKcdl()); + + List KcKechengbiaoInsList = kcKechengbiaoService.list(kcKechengbiaoQueryWrapper); + if(KcKechengbiaoInsList!=null&&KcKechengbiaoInsList.size()>0){ + for(KcKechengbiao KcKechengbiao : KcKechengbiaoInsList){ + BeanUtils.copyProperties(KcKechengbiaoPar,KcKechengbiao); + kcKechengbiaoService.updateById(KcKechengbiao); + } + }else{ + kcKechengbiaoService.saveOne(KcKechengbiaoPar); + } + } + //-----------------初始化数据------------------------ + + //-------------------删除本年的课程数据冰倩是当天及以后的---------------------- + QueryWrapper KcKetangbiaoQueryWrapper = new QueryWrapper<>(); + KcKetangbiaoQueryWrapper.eq("xnxq",kcSysConfig.getFlag1()); + KcKetangbiaoQueryWrapper.ge("skrq",DateUtils.formatDate(dateNow,"yyyy-MM-dd")); + kcKetangbiaoService.remove(KcKetangbiaoQueryWrapper); + //-------------------删除本年的课程数据冰倩是当天及以后的---------------------- + + String bxqkssj = kcSysConfig.getBxqkssj(); + //插入数据 + KcKetangbiao kcKetangbiao = new KcKetangbiao(); + kcKetangbiao.setXnxq(kcSysConfig.getFlag1()); + List list = kcKetangbiaoService.selectSyncList(kcKetangbiao); + List arrayList = new ArrayList<>(); + for(int i=0;i=DateUtils.parseDate(dasj,"yyyy-MM-dd").getTime()){ + kcKetangbiaoAddNew.setSkrq(skrq); + kcKetangbiaoAddNew.setDijizhou(djz); + kcKetangbiaoAddNew.setXnxq(kcSysConfig.getFlag1()); + arrayList.add(kcKetangbiaoAddNew); + } + } + }catch (Exception e){ + e.printStackTrace(); + } + } + kcKetangbiaoService.saveBatch(arrayList); + + //修改智慧教室关联的课堂表id-- 清洗智慧教室数据 + kcKetangbiaoService.updateJsbh(); + + //修改智慧教室关联的课堂表id-- 清洗智慧教室数据 + KcKetangbiao kcKetangbiaoup = new KcKetangbiao(); + kcKetangbiaoup.setSkxs(1); + kcKetangbiaoup.setXnxq(kcSysConfig.getFlag1()); + kcKetangbiaoService.updateSkxs(kcKetangbiaoup); //修改调停课时间 String dasj = DateUtils.formatDate(dateNow,"yyyy-MM-dd");