From c0b060abbd41fc166bff2eb9eb34d79671a18bb9 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 4 Jun 2024 08:52:31 +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 --- .../SynchronizationService/SyncKcktStat.java | 325 +++++++++--------- .../controller/KcTtksdpzController.java | 61 ++++ .../controller/KcKechengbiaoController.java | 2 +- .../ktgl/mapper/xml/KcKechengbiaoMapper.xml | 8 +- .../KcTeachingUnitContentOneController.java | 10 + .../entity/KcTeachingUnitContentOne.java | 6 + .../modules/kc/wjxDjxx/entity/WjxDjxx.java | 22 +- .../modules/kc/wjxDjxx/entity/WjxDjxxDj.java | 16 +- .../service/impl/WjxDjxxServiceImpl.java | 1 + .../wjxWjxx/controller/WjxWjxxController.java | 4 + .../modules/kc/wjxWjxx/entity/WjxWjxx.java | 2 + .../kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml | 3 + .../controller/WjxWjxxTmlbController.java | 40 ++- .../service/impl/ZyCcjgServiceImpl.java | 25 +- .../zyCjwt/controller/ZyCjwtController.java | 3 + .../modules/kc/zyCjwt/entity/ZyCjwt.java | 10 +- .../modules/kc/zyDbtx/entity/ZyDbtx.java | 4 + .../kc/zyDbtx/mapper/xml/ZyDbtxMapper.xml | 2 +- .../controller/ZyGonggaoController.java | 3 + .../kc/zyGonggao/entity/ZyGonggao.java | 11 +- .../zyInfo/controller/ZyInfoController.java | 5 + .../modules/kc/zyInfo/entity/ZyInfo.java | 2 + .../controller/ZyInfoStudentController.java | 51 ++- .../zyInfoStudent/entity/ZyInfoStudent.java | 2 + .../mapper/xml/ZyInfoStudentMapper.xml | 2 +- .../service/IZyInfoStudentService.java | 2 + .../impl/ZyInfoStudentServiceImpl.java | 10 + .../zyJxdg/controller/ZyJxdgController.java | 4 +- .../modules/kc/zyJxdg/entity/ZyJxdg.java | 8 +- .../kc/zyTlq/controller/ZyTlqController.java | 7 +- .../jeecg/modules/kc/zyTlq/entity/ZyTlq.java | 10 +- .../src/main/resources/application-prod.yml | 15 +- 32 files changed, 460 insertions(+), 216 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 2aca32ad..8edb3936 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 @@ -79,171 +79,136 @@ 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("rwbh",KcKechengbiaoPar.getRwbh()); -// kcKechengbiaoQueryWrapper.eq("kkdwid",KcKechengbiaoPar.getKkdwid()); -// kcKechengbiaoQueryWrapper.eq("kcxz",KcKechengbiaoPar.getKcxz()); -//// 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){ -// String id = KcKechengbiao.getId(); -// BeanUtils.copyProperties(KcKechengbiaoPar,KcKechengbiao); -// KcKechengbiao.setId(id); -// kcKechengbiaoService.updateById(KcKechengbiao); -// } -// }else{ -// kcKechengbiaoService.saveOne(KcKechengbiaoPar); -// } -// } -// //-----------------初始化数据------------------------ -// -// //------------------去除课程表重复数据 20231024新增----------------- -// KcKechengbiao KcKechengbiao = new KcKechengbiao(); -// KcKechengbiao.setXqxn(kcSysConfig.getFlag1()); -// kcKechengbiaoService.removeCfsj(KcKechengbiao); -// //------------------去除课程表重复数据 20231024新增----------------- -// -// -// -// //-----------------所有的数据都变成无效 20240321------------ -// KcKechengbiao kcbAll = new KcKechengbiao(); -// kcbAll.setXnxq(kcSysConfig.getFlag1()); -// kcKechengbiaoService.updateAllFlag(kcbAll);//所有的数据都变成无效 -// kcKechengbiaoService.updateYxByXxhbkckb(kcbAll);//根据条件变成有效数据 -// -// //-----------------所有的数据都变成无效 20240321------------ -// -// -// -// //------------------刨除指定表的数据 20240314新增 修改flag标志位---------------- -// KcKechengbiao ktbExculde = new KcKechengbiao(); -// ktbExculde.setXnxq(kcSysConfig.getFlag1()); -// kcKechengbiaoService.updateKechengExculde(ktbExculde); -// //------------------刨除指定表的数据 20240314新增 修改flag标志位---------------- -// -// -// -// -// //-------------------删除本年的课程数据冰倩是当天及以后的---------------------- -// 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()); -// kcKetangbiao.setFlag("0"); -// 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"); -// -// QueryWrapper kcKetangbiaoSkrqLogQueryWrapper = new QueryWrapper<>(); -// kcKetangbiaoSkrqLogQueryWrapper.ge("jsrq",dasj); -// List list1 = kcKetangbiaoSkrqLogService.list(kcKetangbiaoSkrqLogQueryWrapper); -// for(KcKetangbiaoSkrqLog KcKetangbiaoSkrqLog:list1){ -// UpdateWrapper KcKetangbiaoUpdateWrapper = new UpdateWrapper<>(); -// KcKetangbiaoUpdateWrapper.set("skrq",KcKetangbiaoSkrqLog.getTzrq()); -// KcKetangbiaoUpdateWrapper.eq("skrq",KcKetangbiaoSkrqLog.getSkrq()); -// kcKetangbiaoService.update(KcKetangbiaoUpdateWrapper); -// } + 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("rwbh",KcKechengbiaoPar.getRwbh()); + kcKechengbiaoQueryWrapper.eq("kkdwid",KcKechengbiaoPar.getKkdwid()); + kcKechengbiaoQueryWrapper.eq("kcxz",KcKechengbiaoPar.getKcxz()); +// 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){ + String id = KcKechengbiao.getId(); + BeanUtils.copyProperties(KcKechengbiaoPar,KcKechengbiao); + KcKechengbiao.setId(id); + kcKechengbiaoService.updateById(KcKechengbiao); + } + }else{ + kcKechengbiaoService.saveOne(KcKechengbiaoPar); + } + } + //-----------------初始化数据------------------------ + + //------------------去除课程表重复数据 20231024新增----------------- + KcKechengbiao KcKechengbiao = new KcKechengbiao(); + KcKechengbiao.setXqxn(kcSysConfig.getFlag1()); + kcKechengbiaoService.removeCfsj(KcKechengbiao); + //------------------去除课程表重复数据 20231024新增----------------- + + + + //-----------------所有的数据都变成无效 20240321------------ + KcKechengbiao kcbAll = new KcKechengbiao(); + kcbAll.setXnxq(kcSysConfig.getFlag1()); + kcKechengbiaoService.updateAllFlag(kcbAll);//所有的数据都变成无效 + kcKechengbiaoService.updateYxByXxhbkckb(kcbAll);//根据条件变成有效数据 + + //-----------------所有的数据都变成无效 20240321------------ + + + + //------------------刨除指定表的数据 20240314新增 修改flag标志位---------------- + KcKechengbiao ktbExculde = new KcKechengbiao(); + ktbExculde.setXnxq(kcSysConfig.getFlag1()); + kcKechengbiaoService.updateKechengExculde(ktbExculde); + //------------------刨除指定表的数据 20240314新增 修改flag标志位---------------- + + + + + //-------------------删除本年的课程数据冰倩是当天及以后的---------------------- + 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()); + kcKetangbiao.setFlag("0"); + 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"); + + QueryWrapper kcKetangbiaoSkrqLogQueryWrapper = new QueryWrapper<>(); + kcKetangbiaoSkrqLogQueryWrapper.ge("jsrq",dasj); + List list1 = kcKetangbiaoSkrqLogService.list(kcKetangbiaoSkrqLogQueryWrapper); + for(KcKetangbiaoSkrqLog KcKetangbiaoSkrqLog:list1){ + UpdateWrapper KcKetangbiaoUpdateWrapper = new UpdateWrapper<>(); + KcKetangbiaoUpdateWrapper.set("skrq",KcKetangbiaoSkrqLog.getTzrq()); + KcKetangbiaoUpdateWrapper.eq("skrq",KcKetangbiaoSkrqLog.getSkrq()); + kcKetangbiaoService.update(KcKetangbiaoUpdateWrapper); + } //---------------------20240416新增手动调停课逻辑------------------ try { - String dqsj = DateUtils.formatDate(dateNow,"yyyy-MM-dd"); - QueryWrapper kcTtksdpzQueryWrapper = new QueryWrapper<>(); - kcTtksdpzQueryWrapper.eq("fjsj",dqsj); - List sdpzList = kcTtksdpzService.list(kcTtksdpzQueryWrapper); -// 停课：代表在放假时间内，不上课 -// 调课：放假时间上调课时间内的课程 - for(KcTtksdpz kcTtksdpz:sdpzList){ - String tklx = kcTtksdpz.getTklx(); - if(StringUtils.equals("0",tklx)){//调课 - String fjsj = DateUtils.formatDate(kcTtksdpz.getFjsj(),"yyyy-MM-dd");//放假时间 - String tksj = DateUtils.formatDate(kcTtksdpz.getTksj(),"yyyy-MM-dd");//调课时间 - - //更具调课时间修改成放假时间 - UpdateWrapper KcKetangbiaoUpdateWrapper = new UpdateWrapper<>(); - KcKetangbiaoUpdateWrapper.set("skrq",fjsj); - KcKetangbiaoUpdateWrapper.set("is_delete","0"); - KcKetangbiaoUpdateWrapper.eq("skrq",tksj); - kcKetangbiaoService.update(KcKetangbiaoUpdateWrapper); - - kcTtksdpz.setZxsj(dateNow); - kcTtksdpz.setZxsql1("update kc_ketangbiao set skrq = '"+fjsj+"' , is_delete = '0' where skrq = '"+tksj+"'"); - kcTtksdpzService.updateById(kcTtksdpz); - }else if(StringUtils.equals("1",tklx)){//停课 - String fjsj = DateUtils.formatDate(kcTtksdpz.getFjsj(),"yyyy-MM-dd");//放假时间 - - //更具调课时间修改成放假时间 - UpdateWrapper KcKetangbiaoUpdateWrapper = new UpdateWrapper<>(); - KcKetangbiaoUpdateWrapper.set("is_delete","1"); - KcKetangbiaoUpdateWrapper.eq("skrq",fjsj); - kcKetangbiaoService.update(KcKetangbiaoUpdateWrapper); - - kcTtksdpz.setZxsj(dateNow); - kcTtksdpz.setZxsql1("update kc_ketangbiao set is_delete = '0' where skrq = '"+fjsj+"'"); - kcTtksdpzService.updateById(kcTtksdpz); - } - } + editTtkxx(); } catch (Exception e){ e.printStackTrace(); } @@ -256,6 +221,46 @@ public class SyncKcktStat extends BaseSync { } } + private void editTtkxx() { + Date dateNow = new Date(); + String dqsj = DateUtils.formatDate(dateNow,"yyyy-MM-dd"); + QueryWrapper kcTtksdpzQueryWrapper = new QueryWrapper<>(); + kcTtksdpzQueryWrapper.ge("fjsj",dqsj); + List sdpzList = kcTtksdpzService.list(kcTtksdpzQueryWrapper); +// 停课：代表在放假时间内，不上课 +// 调课：放假时间上调课时间内的课程 + for(KcTtksdpz kcTtksdpz:sdpzList){ + String tklx = kcTtksdpz.getTklx(); + if(StringUtils.equals("1",tklx)){//调课 + String fjsj = DateUtils.formatDate(kcTtksdpz.getFjsj(),"yyyy-MM-dd");//放假时间 + String tksj = DateUtils.formatDate(kcTtksdpz.getTksj(),"yyyy-MM-dd");//调课时间 + + //更具调课时间修改成放假时间 + UpdateWrapper KcKetangbiaoUpdateWrapper = new UpdateWrapper<>(); + KcKetangbiaoUpdateWrapper.set("skrq",fjsj); + KcKetangbiaoUpdateWrapper.set("is_delete","0"); + KcKetangbiaoUpdateWrapper.eq("skrq",tksj); + kcKetangbiaoService.update(KcKetangbiaoUpdateWrapper); + + kcTtksdpz.setZxsj(dateNow); + kcTtksdpz.setZxsql1("update kc_ketangbiao set skrq = '"+fjsj+"' , is_delete = '0' where skrq = '"+tksj+"'"); + kcTtksdpzService.updateById(kcTtksdpz); + }else if(StringUtils.equals("0",tklx)){//停课 + String fjsj = DateUtils.formatDate(kcTtksdpz.getFjsj(),"yyyy-MM-dd");//放假时间 + + //更具调课时间修改成放假时间 + UpdateWrapper KcKetangbiaoUpdateWrapper = new UpdateWrapper<>(); + KcKetangbiaoUpdateWrapper.set("is_delete","1"); + KcKetangbiaoUpdateWrapper.eq("skrq",fjsj); + kcKetangbiaoService.update(KcKetangbiaoUpdateWrapper); + + kcTtksdpz.setZxsj(dateNow); + kcTtksdpz.setZxsql1("update kc_ketangbiao set is_delete = '0' where skrq = '"+fjsj+"'"); + kcTtksdpzService.updateById(kcTtksdpz); + } + } + } + /** * 无参定时任务实现 */ diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcTtksdpz/controller/KcTtksdpzController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcTtksdpz/controller/KcTtksdpzController.java index a0afe50a..2ba7afb9 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcTtksdpz/controller/KcTtksdpzController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcTtksdpz/controller/KcTtksdpzController.java @@ -1,6 +1,7 @@ package org.jeecg.modules.kc.kcTtksdpz.controller; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -9,8 +10,12 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.kc.kcTtksdpz.entity.KcTtksdpz; import org.jeecg.modules.kc.kcTtksdpz.service.IKcTtksdpzService; @@ -20,6 +25,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; +import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao; +import org.jeecg.modules.kc.ktgl.service.IKcKetangbiaoService; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -50,6 +57,10 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; public class KcTtksdpzController extends JeecgController { @Autowired private IKcTtksdpzService kcTtksdpzService; + + + @Autowired + private IKcKetangbiaoService kcKetangbiaoService; /** * 分页列表查询 @@ -84,6 +95,11 @@ public class KcTtksdpzController extends JeecgController add(@RequestBody KcTtksdpz kcTtksdpz) { kcTtksdpzService.save(kcTtksdpz); + try { + editTtkxx(); + }catch (Exception e) { + e.printStackTrace(); + } return Result.OK("添加成功！"); } @@ -98,6 +114,11 @@ public class KcTtksdpzController extends JeecgController edit(@RequestBody KcTtksdpz kcTtksdpz) { kcTtksdpzService.updateById(kcTtksdpz); + try { + editTtkxx(); + }catch (Exception e) { + e.printStackTrace(); + } return Result.OK("编辑成功!"); } @@ -173,4 +194,44 @@ public class KcTtksdpzController extends JeecgController kcTtksdpzQueryWrapper = new QueryWrapper<>(); + kcTtksdpzQueryWrapper.ge("fjsj",dqsj); + List sdpzList = kcTtksdpzService.list(kcTtksdpzQueryWrapper); +// 停课：代表在放假时间内，不上课 +// 调课：放假时间上调课时间内的课程 + for(KcTtksdpz kcTtksdpz:sdpzList){ + String tklx = kcTtksdpz.getTklx(); + if(StringUtils.equals("1",tklx)){//调课 + String fjsj = DateUtils.formatDate(kcTtksdpz.getFjsj(),"yyyy-MM-dd");//放假时间 + String tksj = DateUtils.formatDate(kcTtksdpz.getTksj(),"yyyy-MM-dd");//调课时间 + + //更具调课时间修改成放假时间 + UpdateWrapper KcKetangbiaoUpdateWrapper = new UpdateWrapper<>(); + KcKetangbiaoUpdateWrapper.set("skrq",fjsj); + KcKetangbiaoUpdateWrapper.set("is_delete","0"); + KcKetangbiaoUpdateWrapper.eq("skrq",tksj); + kcKetangbiaoService.update(KcKetangbiaoUpdateWrapper); + + kcTtksdpz.setZxsj(dateNow); + kcTtksdpz.setZxsql1("update kc_ketangbiao set skrq = '"+fjsj+"' , is_delete = '0' where skrq = '"+tksj+"'"); + kcTtksdpzService.updateById(kcTtksdpz); + }else if(StringUtils.equals("0",tklx)){//停课 + String fjsj = DateUtils.formatDate(kcTtksdpz.getFjsj(),"yyyy-MM-dd");//放假时间 + + //更具调课时间修改成放假时间 + UpdateWrapper KcKetangbiaoUpdateWrapper = new UpdateWrapper<>(); + KcKetangbiaoUpdateWrapper.set("is_delete","1"); + KcKetangbiaoUpdateWrapper.eq("skrq",fjsj); + kcKetangbiaoService.update(KcKetangbiaoUpdateWrapper); + + kcTtksdpz.setZxsj(dateNow); + kcTtksdpz.setZxsql1("update kc_ketangbiao set is_delete = '0' where skrq = '"+fjsj+"'"); + kcTtksdpzService.updateById(kcTtksdpz); + } + } + } } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java index 745e11ac..1be1b5cc 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java @@ -308,7 +308,7 @@ public class KcKechengbiaoController extends JeecgController dbtxList = zyDbtxService.getDbtxList(zyDbtx); for(KcKechengbiao par:pageList.getRecords()){ for(ZyDbtx txPar : dbtxList){ - if(StringUtils.equals(par.getRwbh(),txPar.getRwbh())){ + if(StringUtils.equals(par.getRwbh(),txPar.getRwbh())&&StringUtils.equals(par.getJgh(),txPar.getFbr())){ par.setDbtxType(txPar.getType()); break; } 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 8a20fa25..156b81e8 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 @@ -149,6 +149,7 @@ rwbh, skdd, xkrs, + jgh, func_jc(GROUP_CONCAT( sksj )) AS sksj FROM @@ -163,6 +164,7 @@ rwbh, skdd, xkrs, + jgh, concat ( WEEK, REPLACE ( hh, '、', '' )) @@ -182,7 +184,7 @@ @@ -194,6 +196,10 @@ and xqxn = #{xqxn} + + and jgh = #{jgh} + + limit 1 \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/controller/KcTeachingUnitContentOneController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/controller/KcTeachingUnitContentOneController.java index 4bb67035..be08abb0 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/controller/KcTeachingUnitContentOneController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/controller/KcTeachingUnitContentOneController.java @@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse; import com.google.common.collect.Maps; import org.apache.commons.compress.utils.Lists; +import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; @@ -100,6 +101,7 @@ public class KcTeachingUnitContentOneController extends JeecgController> allList(KcTeachingUnitContentOne kcTeachingUnitContentOne, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(kcTeachingUnitContentOne, req.getParameterMap()); + queryWrapper.eq(StringUtils.isNotBlank(kcTeachingUnitContentOne.getTeano()),"create_by",kcTeachingUnitContentOne.getTeano()); List list = kcTeachingUnitContentOneService.list(queryWrapper); //转成map @@ -262,4 +264,12 @@ public class KcTeachingUnitContentOneController extends JeecgController editJxdyOne(@RequestBody KcTeachingUnitContentOne kcTeachingUnitContentOne) { + kcTeachingUnitContentOneService.updateById(kcTeachingUnitContentOne); + return Result.OK("编辑成功!"); + } } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/entity/KcTeachingUnitContentOne.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/entity/KcTeachingUnitContentOne.java index 03c07866..dfb5a861 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/entity/KcTeachingUnitContentOne.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/entity/KcTeachingUnitContentOne.java @@ -66,7 +66,13 @@ public class KcTeachingUnitContentOne implements Serializable { @Excel(name = "排序", width = 15) @ApiModelProperty(value = "排序") private java.lang.Integer sort; + /**发布*/ + @Excel(name = "发布", width = 15) + @ApiModelProperty(value = "发布") + private java.lang.String fabu; @TableField(exist = false) private List childrenList; + @TableField(exist = false) + private String teano; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxx.java index fe21b943..d6ca01f9 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxx.java @@ -41,15 +41,18 @@ public class WjxDjxx { @ApiModelProperty(value = "vid") private String vid; - - - - - - @Excel(name = "名称", width = 15) @ApiModelProperty(value = "名称") @TableField(exist = false) private String title; + + + + + + + @Excel(name = "序号", width = 15) + @TableField(exist = false) + private String xuhao; @Excel(name = "学号", width = 15) @ApiModelProperty(value = "学号") private String userId; @@ -74,15 +77,12 @@ public class WjxDjxx { private Date commitTime; @Excel(name = "答卷用时", width = 15) @TableField(exist = false) - @ApiModelProperty(value = "问卷作答用时时分秒") + @ApiModelProperty(value = "答卷用时") private String answerSfm; - @Excel(name = "学期学年", width = 15) + @ApiModelProperty(value = "学期学年") @TableField(exist = false) private String xqxn; - - - @ApiModelProperty(value = "提交内容") private String submitData; @ApiModelProperty(value = "答卷编号") diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxxDj.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxxDj.java index 4e77fb31..1c5e2bb1 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxxDj.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxxDj.java @@ -41,15 +41,18 @@ public class WjxDjxxDj { @ApiModelProperty(value = "vid") private String vid; - - - - - - @Excel(name = "名称", width = 15) @ApiModelProperty(value = "名称") @TableField(exist = false) private String title; + + + + + + + @ApiModelProperty(value = "名称") + @TableField(exist = false) + private String xuhao; @Excel(name = "学号", width = 15) @ApiModelProperty(value = "学号") private String userId; @@ -70,7 +73,6 @@ public class WjxDjxxDj { @TableField(exist = false) @ApiModelProperty(value = "问卷作答用时时分秒") private String answerSfm; - @Excel(name = "学期学年", width = 15) @ApiModelProperty(value = "学期学年") @TableField(exist = false) private String xqxn; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java index 61fe59f8..763042b4 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java @@ -244,6 +244,7 @@ public class WjxDjxxServiceImpl extends ServiceImpl impl zyDbtx.setRwbh(wjxWjxx.getRwbh()); zyDbtx.setContent(content); zyDbtx.setFlag("0"); + zyDbtx.setFbr(user.getUsername()); zyDbtxService.save(zyDbtx); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java index 955d17fc..4c1fb9cd 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java @@ -6,8 +6,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.vo.LoginUser; import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks; import org.jeecg.modules.kc.grab.imports.service.IXxhbbksService; import org.jeecg.modules.kc.wjxWjxx.entity.WjxWjxx; @@ -247,6 +249,8 @@ public class WjxWjxxController extends JeecgController zyDbtx.setRwbh(wjxWjxx.getRwbh()); zyDbtx.setContent(content); zyDbtx.setFlag("0"); + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + zyDbtx.setFbr(user.getUsername()); zyDbtxService.save(zyDbtx); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/WjxWjxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/WjxWjxx.java index 56f6bc9e..1377f75f 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/WjxWjxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/WjxWjxx.java @@ -120,4 +120,6 @@ public class WjxWjxx implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date zyEndTime; + @TableField(exist = false) + private String teano; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml index ff4fafa5..e37031c6 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml @@ -58,6 +58,9 @@ and a.rwbh = #{param.rwbh} and a.xqxn = #{param.xqxn} and a.atype = #{param.atype} + + and a.create_by = #{param.teano} + and a.title like CONCAT('%', #{param.title}, '%') diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java index d145bd6c..82a0aabb 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java @@ -241,11 +241,25 @@ public class WjxWjxxTmlbController extends JeecgController pageList = wjxDjxxService.exportList(wjxDjxx); - // Step.4 AutoPoi 导出Excel - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - mv.addObject(NormalExcelConstants.FILE_NAME, "测验信息"); + String xqxn = ""; + String kcmc =""; + String teacher = sysUser.getRealname(); + String title = ""; + for(int i = 0; i < pageList.size(); i++){ + int xuhao = i+1; + pageList.get(i).setXuhao(xuhao+""); + if(i==0){ + xqxn = pageList.get(i).getXqxn(); + kcmc = pageList.get(i).getKcmc(); + title = pageList.get(i).getTitle(); + } + } + String dctitle = xqxn+"《"+kcmc+"》"+teacher+"-"+title; + // Step.4 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + mv.addObject(NormalExcelConstants.FILE_NAME, dctitle); mv.addObject(NormalExcelConstants.CLASS, WjxDjxx.class); - mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("测验信息", "导出人:"+sysUser.getRealname(), "测验信息")); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams(dctitle, "导出人:"+sysUser.getRealname(), dctitle)); mv.addObject(NormalExcelConstants.DATA_LIST, pageList); return mv; } @@ -257,11 +271,25 @@ public class WjxWjxxTmlbController extends JeecgController pageList = wjxDjxxService.exportDjXls(wjxDjxxdj); + String xqxn = ""; + String kcmc =""; + String teacher = sysUser.getRealname(); + String title = ""; + for(int i = 0; i < pageList.size(); i++){ + int xuhao = i+1; + pageList.get(i).setXuhao(xuhao+""); + if(i==0){ + xqxn = pageList.get(i).getXqxn(); + kcmc = pageList.get(i).getKcmc(); + title = pageList.get(i).getTitle(); + } + } + String dctitle = xqxn+"《"+kcmc+"》"+teacher+"-"+title; // Step.4 AutoPoi 导出Excel ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - mv.addObject(NormalExcelConstants.FILE_NAME, "问卷信息"); + mv.addObject(NormalExcelConstants.FILE_NAME, dctitle); mv.addObject(NormalExcelConstants.CLASS, WjxDjxxDj.class); - mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("问卷信息", "导出人:"+sysUser.getRealname(), "问卷信息")); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams(dctitle, "导出人:"+sysUser.getRealname(), dctitle)); mv.addObject(NormalExcelConstants.DATA_LIST, pageList); return mv; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/service/impl/ZyCcjgServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/service/impl/ZyCcjgServiceImpl.java index 29dfe360..1e0b2325 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/service/impl/ZyCcjgServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/service/impl/ZyCcjgServiceImpl.java @@ -78,13 +78,30 @@ public class ZyCcjgServiceImpl extends ServiceImpl impleme for(ZyCcjg par : list){ //查重类型（0外网 1内网 2aigc 3校内） if(StringUtils.equals(par.getCcType(), "0")){ - wwCxjcjg(par); + try { + wwCxjcjg(par); + }catch (Exception e){ + e.printStackTrace(); + } }else if(StringUtils.equals(par.getCcType(), "1")){ - xfwbdCxjcjg(par); + try { + xfwbdCxjcjg(par); + }catch (Exception e){ + e.printStackTrace(); + } + }else if(StringUtils.equals(par.getCcType(), "2")){ - aigcCxjcjg(par); + try { + aigcCxjcjg(par); + }catch (Exception e){ + e.printStackTrace(); + } }else if(StringUtils.equals(par.getCcType(), "3")){ - xnCxjcjg(par); + try { + xnCxjcjg(par); + }catch (Exception e){ + e.printStackTrace(); + } } } } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCjwt/controller/ZyCjwtController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCjwt/controller/ZyCjwtController.java index 8a629641..a6c0634b 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCjwt/controller/ZyCjwtController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCjwt/controller/ZyCjwtController.java @@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; @@ -69,6 +71,7 @@ public class ZyCjwtController extends JeecgController { HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyCjwt, req.getParameterMap()); Page page = new Page(pageNo, pageSize); + queryWrapper.eq(StringUtils.isNotBlank(zyCjwt.getTeano()),"create_by",zyCjwt.getTeano()); IPage pageList = zyCjwtService.page(page, queryWrapper); return Result.OK(pageList); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCjwt/entity/ZyCjwt.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCjwt/entity/ZyCjwt.java index 26753179..cc9eb106 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCjwt/entity/ZyCjwt.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCjwt/entity/ZyCjwt.java @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -68,4 +66,8 @@ public class ZyCjwt implements Serializable { @Excel(name = "答案", width = 15) @ApiModelProperty(value = "答案") private java.lang.String answer; + + + @TableField(exist = false) + private String teano; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyDbtx/entity/ZyDbtx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyDbtx/entity/ZyDbtx.java index c0b57986..882d60af 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyDbtx/entity/ZyDbtx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyDbtx/entity/ZyDbtx.java @@ -74,4 +74,8 @@ public class ZyDbtx implements Serializable { @Dict(dicCode = "yn") @ApiModelProperty(value = "标识") private java.lang.String flag; + /**标识*/ + @Excel(name = "发布人", width = 15) + @ApiModelProperty(value = "发布人") + private java.lang.String fbr; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyDbtx/mapper/xml/ZyDbtxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyDbtx/mapper/xml/ZyDbtxMapper.xml index cf334bfc..452b6a6c 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyDbtx/mapper/xml/ZyDbtxMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyDbtx/mapper/xml/ZyDbtxMapper.xml @@ -3,6 +3,6 @@ \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/controller/ZyGonggaoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/controller/ZyGonggaoController.java index 1e99ec7a..8ce24d5f 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/controller/ZyGonggaoController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/controller/ZyGonggaoController.java @@ -3,6 +3,8 @@ package org.jeecg.modules.kc.zyGonggao.controller; import java.util.Arrays; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.modules.kc.zyGonggao.entity.ZyGonggao; @@ -52,6 +54,7 @@ public class ZyGonggaoController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(zyGonggao, req.getParameterMap()); Page page = new Page(pageNo, pageSize); + queryWrapper.eq(StringUtils.isNotBlank(zyGonggao.getTeano()),"create_by",zyGonggao.getTeano()); IPage pageList = zyGonggaoService.page(page, queryWrapper); return Result.OK(pageList); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/entity/ZyGonggao.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/entity/ZyGonggao.java index e30e6a0f..b2f9548b 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/entity/ZyGonggao.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyGonggao/entity/ZyGonggao.java @@ -70,13 +70,18 @@ public class ZyGonggao implements Serializable { @ApiModelProperty(value = "发布时间") private java.util.Date fbTime; + + private java.lang.String rwbh; + + private java.lang.String xqxn; + + @TableField(exist = false) private java.lang.String flag; @TableField(exist = false) private java.lang.String originId; - private java.lang.String rwbh; - - private java.lang.String xqxn; + @TableField(exist = false) + private String teano; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java index bfb28c25..5acdc9f6 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; @@ -76,6 +77,7 @@ public class ZyInfoController extends JeecgController { HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper("a",zyInfo, req.getParameterMap()); Page page = new Page(pageNo, pageSize); + queryWrapper.eq(StringUtils.isNotBlank(zyInfo.getTeano()),"a.create_by",zyInfo.getTeano()); IPage pageList = zyInfoService.page(page, queryWrapper); return Result.OK(pageList); } @@ -157,6 +159,8 @@ public class ZyInfoController extends JeecgController { zyDbtx.setRwbh(zyInfo.getRwbh()); zyDbtx.setContent("您有一条作业需要提交！"); zyDbtx.setFlag("0"); + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + zyDbtx.setFbr(user.getUsername()); zyDbtxService.save(zyDbtx); } @@ -247,6 +251,7 @@ public class ZyInfoController extends JeecgController { queryWrapper.apply("a.id = b.main_id "); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); queryWrapper.eq("b.create_by",sysUser.getUsername()); + queryWrapper.eq(StringUtils.isNotBlank(zyInfo.getTeano()),"a.create_by",zyInfo.getTeano()); IPage pageList = zyInfoService.stuList(page, queryWrapper); return Result.OK(pageList); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfo.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfo.java index 9a2672fd..a8bcf8c1 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfo.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfo.java @@ -150,6 +150,8 @@ public class ZyInfo implements Serializable { private String nwxsl; @TableField(exist = false) private String aigcxsl; + @TableField(exist = false) + private String teano; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java index f9f3a283..604ce8c7 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java @@ -15,8 +15,10 @@ import javax.servlet.http.HttpServletResponse; import cn.hutool.core.io.FileUtil; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.SpringContextHolder; import org.jeecg.common.util.oConvertUtils; @@ -179,6 +181,8 @@ public class ZyInfoStudentController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.zyInfoStudentService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); + @PostMapping(value = "/fabuBatch") + public Result fabuBatch(@RequestParam(name="ids",required=true) String ids) { + this.zyInfoStudentService.fabuBatch(Arrays.asList(ids.split(","))); + + try { + String idsList[] = ids.split(","); + if(idsList.length>0){ + ZyInfoStudent zyInfoStudentPar = zyInfoStudentService.getById(idsList[0]); + QueryWrapper zyInfoStudentQueryWrapper = new QueryWrapper<>(); + zyInfoStudentQueryWrapper.eq("main_id",zyInfoStudentPar.getMainId()); + List list = zyInfoStudentService.list(zyInfoStudentQueryWrapper); + int a = list.size(); + + QueryWrapper zyInfoStudentQueryWrapper2 = new QueryWrapper<>(); + zyInfoStudentQueryWrapper2.eq("main_id",zyInfoStudentPar.getMainId()); + zyInfoStudentQueryWrapper2.eq("score_fabu","1"); + List list2 = zyInfoStudentService.list(zyInfoStudentQueryWrapper2); + int b = list2.size(); + if(a==b){ + UpdateWrapper zyInfo = new UpdateWrapper<>(); + zyInfo.eq("id",zyInfoStudentPar.getMainId()); + zyInfo.set("zy_status","2"); + zyInfoService.update(zyInfo); + } + } + }catch (Exception e) { + e.printStackTrace(); + } + + return Result.OK("批量发布成功!"); } + + + @AutoLog(value = "学生提交作业-批量删除") + @ApiOperation(value="学生提交作业-批量删除", notes="学生提交作业-批量删除") + @RequiresPermissions("zyInfoStudent:zy_info_student:deleteBatch") + @PostMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.zyInfoStudentService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } /** * 通过id查询 @@ -320,6 +359,8 @@ public class ZyInfoStudentController extends JeecgController diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/IZyInfoStudentService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/IZyInfoStudentService.java index 6301daf9..edebd2bf 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/IZyInfoStudentService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/IZyInfoStudentService.java @@ -29,4 +29,6 @@ public interface IZyInfoStudentService extends IService { IPage cdxxlist(Page page, QueryWrapper queryWrapper); List getCcjg(ZyInfoStudent zyInfoStudent); + + void fabuBatch(List asList); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/impl/ZyInfoStudentServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/impl/ZyInfoStudentServiceImpl.java index 38826d37..94630f75 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/impl/ZyInfoStudentServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/impl/ZyInfoStudentServiceImpl.java @@ -155,6 +155,16 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl asList) { + for (int i = 0; i < asList.size(); i++){ + ZyInfoStudent zyInfoStudent = new ZyInfoStudent(); + zyInfoStudent.setId(asList.get(i)); + zyInfoStudent.setScoreFabu("1"); + baseMapper.updateById(zyInfoStudent); + } + } + //aigc提交 private void aigcSave(ZyInfoStudent zyInfoStudent,HttpServletResponse response) { String url = "https://vims.fanyu.com/tool/AIGCCheck/paperSubmit"; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/controller/ZyJxdgController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/controller/ZyJxdgController.java index 3c821624..85aa90b7 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/controller/ZyJxdgController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/controller/ZyJxdgController.java @@ -150,6 +150,7 @@ public class ZyJxdgController extends JeecgController { KcKechengbiao kcKechengbiao = new KcKechengbiao(); kcKechengbiao.setRwbh(zyJxdg.getRwbh()); kcKechengbiao.setXqxn(zyJxdg.getXqxn()); + kcKechengbiao.setJgh(zyJxdg.getTeano()); kcKechengbiao = kcKechengbiaoService.getKcbhByRwbh(kcKechengbiao); if(kcKechengbiao != null){ zyJxdg.setKcbh(kcKechengbiao.getKcbh()); @@ -303,10 +304,11 @@ public class ZyJxdgController extends JeecgController { @ApiOperation(value="获取课程介绍和教学大纲内容", notes="获取课程介绍和教学大纲内容") @GetMapping(value = "/getKcjsJxdg") - public Result getKcjsJxdg(@RequestParam(name="rwbh",required=true) String rwbh,@RequestParam(name="xqxn",required=true) String xqxn) { + public Result getKcjsJxdg(@RequestParam(name="rwbh",required=true) String rwbh,@RequestParam(name="xqxn",required=true) String xqxn,@RequestParam(name="teano",required=false) String teano) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("rwbh",rwbh); queryWrapper.eq("xqxn",xqxn); + queryWrapper.eq("create_by",teano); // LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // queryWrapper.eq("create_by",sysUser.getUsername()); queryWrapper.last("limit 1"); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/entity/ZyJxdg.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/entity/ZyJxdg.java index 3ed7dac6..9d5a9ad8 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/entity/ZyJxdg.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/entity/ZyJxdg.java @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -87,4 +85,6 @@ public class ZyJxdg implements Serializable { @Excel(name = "pdf附件", width = 15) @ApiModelProperty(value = "pdf附件") private java.lang.String jxrlPdfPath; + @TableField(exist = false) + private String teano; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/controller/ZyTlqController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/controller/ZyTlqController.java index ceb9aedc..f228af11 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/controller/ZyTlqController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/controller/ZyTlqController.java @@ -10,9 +10,11 @@ import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks; import org.jeecg.modules.kc.grab.imports.service.IXxhbbksService; @@ -82,6 +84,7 @@ public class ZyTlqController extends JeecgController { HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyTlq, req.getParameterMap()); Page page = new Page(pageNo, pageSize); + queryWrapper.eq(StringUtils.isNotBlank(zyTlq.getTeano()),"create_by",zyTlq.getTeano()); IPage pageList = zyTlqService.page(page, queryWrapper); return Result.OK(pageList); } @@ -209,6 +212,8 @@ public class ZyTlqController extends JeecgController { zyDbtx.setRwbh(par.getRwbh()); zyDbtx.setContent("您有一条新的讨论话题，请即时进行讨论"); zyDbtx.setFlag("0"); + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + zyDbtx.setFbr(user.getUsername()); zyDbtxService.save(zyDbtx); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/entity/ZyTlq.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/entity/ZyTlq.java index 3b00daed..00f5e5ee 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/entity/ZyTlq.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyTlq/entity/ZyTlq.java @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -70,4 +68,8 @@ public class ZyTlq implements Serializable { private java.lang.String rwbh; private java.lang.String sffb; + + @TableField(exist = false) + private String teano; + } diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml index 0ba3c43f..272b3e57 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml @@ -175,7 +175,8 @@ jeecg: # 签名拦截接口 signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys #local\minio\alioss - uploadType: local + # uploadType: local + uploadType: sftp # 前端访问地址 domainUrl: pc: http://210.47.17.166 @@ -343,4 +344,14 @@ weipu: wjx: appid: 1321039 appkey: 55328ebd11964fc8b40c10011bcb425d - url: https://www.wjx.cn/openapi/default.aspx \ No newline at end of file + url: https://www.wjx.cn/openapi/default.aspx + +#SFTP +sftp: + hostname: 210.47.29.99 + port: 22 + username: sftp + password: Nenujwc@99 + timeout: 1000 + uploadpath: kczx + fullpath: /home/sftp \ No newline at end of file