修改bug
This commit is contained in:
parent
964122f60f
commit
c0b060abbd
|
@ -79,171 +79,136 @@ public class SyncKcktStat extends BaseSync {
|
||||||
//-----------------修改课程表数据------------------------
|
//-----------------修改课程表数据------------------------
|
||||||
KcKechengbiao kcKechengbiao = new KcKechengbiao();
|
KcKechengbiao kcKechengbiao = new KcKechengbiao();
|
||||||
kcKechengbiao.setXqxn(kcSysConfig.getFlag1());
|
kcKechengbiao.setXqxn(kcSysConfig.getFlag1());
|
||||||
// List<KcKechengbiao> kckblist = kcKechengbiaoService.getKechengbiaoList(kcKechengbiao);
|
List<KcKechengbiao> kckblist = kcKechengbiaoService.getKechengbiaoList(kcKechengbiao);
|
||||||
// for(KcKechengbiao KcKechengbiaoPar:kckblist){
|
for(KcKechengbiao KcKechengbiaoPar:kckblist){
|
||||||
// QueryWrapper<KcKechengbiao> kcKechengbiaoQueryWrapper = new QueryWrapper<>();
|
QueryWrapper<KcKechengbiao> kcKechengbiaoQueryWrapper = new QueryWrapper<>();
|
||||||
// kcKechengbiaoQueryWrapper.eq("kcbh",KcKechengbiaoPar.getKcbh());
|
kcKechengbiaoQueryWrapper.eq("kcbh",KcKechengbiaoPar.getKcbh());
|
||||||
// kcKechengbiaoQueryWrapper.eq("kcmc",KcKechengbiaoPar.getKcmc());
|
kcKechengbiaoQueryWrapper.eq("kcmc",KcKechengbiaoPar.getKcmc());
|
||||||
// kcKechengbiaoQueryWrapper.eq("jgh",KcKechengbiaoPar.getJgh());
|
kcKechengbiaoQueryWrapper.eq("jgh",KcKechengbiaoPar.getJgh());
|
||||||
// kcKechengbiaoQueryWrapper.eq("skjs",KcKechengbiaoPar.getSkjs());
|
kcKechengbiaoQueryWrapper.eq("skjs",KcKechengbiaoPar.getSkjs());
|
||||||
// kcKechengbiaoQueryWrapper.eq("rwbh",KcKechengbiaoPar.getRwbh());
|
kcKechengbiaoQueryWrapper.eq("rwbh",KcKechengbiaoPar.getRwbh());
|
||||||
// kcKechengbiaoQueryWrapper.eq("kkdwid",KcKechengbiaoPar.getKkdwid());
|
kcKechengbiaoQueryWrapper.eq("kkdwid",KcKechengbiaoPar.getKkdwid());
|
||||||
// kcKechengbiaoQueryWrapper.eq("kcxz",KcKechengbiaoPar.getKcxz());
|
kcKechengbiaoQueryWrapper.eq("kcxz",KcKechengbiaoPar.getKcxz());
|
||||||
//// kcKechengbiaoQueryWrapper.eq("skdd",KcKechengbiaoPar.getSkdd());
|
// kcKechengbiaoQueryWrapper.eq("skdd",KcKechengbiaoPar.getSkdd());
|
||||||
// kcKechengbiaoQueryWrapper.eq("sksj",KcKechengbiaoPar.getSksj());
|
kcKechengbiaoQueryWrapper.eq("sksj",KcKechengbiaoPar.getSksj());
|
||||||
// kcKechengbiaoQueryWrapper.eq("jkzc",KcKechengbiaoPar.getJkzc());
|
kcKechengbiaoQueryWrapper.eq("jkzc",KcKechengbiaoPar.getJkzc());
|
||||||
// kcKechengbiaoQueryWrapper.eq("xf",KcKechengbiaoPar.getXf());
|
kcKechengbiaoQueryWrapper.eq("xf",KcKechengbiaoPar.getXf());
|
||||||
// kcKechengbiaoQueryWrapper.eq("xnxq",KcKechengbiaoPar.getXnxq());
|
kcKechengbiaoQueryWrapper.eq("xnxq",KcKechengbiaoPar.getXnxq());
|
||||||
// kcKechengbiaoQueryWrapper.eq("kcdl",KcKechengbiaoPar.getKcdl());
|
kcKechengbiaoQueryWrapper.eq("kcdl",KcKechengbiaoPar.getKcdl());
|
||||||
// List<KcKechengbiao> KcKechengbiaoInsList = kcKechengbiaoService.list(kcKechengbiaoQueryWrapper);
|
List<KcKechengbiao> KcKechengbiaoInsList = kcKechengbiaoService.list(kcKechengbiaoQueryWrapper);
|
||||||
// if(KcKechengbiaoInsList!=null&&KcKechengbiaoInsList.size()>0){
|
if(KcKechengbiaoInsList!=null&&KcKechengbiaoInsList.size()>0){
|
||||||
// for(KcKechengbiao KcKechengbiao : KcKechengbiaoInsList){
|
for(KcKechengbiao KcKechengbiao : KcKechengbiaoInsList){
|
||||||
// String id = KcKechengbiao.getId();
|
String id = KcKechengbiao.getId();
|
||||||
// BeanUtils.copyProperties(KcKechengbiaoPar,KcKechengbiao);
|
BeanUtils.copyProperties(KcKechengbiaoPar,KcKechengbiao);
|
||||||
// KcKechengbiao.setId(id);
|
KcKechengbiao.setId(id);
|
||||||
// kcKechengbiaoService.updateById(KcKechengbiao);
|
kcKechengbiaoService.updateById(KcKechengbiao);
|
||||||
// }
|
}
|
||||||
// }else{
|
}else{
|
||||||
// kcKechengbiaoService.saveOne(KcKechengbiaoPar);
|
kcKechengbiaoService.saveOne(KcKechengbiaoPar);
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
// //-----------------初始化数据------------------------
|
//-----------------初始化数据------------------------
|
||||||
//
|
|
||||||
// //------------------去除课程表重复数据 20231024新增-----------------
|
//------------------去除课程表重复数据 20231024新增-----------------
|
||||||
// KcKechengbiao KcKechengbiao = new KcKechengbiao();
|
KcKechengbiao KcKechengbiao = new KcKechengbiao();
|
||||||
// KcKechengbiao.setXqxn(kcSysConfig.getFlag1());
|
KcKechengbiao.setXqxn(kcSysConfig.getFlag1());
|
||||||
// kcKechengbiaoService.removeCfsj(KcKechengbiao);
|
kcKechengbiaoService.removeCfsj(KcKechengbiao);
|
||||||
// //------------------去除课程表重复数据 20231024新增-----------------
|
//------------------去除课程表重复数据 20231024新增-----------------
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
// //-----------------所有的数据都变成无效 20240321------------
|
//-----------------所有的数据都变成无效 20240321------------
|
||||||
// KcKechengbiao kcbAll = new KcKechengbiao();
|
KcKechengbiao kcbAll = new KcKechengbiao();
|
||||||
// kcbAll.setXnxq(kcSysConfig.getFlag1());
|
kcbAll.setXnxq(kcSysConfig.getFlag1());
|
||||||
// kcKechengbiaoService.updateAllFlag(kcbAll);//所有的数据都变成无效
|
kcKechengbiaoService.updateAllFlag(kcbAll);//所有的数据都变成无效
|
||||||
// kcKechengbiaoService.updateYxByXxhbkckb(kcbAll);//根据条件变成有效数据
|
kcKechengbiaoService.updateYxByXxhbkckb(kcbAll);//根据条件变成有效数据
|
||||||
//
|
|
||||||
// //-----------------所有的数据都变成无效 20240321------------
|
//-----------------所有的数据都变成无效 20240321------------
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
// //------------------刨除指定表的数据 20240314新增 修改flag标志位----------------
|
//------------------刨除指定表的数据 20240314新增 修改flag标志位----------------
|
||||||
// KcKechengbiao ktbExculde = new KcKechengbiao();
|
KcKechengbiao ktbExculde = new KcKechengbiao();
|
||||||
// ktbExculde.setXnxq(kcSysConfig.getFlag1());
|
ktbExculde.setXnxq(kcSysConfig.getFlag1());
|
||||||
// kcKechengbiaoService.updateKechengExculde(ktbExculde);
|
kcKechengbiaoService.updateKechengExculde(ktbExculde);
|
||||||
// //------------------刨除指定表的数据 20240314新增 修改flag标志位----------------
|
//------------------刨除指定表的数据 20240314新增 修改flag标志位----------------
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
// //-------------------删除本年的课程数据冰倩是当天及以后的----------------------
|
//-------------------删除本年的课程数据冰倩是当天及以后的----------------------
|
||||||
// QueryWrapper<KcKetangbiao> KcKetangbiaoQueryWrapper = new QueryWrapper<>();
|
QueryWrapper<KcKetangbiao> KcKetangbiaoQueryWrapper = new QueryWrapper<>();
|
||||||
// KcKetangbiaoQueryWrapper.eq("xnxq",kcSysConfig.getFlag1());
|
KcKetangbiaoQueryWrapper.eq("xnxq",kcSysConfig.getFlag1());
|
||||||
// KcKetangbiaoQueryWrapper.ge("skrq",DateUtils.formatDate(dateNow,"yyyy-MM-dd"));
|
KcKetangbiaoQueryWrapper.ge("skrq",DateUtils.formatDate(dateNow,"yyyy-MM-dd"));
|
||||||
// kcKetangbiaoService.remove(KcKetangbiaoQueryWrapper);
|
kcKetangbiaoService.remove(KcKetangbiaoQueryWrapper);
|
||||||
// //-------------------删除本年的课程数据冰倩是当天及以后的----------------------
|
//-------------------删除本年的课程数据冰倩是当天及以后的----------------------
|
||||||
//
|
|
||||||
// String bxqkssj = kcSysConfig.getBxqkssj();
|
String bxqkssj = kcSysConfig.getBxqkssj();
|
||||||
// //插入数据
|
//插入数据
|
||||||
// KcKetangbiao kcKetangbiao = new KcKetangbiao();
|
KcKetangbiao kcKetangbiao = new KcKetangbiao();
|
||||||
// kcKetangbiao.setXnxq(kcSysConfig.getFlag1());
|
kcKetangbiao.setXnxq(kcSysConfig.getFlag1());
|
||||||
// kcKetangbiao.setFlag("0");
|
kcKetangbiao.setFlag("0");
|
||||||
// List<KcKetangbiao> list = kcKetangbiaoService.selectSyncList(kcKetangbiao);
|
List<KcKetangbiao> list = kcKetangbiaoService.selectSyncList(kcKetangbiao);
|
||||||
// List<KcKetangbiao> arrayList = new ArrayList<>();
|
List<KcKetangbiao> arrayList = new ArrayList<>();
|
||||||
// for(int i=0;i<list.size();i++){
|
for(int i=0;i<list.size();i++){
|
||||||
// KcKetangbiao kcKetangbiaoOld = list.get(i);
|
KcKetangbiao kcKetangbiaoOld = list.get(i);
|
||||||
// try {
|
try {
|
||||||
// String jkzc[] = kcKetangbiaoOld.getJkzc().split(",");
|
String jkzc[] = kcKetangbiaoOld.getJkzc().split(",");
|
||||||
// String week = kcKetangbiaoOld.getWeek();
|
String week = kcKetangbiaoOld.getWeek();
|
||||||
// for(int j=0;j<jkzc.length;j++){
|
for(int j=0;j<jkzc.length;j++){
|
||||||
// KcKetangbiao kcKetangbiaoAddNew = new KcKetangbiao();
|
KcKetangbiao kcKetangbiaoAddNew = new KcKetangbiao();
|
||||||
// int djz = Integer.parseInt(jkzc[j]);
|
int djz = Integer.parseInt(jkzc[j]);
|
||||||
// BeanUtils.copyProperties(kcKetangbiaoOld,kcKetangbiaoAddNew);
|
BeanUtils.copyProperties(kcKetangbiaoOld,kcKetangbiaoAddNew);
|
||||||
// kcKetangbiaoAddNew.setId(null);
|
kcKetangbiaoAddNew.setId(null);
|
||||||
// //skrq 生成规则,取本学开始时间(kc_sys_config.bxqkssj)+(jkzc-1)*7+week
|
//skrq 生成规则,取本学开始时间(kc_sys_config.bxqkssj)+(jkzc-1)*7+week
|
||||||
// int addSj = (djz -1 )*7+Integer.parseInt(week)-1;
|
int addSj = (djz -1 )*7+Integer.parseInt(week)-1;
|
||||||
// Date date = DateUtils.parseDate(bxqkssj,"yyyy-MM-dd");
|
Date date = DateUtils.parseDate(bxqkssj,"yyyy-MM-dd");
|
||||||
// Calendar c = Calendar.getInstance();
|
Calendar c = Calendar.getInstance();
|
||||||
// c.setTime(date);
|
c.setTime(date);
|
||||||
// c.add(Calendar.DAY_OF_MONTH, addSj);
|
c.add(Calendar.DAY_OF_MONTH, addSj);
|
||||||
// String skrq = DateUtils.formatDate(c,"yyyy-MM-dd");
|
String skrq = DateUtils.formatDate(c,"yyyy-MM-dd");
|
||||||
// String dasj = DateUtils.formatDate(dateNow,"yyyy-MM-dd");
|
String dasj = DateUtils.formatDate(dateNow,"yyyy-MM-dd");
|
||||||
// //判断生成数据的skrq是否大于等于当前日期,如果满足则进行新增,否则不动
|
//判断生成数据的skrq是否大于等于当前日期,如果满足则进行新增,否则不动
|
||||||
// if(DateUtils.parseDate(skrq,"yyyy-MM-dd").getTime()>=DateUtils.parseDate(dasj,"yyyy-MM-dd").getTime()){
|
if(DateUtils.parseDate(skrq,"yyyy-MM-dd").getTime()>=DateUtils.parseDate(dasj,"yyyy-MM-dd").getTime()){
|
||||||
// kcKetangbiaoAddNew.setSkrq(skrq);
|
kcKetangbiaoAddNew.setSkrq(skrq);
|
||||||
// kcKetangbiaoAddNew.setDijizhou(djz);
|
kcKetangbiaoAddNew.setDijizhou(djz);
|
||||||
// kcKetangbiaoAddNew.setXnxq(kcSysConfig.getFlag1());
|
kcKetangbiaoAddNew.setXnxq(kcSysConfig.getFlag1());
|
||||||
// arrayList.add(kcKetangbiaoAddNew);
|
arrayList.add(kcKetangbiaoAddNew);
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
// }catch (Exception e){
|
}catch (Exception e){
|
||||||
// e.printStackTrace();
|
e.printStackTrace();
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
// kcKetangbiaoService.saveBatch(arrayList);
|
kcKetangbiaoService.saveBatch(arrayList);
|
||||||
//
|
|
||||||
// //修改智慧教室关联的课堂表id-- 清洗智慧教室数据
|
//修改智慧教室关联的课堂表id-- 清洗智慧教室数据
|
||||||
// kcKetangbiaoService.updateJsbh();
|
kcKetangbiaoService.updateJsbh();
|
||||||
//
|
|
||||||
// //修改智慧教室关联的课堂表id-- 清洗智慧教室数据
|
//修改智慧教室关联的课堂表id-- 清洗智慧教室数据
|
||||||
// KcKetangbiao kcKetangbiaoup = new KcKetangbiao();
|
KcKetangbiao kcKetangbiaoup = new KcKetangbiao();
|
||||||
// kcKetangbiaoup.setSkxs(1);
|
kcKetangbiaoup.setSkxs(1);
|
||||||
// kcKetangbiaoup.setXnxq(kcSysConfig.getFlag1());
|
kcKetangbiaoup.setXnxq(kcSysConfig.getFlag1());
|
||||||
// kcKetangbiaoService.updateSkxs(kcKetangbiaoup);
|
kcKetangbiaoService.updateSkxs(kcKetangbiaoup);
|
||||||
//
|
|
||||||
// //修改调停课时间
|
//修改调停课时间
|
||||||
// String dasj = DateUtils.formatDate(dateNow,"yyyy-MM-dd");
|
String dasj = DateUtils.formatDate(dateNow,"yyyy-MM-dd");
|
||||||
//
|
|
||||||
// QueryWrapper<KcKetangbiaoSkrqLog> kcKetangbiaoSkrqLogQueryWrapper = new QueryWrapper<>();
|
QueryWrapper<KcKetangbiaoSkrqLog> kcKetangbiaoSkrqLogQueryWrapper = new QueryWrapper<>();
|
||||||
// kcKetangbiaoSkrqLogQueryWrapper.ge("jsrq",dasj);
|
kcKetangbiaoSkrqLogQueryWrapper.ge("jsrq",dasj);
|
||||||
// List<KcKetangbiaoSkrqLog> list1 = kcKetangbiaoSkrqLogService.list(kcKetangbiaoSkrqLogQueryWrapper);
|
List<KcKetangbiaoSkrqLog> list1 = kcKetangbiaoSkrqLogService.list(kcKetangbiaoSkrqLogQueryWrapper);
|
||||||
// for(KcKetangbiaoSkrqLog KcKetangbiaoSkrqLog:list1){
|
for(KcKetangbiaoSkrqLog KcKetangbiaoSkrqLog:list1){
|
||||||
// UpdateWrapper<KcKetangbiao> KcKetangbiaoUpdateWrapper = new UpdateWrapper<>();
|
UpdateWrapper<KcKetangbiao> KcKetangbiaoUpdateWrapper = new UpdateWrapper<>();
|
||||||
// KcKetangbiaoUpdateWrapper.set("skrq",KcKetangbiaoSkrqLog.getTzrq());
|
KcKetangbiaoUpdateWrapper.set("skrq",KcKetangbiaoSkrqLog.getTzrq());
|
||||||
// KcKetangbiaoUpdateWrapper.eq("skrq",KcKetangbiaoSkrqLog.getSkrq());
|
KcKetangbiaoUpdateWrapper.eq("skrq",KcKetangbiaoSkrqLog.getSkrq());
|
||||||
// kcKetangbiaoService.update(KcKetangbiaoUpdateWrapper);
|
kcKetangbiaoService.update(KcKetangbiaoUpdateWrapper);
|
||||||
// }
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//---------------------20240416新增手动调停课逻辑------------------
|
//---------------------20240416新增手动调停课逻辑------------------
|
||||||
try {
|
try {
|
||||||
String dqsj = DateUtils.formatDate(dateNow,"yyyy-MM-dd");
|
editTtkxx();
|
||||||
QueryWrapper<KcTtksdpz> kcTtksdpzQueryWrapper = new QueryWrapper<>();
|
|
||||||
kcTtksdpzQueryWrapper.eq("fjsj",dqsj);
|
|
||||||
List<KcTtksdpz> 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<KcKetangbiao> 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<KcKetangbiao> 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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (Exception e){
|
} catch (Exception e){
|
||||||
e.printStackTrace();
|
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<KcTtksdpz> kcTtksdpzQueryWrapper = new QueryWrapper<>();
|
||||||
|
kcTtksdpzQueryWrapper.ge("fjsj",dqsj);
|
||||||
|
List<KcTtksdpz> 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<KcKetangbiao> 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<KcKetangbiao> 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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 无参定时任务实现
|
* 无参定时任务实现
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package org.jeecg.modules.kc.kcTtksdpz.controller;
|
package org.jeecg.modules.kc.kcTtksdpz.controller;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
@ -9,8 +10,12 @@ import java.io.UnsupportedEncodingException;
|
||||||
import java.net.URLDecoder;
|
import java.net.URLDecoder;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
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.api.vo.Result;
|
||||||
import org.jeecg.common.system.query.QueryGenerator;
|
import org.jeecg.common.system.query.QueryGenerator;
|
||||||
|
import org.jeecg.common.util.DateUtils;
|
||||||
import org.jeecg.common.util.oConvertUtils;
|
import org.jeecg.common.util.oConvertUtils;
|
||||||
import org.jeecg.modules.kc.kcTtksdpz.entity.KcTtksdpz;
|
import org.jeecg.modules.kc.kcTtksdpz.entity.KcTtksdpz;
|
||||||
import org.jeecg.modules.kc.kcTtksdpz.service.IKcTtksdpzService;
|
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 com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
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.ExcelImportUtil;
|
||||||
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
||||||
import org.jeecgframework.poi.excel.entity.ExportParams;
|
import org.jeecgframework.poi.excel.entity.ExportParams;
|
||||||
|
@ -50,6 +57,10 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
public class KcTtksdpzController extends JeecgController<KcTtksdpz, IKcTtksdpzService> {
|
public class KcTtksdpzController extends JeecgController<KcTtksdpz, IKcTtksdpzService> {
|
||||||
@Autowired
|
@Autowired
|
||||||
private IKcTtksdpzService kcTtksdpzService;
|
private IKcTtksdpzService kcTtksdpzService;
|
||||||
|
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IKcKetangbiaoService kcKetangbiaoService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 分页列表查询
|
* 分页列表查询
|
||||||
|
@ -84,6 +95,11 @@ public class KcTtksdpzController extends JeecgController<KcTtksdpz, IKcTtksdpzSe
|
||||||
@PostMapping(value = "/add")
|
@PostMapping(value = "/add")
|
||||||
public Result<String> add(@RequestBody KcTtksdpz kcTtksdpz) {
|
public Result<String> add(@RequestBody KcTtksdpz kcTtksdpz) {
|
||||||
kcTtksdpzService.save(kcTtksdpz);
|
kcTtksdpzService.save(kcTtksdpz);
|
||||||
|
try {
|
||||||
|
editTtkxx();
|
||||||
|
}catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
return Result.OK("添加成功!");
|
return Result.OK("添加成功!");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -98,6 +114,11 @@ public class KcTtksdpzController extends JeecgController<KcTtksdpz, IKcTtksdpzSe
|
||||||
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
|
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
|
||||||
public Result<String> edit(@RequestBody KcTtksdpz kcTtksdpz) {
|
public Result<String> edit(@RequestBody KcTtksdpz kcTtksdpz) {
|
||||||
kcTtksdpzService.updateById(kcTtksdpz);
|
kcTtksdpzService.updateById(kcTtksdpz);
|
||||||
|
try {
|
||||||
|
editTtkxx();
|
||||||
|
}catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
return Result.OK("编辑成功!");
|
return Result.OK("编辑成功!");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -173,4 +194,44 @@ public class KcTtksdpzController extends JeecgController<KcTtksdpz, IKcTtksdpzSe
|
||||||
return super.importExcel(request, response, KcTtksdpz.class);
|
return super.importExcel(request, response, KcTtksdpz.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private void editTtkxx() {
|
||||||
|
Date dateNow = new Date();
|
||||||
|
String dqsj = DateUtils.formatDate(dateNow,"yyyy-MM-dd");
|
||||||
|
QueryWrapper<KcTtksdpz> kcTtksdpzQueryWrapper = new QueryWrapper<>();
|
||||||
|
kcTtksdpzQueryWrapper.ge("fjsj",dqsj);
|
||||||
|
List<KcTtksdpz> 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<KcKetangbiao> 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<KcKetangbiao> 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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -308,7 +308,7 @@ public class KcKechengbiaoController extends JeecgController<KcKechengbiao, IKcK
|
||||||
List<ZyDbtx> dbtxList = zyDbtxService.getDbtxList(zyDbtx);
|
List<ZyDbtx> dbtxList = zyDbtxService.getDbtxList(zyDbtx);
|
||||||
for(KcKechengbiao par:pageList.getRecords()){
|
for(KcKechengbiao par:pageList.getRecords()){
|
||||||
for(ZyDbtx txPar : dbtxList){
|
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());
|
par.setDbtxType(txPar.getType());
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -149,6 +149,7 @@
|
||||||
rwbh,
|
rwbh,
|
||||||
skdd,
|
skdd,
|
||||||
xkrs,
|
xkrs,
|
||||||
|
jgh,
|
||||||
func_jc(GROUP_CONCAT( sksj
|
func_jc(GROUP_CONCAT( sksj
|
||||||
)) AS sksj
|
)) AS sksj
|
||||||
FROM
|
FROM
|
||||||
|
@ -163,6 +164,7 @@
|
||||||
rwbh,
|
rwbh,
|
||||||
skdd,
|
skdd,
|
||||||
xkrs,
|
xkrs,
|
||||||
|
jgh,
|
||||||
concat (
|
concat (
|
||||||
WEEK,
|
WEEK,
|
||||||
REPLACE ( hh, '、', '' ))
|
REPLACE ( hh, '、', '' ))
|
||||||
|
@ -182,7 +184,7 @@
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getStudentKclist" resultType="org.jeecg.modules.kc.ktgl.entity.KcKechengbiao">
|
<select id="getStudentKclist" resultType="org.jeecg.modules.kc.ktgl.entity.KcKechengbiao">
|
||||||
select distinct xkb.xh,kc.kcbh,kc.rwbh,kc.kcmc,kc.skjs,kc.skdd,kc.xkrs,kc.xqxn
|
select distinct xkb.xh,kc.kcbh,kc.rwbh,kc.kcmc,kc.skjs,kc.skdd,kc.xkrs,kc.xqxn,kc.jgh
|
||||||
from kc_kechengbiao kc,xxhbxsxkb xkb
|
from kc_kechengbiao kc,xxhbxsxkb xkb
|
||||||
${ew.customSqlSegment}
|
${ew.customSqlSegment}
|
||||||
</select>
|
</select>
|
||||||
|
@ -194,6 +196,10 @@
|
||||||
<if test="xqxn!=null and xqxn!=''">
|
<if test="xqxn!=null and xqxn!=''">
|
||||||
and xqxn = #{xqxn}
|
and xqxn = #{xqxn}
|
||||||
</if>
|
</if>
|
||||||
|
<if test="jgh!=null and jgh!=''">
|
||||||
|
and jgh = #{jgh}
|
||||||
|
</if>
|
||||||
|
limit 1
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
|
@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
import com.google.common.collect.Maps;
|
import com.google.common.collect.Maps;
|
||||||
import org.apache.commons.compress.utils.Lists;
|
import org.apache.commons.compress.utils.Lists;
|
||||||
|
import org.apache.commons.lang.StringUtils;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
import org.jeecg.common.system.query.QueryGenerator;
|
import org.jeecg.common.system.query.QueryGenerator;
|
||||||
import org.jeecg.common.util.oConvertUtils;
|
import org.jeecg.common.util.oConvertUtils;
|
||||||
|
@ -100,6 +101,7 @@ public class KcTeachingUnitContentOneController extends JeecgController<KcTeachi
|
||||||
@GetMapping(value = "/allList")
|
@GetMapping(value = "/allList")
|
||||||
public Result<List<KcTeachingUnitContentOne>> allList(KcTeachingUnitContentOne kcTeachingUnitContentOne, HttpServletRequest req) {
|
public Result<List<KcTeachingUnitContentOne>> allList(KcTeachingUnitContentOne kcTeachingUnitContentOne, HttpServletRequest req) {
|
||||||
QueryWrapper<KcTeachingUnitContentOne> queryWrapper = QueryGenerator.initQueryWrapper(kcTeachingUnitContentOne, req.getParameterMap());
|
QueryWrapper<KcTeachingUnitContentOne> queryWrapper = QueryGenerator.initQueryWrapper(kcTeachingUnitContentOne, req.getParameterMap());
|
||||||
|
queryWrapper.eq(StringUtils.isNotBlank(kcTeachingUnitContentOne.getTeano()),"create_by",kcTeachingUnitContentOne.getTeano());
|
||||||
List<KcTeachingUnitContentOne> list = kcTeachingUnitContentOneService.list(queryWrapper);
|
List<KcTeachingUnitContentOne> list = kcTeachingUnitContentOneService.list(queryWrapper);
|
||||||
|
|
||||||
//转成map
|
//转成map
|
||||||
|
@ -262,4 +264,12 @@ public class KcTeachingUnitContentOneController extends JeecgController<KcTeachi
|
||||||
// return super.importExcel(request, response, KcTeachingUnitContentOne.class);
|
// return super.importExcel(request, response, KcTeachingUnitContentOne.class);
|
||||||
// }
|
// }
|
||||||
|
|
||||||
|
|
||||||
|
@AutoLog(value = "发布教学单元内容")
|
||||||
|
@ApiOperation(value="发布教学单元内容", notes="发布教学单元内容")
|
||||||
|
@RequestMapping(value = "/editJxdyOne", method = {RequestMethod.PUT,RequestMethod.POST})
|
||||||
|
public Result<String> editJxdyOne(@RequestBody KcTeachingUnitContentOne kcTeachingUnitContentOne) {
|
||||||
|
kcTeachingUnitContentOneService.updateById(kcTeachingUnitContentOne);
|
||||||
|
return Result.OK("编辑成功!");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -66,7 +66,13 @@ public class KcTeachingUnitContentOne implements Serializable {
|
||||||
@Excel(name = "排序", width = 15)
|
@Excel(name = "排序", width = 15)
|
||||||
@ApiModelProperty(value = "排序")
|
@ApiModelProperty(value = "排序")
|
||||||
private java.lang.Integer sort;
|
private java.lang.Integer sort;
|
||||||
|
/**发布*/
|
||||||
|
@Excel(name = "发布", width = 15)
|
||||||
|
@ApiModelProperty(value = "发布")
|
||||||
|
private java.lang.String fabu;
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private List<KcTeachingUnitContentTwo> childrenList;
|
private List<KcTeachingUnitContentTwo> childrenList;
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String teano;
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,15 +41,18 @@ public class WjxDjxx {
|
||||||
@ApiModelProperty(value = "vid")
|
@ApiModelProperty(value = "vid")
|
||||||
private String vid;
|
private String vid;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Excel(name = "名称", width = 15)
|
|
||||||
@ApiModelProperty(value = "名称")
|
@ApiModelProperty(value = "名称")
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String title;
|
private String title;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@Excel(name = "序号", width = 15)
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String xuhao;
|
||||||
@Excel(name = "学号", width = 15)
|
@Excel(name = "学号", width = 15)
|
||||||
@ApiModelProperty(value = "学号")
|
@ApiModelProperty(value = "学号")
|
||||||
private String userId;
|
private String userId;
|
||||||
|
@ -74,15 +77,12 @@ public class WjxDjxx {
|
||||||
private Date commitTime;
|
private Date commitTime;
|
||||||
@Excel(name = "答卷用时", width = 15)
|
@Excel(name = "答卷用时", width = 15)
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
@ApiModelProperty(value = "问卷作答用时时分秒")
|
@ApiModelProperty(value = "答卷用时")
|
||||||
private String answerSfm;
|
private String answerSfm;
|
||||||
@Excel(name = "学期学年", width = 15)
|
|
||||||
@ApiModelProperty(value = "学期学年")
|
@ApiModelProperty(value = "学期学年")
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String xqxn;
|
private String xqxn;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "提交内容")
|
@ApiModelProperty(value = "提交内容")
|
||||||
private String submitData;
|
private String submitData;
|
||||||
@ApiModelProperty(value = "答卷编号")
|
@ApiModelProperty(value = "答卷编号")
|
||||||
|
|
|
@ -41,15 +41,18 @@ public class WjxDjxxDj {
|
||||||
@ApiModelProperty(value = "vid")
|
@ApiModelProperty(value = "vid")
|
||||||
private String vid;
|
private String vid;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Excel(name = "名称", width = 15)
|
|
||||||
@ApiModelProperty(value = "名称")
|
@ApiModelProperty(value = "名称")
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String title;
|
private String title;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "名称")
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String xuhao;
|
||||||
@Excel(name = "学号", width = 15)
|
@Excel(name = "学号", width = 15)
|
||||||
@ApiModelProperty(value = "学号")
|
@ApiModelProperty(value = "学号")
|
||||||
private String userId;
|
private String userId;
|
||||||
|
@ -70,7 +73,6 @@ public class WjxDjxxDj {
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
@ApiModelProperty(value = "问卷作答用时时分秒")
|
@ApiModelProperty(value = "问卷作答用时时分秒")
|
||||||
private String answerSfm;
|
private String answerSfm;
|
||||||
@Excel(name = "学期学年", width = 15)
|
|
||||||
@ApiModelProperty(value = "学期学年")
|
@ApiModelProperty(value = "学期学年")
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String xqxn;
|
private String xqxn;
|
||||||
|
|
|
@ -244,6 +244,7 @@ public class WjxDjxxServiceImpl extends ServiceImpl<WjxDjxxMapper, WjxDjxx> impl
|
||||||
zyDbtx.setRwbh(wjxWjxx.getRwbh());
|
zyDbtx.setRwbh(wjxWjxx.getRwbh());
|
||||||
zyDbtx.setContent(content);
|
zyDbtx.setContent(content);
|
||||||
zyDbtx.setFlag("0");
|
zyDbtx.setFlag("0");
|
||||||
|
zyDbtx.setFbr(user.getUsername());
|
||||||
zyDbtxService.save(zyDbtx);
|
zyDbtxService.save(zyDbtx);
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -6,8 +6,10 @@ import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
||||||
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
import org.jeecg.common.system.query.QueryGenerator;
|
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.entity.Xxhbbks;
|
||||||
import org.jeecg.modules.kc.grab.imports.service.IXxhbbksService;
|
import org.jeecg.modules.kc.grab.imports.service.IXxhbbksService;
|
||||||
import org.jeecg.modules.kc.wjxWjxx.entity.WjxWjxx;
|
import org.jeecg.modules.kc.wjxWjxx.entity.WjxWjxx;
|
||||||
|
@ -247,6 +249,8 @@ public class WjxWjxxController extends JeecgController<WjxWjxx, IWjxWjxxService>
|
||||||
zyDbtx.setRwbh(wjxWjxx.getRwbh());
|
zyDbtx.setRwbh(wjxWjxx.getRwbh());
|
||||||
zyDbtx.setContent(content);
|
zyDbtx.setContent(content);
|
||||||
zyDbtx.setFlag("0");
|
zyDbtx.setFlag("0");
|
||||||
|
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
|
zyDbtx.setFbr(user.getUsername());
|
||||||
zyDbtxService.save(zyDbtx);
|
zyDbtxService.save(zyDbtx);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -120,4 +120,6 @@ public class WjxWjxx implements Serializable {
|
||||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||||
private Date zyEndTime;
|
private Date zyEndTime;
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String teano;
|
||||||
}
|
}
|
||||||
|
|
|
@ -58,6 +58,9 @@
|
||||||
and a.rwbh = #{param.rwbh}
|
and a.rwbh = #{param.rwbh}
|
||||||
and a.xqxn = #{param.xqxn}
|
and a.xqxn = #{param.xqxn}
|
||||||
and a.atype = #{param.atype}
|
and a.atype = #{param.atype}
|
||||||
|
<if test="param.teano != null and param.teano != ''">
|
||||||
|
and a.create_by = #{param.teano}
|
||||||
|
</if>
|
||||||
<if test="param.title != null and param.title != ''">
|
<if test="param.title != null and param.title != ''">
|
||||||
and a.title like CONCAT('%', #{param.title}, '%')
|
and a.title like CONCAT('%', #{param.title}, '%')
|
||||||
</if>
|
</if>
|
||||||
|
|
|
@ -241,11 +241,25 @@ public class WjxWjxxTmlbController extends JeecgController<WjxWjxxTmlb, IWjxWjxx
|
||||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
|
|
||||||
List<WjxDjxx> pageList = wjxDjxxService.exportList(wjxDjxx);
|
List<WjxDjxx> pageList = wjxDjxxService.exportList(wjxDjxx);
|
||||||
// Step.4 AutoPoi 导出Excel
|
String xqxn = "";
|
||||||
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
|
String kcmc ="";
|
||||||
mv.addObject(NormalExcelConstants.FILE_NAME, "测验信息");
|
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.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);
|
mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
|
||||||
return mv;
|
return mv;
|
||||||
}
|
}
|
||||||
|
@ -257,11 +271,25 @@ public class WjxWjxxTmlbController extends JeecgController<WjxWjxxTmlb, IWjxWjxx
|
||||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
|
|
||||||
List<WjxDjxxDj> pageList = wjxDjxxService.exportDjXls(wjxDjxxdj);
|
List<WjxDjxxDj> 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
|
// Step.4 AutoPoi 导出Excel
|
||||||
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
|
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.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);
|
mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
|
||||||
return mv;
|
return mv;
|
||||||
}
|
}
|
||||||
|
|
|
@ -78,13 +78,30 @@ public class ZyCcjgServiceImpl extends ServiceImpl<ZyCcjgMapper, ZyCcjg> impleme
|
||||||
for(ZyCcjg par : list){
|
for(ZyCcjg par : list){
|
||||||
//查重类型(0外网 1内网 2aigc 3校内)
|
//查重类型(0外网 1内网 2aigc 3校内)
|
||||||
if(StringUtils.equals(par.getCcType(), "0")){
|
if(StringUtils.equals(par.getCcType(), "0")){
|
||||||
wwCxjcjg(par);
|
try {
|
||||||
|
wwCxjcjg(par);
|
||||||
|
}catch (Exception e){
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
}else if(StringUtils.equals(par.getCcType(), "1")){
|
}else if(StringUtils.equals(par.getCcType(), "1")){
|
||||||
xfwbdCxjcjg(par);
|
try {
|
||||||
|
xfwbdCxjcjg(par);
|
||||||
|
}catch (Exception e){
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
|
||||||
}else if(StringUtils.equals(par.getCcType(), "2")){
|
}else if(StringUtils.equals(par.getCcType(), "2")){
|
||||||
aigcCxjcjg(par);
|
try {
|
||||||
|
aigcCxjcjg(par);
|
||||||
|
}catch (Exception e){
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
}else if(StringUtils.equals(par.getCcType(), "3")){
|
}else if(StringUtils.equals(par.getCcType(), "3")){
|
||||||
xnCxjcjg(par);
|
try {
|
||||||
|
xnCxjcjg(par);
|
||||||
|
}catch (Exception e){
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException;
|
||||||
import java.net.URLDecoder;
|
import java.net.URLDecoder;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
|
import org.apache.commons.lang.StringUtils;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
import org.jeecg.common.system.query.QueryGenerator;
|
import org.jeecg.common.system.query.QueryGenerator;
|
||||||
import org.jeecg.common.util.oConvertUtils;
|
import org.jeecg.common.util.oConvertUtils;
|
||||||
|
@ -69,6 +71,7 @@ public class ZyCjwtController extends JeecgController<ZyCjwt, IZyCjwtService> {
|
||||||
HttpServletRequest req) {
|
HttpServletRequest req) {
|
||||||
QueryWrapper<ZyCjwt> queryWrapper = QueryGenerator.initQueryWrapper(zyCjwt, req.getParameterMap());
|
QueryWrapper<ZyCjwt> queryWrapper = QueryGenerator.initQueryWrapper(zyCjwt, req.getParameterMap());
|
||||||
Page<ZyCjwt> page = new Page<ZyCjwt>(pageNo, pageSize);
|
Page<ZyCjwt> page = new Page<ZyCjwt>(pageNo, pageSize);
|
||||||
|
queryWrapper.eq(StringUtils.isNotBlank(zyCjwt.getTeano()),"create_by",zyCjwt.getTeano());
|
||||||
IPage<ZyCjwt> pageList = zyCjwtService.page(page, queryWrapper);
|
IPage<ZyCjwt> pageList = zyCjwtService.page(page, queryWrapper);
|
||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,10 +4,8 @@ import java.io.Serializable;
|
||||||
import java.io.UnsupportedEncodingException;
|
import java.io.UnsupportedEncodingException;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.*;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
@ -68,4 +66,8 @@ public class ZyCjwt implements Serializable {
|
||||||
@Excel(name = "答案", width = 15)
|
@Excel(name = "答案", width = 15)
|
||||||
@ApiModelProperty(value = "答案")
|
@ApiModelProperty(value = "答案")
|
||||||
private java.lang.String answer;
|
private java.lang.String answer;
|
||||||
|
|
||||||
|
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String teano;
|
||||||
}
|
}
|
||||||
|
|
|
@ -74,4 +74,8 @@ public class ZyDbtx implements Serializable {
|
||||||
@Dict(dicCode = "yn")
|
@Dict(dicCode = "yn")
|
||||||
@ApiModelProperty(value = "标识")
|
@ApiModelProperty(value = "标识")
|
||||||
private java.lang.String flag;
|
private java.lang.String flag;
|
||||||
|
/**标识*/
|
||||||
|
@Excel(name = "发布人", width = 15)
|
||||||
|
@ApiModelProperty(value = "发布人")
|
||||||
|
private java.lang.String fbr;
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
<mapper namespace="org.jeecg.modules.kc.zyDbtx.mapper.ZyDbtxMapper">
|
<mapper namespace="org.jeecg.modules.kc.zyDbtx.mapper.ZyDbtxMapper">
|
||||||
|
|
||||||
<select id="getDbtxList" resultType="org.jeecg.modules.kc.zyDbtx.entity.ZyDbtx">
|
<select id="getDbtxList" resultType="org.jeecg.modules.kc.zyDbtx.entity.ZyDbtx">
|
||||||
select rwbh,GROUP_CONCAT(type) as type from zy_dbtx where create_by = #{createBy} GROUP BY rwbh
|
select rwbh,GROUP_CONCAT(type) as type,fbr from zy_dbtx where create_by = #{createBy} GROUP BY rwbh
|
||||||
</select>
|
</select>
|
||||||
</mapper>
|
</mapper>
|
|
@ -3,6 +3,8 @@ package org.jeecg.modules.kc.zyGonggao.controller;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
|
import org.apache.commons.lang.StringUtils;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
import org.jeecg.common.system.query.QueryGenerator;
|
import org.jeecg.common.system.query.QueryGenerator;
|
||||||
import org.jeecg.modules.kc.zyGonggao.entity.ZyGonggao;
|
import org.jeecg.modules.kc.zyGonggao.entity.ZyGonggao;
|
||||||
|
@ -52,6 +54,7 @@ public class ZyGonggaoController extends JeecgController<ZyGonggao, IZyGonggaoSe
|
||||||
HttpServletRequest req) {
|
HttpServletRequest req) {
|
||||||
QueryWrapper<ZyGonggao> queryWrapper = QueryGenerator.initQueryWrapper(zyGonggao, req.getParameterMap());
|
QueryWrapper<ZyGonggao> queryWrapper = QueryGenerator.initQueryWrapper(zyGonggao, req.getParameterMap());
|
||||||
Page<ZyGonggao> page = new Page<ZyGonggao>(pageNo, pageSize);
|
Page<ZyGonggao> page = new Page<ZyGonggao>(pageNo, pageSize);
|
||||||
|
queryWrapper.eq(StringUtils.isNotBlank(zyGonggao.getTeano()),"create_by",zyGonggao.getTeano());
|
||||||
IPage<ZyGonggao> pageList = zyGonggaoService.page(page, queryWrapper);
|
IPage<ZyGonggao> pageList = zyGonggaoService.page(page, queryWrapper);
|
||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
}
|
}
|
||||||
|
|
|
@ -70,13 +70,18 @@ public class ZyGonggao implements Serializable {
|
||||||
@ApiModelProperty(value = "发布时间")
|
@ApiModelProperty(value = "发布时间")
|
||||||
private java.util.Date fbTime;
|
private java.util.Date fbTime;
|
||||||
|
|
||||||
|
|
||||||
|
private java.lang.String rwbh;
|
||||||
|
|
||||||
|
private java.lang.String xqxn;
|
||||||
|
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private java.lang.String flag;
|
private java.lang.String flag;
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private java.lang.String originId;
|
private java.lang.String originId;
|
||||||
|
|
||||||
private java.lang.String rwbh;
|
@TableField(exist = false)
|
||||||
|
private String teano;
|
||||||
private java.lang.String xqxn;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.apache.commons.lang.StringUtils;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
|
@ -76,6 +77,7 @@ public class ZyInfoController extends JeecgController<ZyInfo, IZyInfoService> {
|
||||||
HttpServletRequest req) {
|
HttpServletRequest req) {
|
||||||
QueryWrapper<ZyInfo> queryWrapper = QueryGenerator.initQueryWrapper("a",zyInfo, req.getParameterMap());
|
QueryWrapper<ZyInfo> queryWrapper = QueryGenerator.initQueryWrapper("a",zyInfo, req.getParameterMap());
|
||||||
Page<ZyInfo> page = new Page<ZyInfo>(pageNo, pageSize);
|
Page<ZyInfo> page = new Page<ZyInfo>(pageNo, pageSize);
|
||||||
|
queryWrapper.eq(StringUtils.isNotBlank(zyInfo.getTeano()),"a.create_by",zyInfo.getTeano());
|
||||||
IPage<ZyInfo> pageList = zyInfoService.page(page, queryWrapper);
|
IPage<ZyInfo> pageList = zyInfoService.page(page, queryWrapper);
|
||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
}
|
}
|
||||||
|
@ -157,6 +159,8 @@ public class ZyInfoController extends JeecgController<ZyInfo, IZyInfoService> {
|
||||||
zyDbtx.setRwbh(zyInfo.getRwbh());
|
zyDbtx.setRwbh(zyInfo.getRwbh());
|
||||||
zyDbtx.setContent("您有一条作业需要提交!");
|
zyDbtx.setContent("您有一条作业需要提交!");
|
||||||
zyDbtx.setFlag("0");
|
zyDbtx.setFlag("0");
|
||||||
|
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
|
zyDbtx.setFbr(user.getUsername());
|
||||||
zyDbtxService.save(zyDbtx);
|
zyDbtxService.save(zyDbtx);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -247,6 +251,7 @@ public class ZyInfoController extends JeecgController<ZyInfo, IZyInfoService> {
|
||||||
queryWrapper.apply("a.id = b.main_id ");
|
queryWrapper.apply("a.id = b.main_id ");
|
||||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
queryWrapper.eq("b.create_by",sysUser.getUsername());
|
queryWrapper.eq("b.create_by",sysUser.getUsername());
|
||||||
|
queryWrapper.eq(StringUtils.isNotBlank(zyInfo.getTeano()),"a.create_by",zyInfo.getTeano());
|
||||||
IPage<ZyInfo> pageList = zyInfoService.stuList(page, queryWrapper);
|
IPage<ZyInfo> pageList = zyInfoService.stuList(page, queryWrapper);
|
||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
}
|
}
|
||||||
|
|
|
@ -150,6 +150,8 @@ public class ZyInfo implements Serializable {
|
||||||
private String nwxsl;
|
private String nwxsl;
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String aigcxsl;
|
private String aigcxsl;
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String teano;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,8 +15,10 @@ import javax.servlet.http.HttpServletResponse;
|
||||||
import cn.hutool.core.io.FileUtil;
|
import cn.hutool.core.io.FileUtil;
|
||||||
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
||||||
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
import org.jeecg.common.system.query.QueryGenerator;
|
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.DateUtils;
|
||||||
import org.jeecg.common.util.SpringContextHolder;
|
import org.jeecg.common.util.SpringContextHolder;
|
||||||
import org.jeecg.common.util.oConvertUtils;
|
import org.jeecg.common.util.oConvertUtils;
|
||||||
|
@ -179,6 +181,8 @@ public class ZyInfoStudentController extends JeecgController<ZyInfoStudent, IZyI
|
||||||
zyDbtx.setRwbh(zyInfo.getRwbh());
|
zyDbtx.setRwbh(zyInfo.getRwbh());
|
||||||
zyDbtx.setContent("您有一条新的评分,请及时查看!");
|
zyDbtx.setContent("您有一条新的评分,请及时查看!");
|
||||||
zyDbtx.setFlag("0");
|
zyDbtx.setFlag("0");
|
||||||
|
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
|
zyDbtx.setFbr(user.getUsername());
|
||||||
zyDbtxService.save(zyDbtx);
|
zyDbtxService.save(zyDbtx);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -223,12 +227,47 @@ public class ZyInfoStudentController extends JeecgController<ZyInfoStudent, IZyI
|
||||||
*/
|
*/
|
||||||
@AutoLog(value = "学生提交作业-批量删除")
|
@AutoLog(value = "学生提交作业-批量删除")
|
||||||
@ApiOperation(value="学生提交作业-批量删除", notes="学生提交作业-批量删除")
|
@ApiOperation(value="学生提交作业-批量删除", notes="学生提交作业-批量删除")
|
||||||
@RequiresPermissions("zyInfoStudent:zy_info_student:deleteBatch")
|
@PostMapping(value = "/fabuBatch")
|
||||||
@DeleteMapping(value = "/deleteBatch")
|
public Result<String> fabuBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||||
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
this.zyInfoStudentService.fabuBatch(Arrays.asList(ids.split(",")));
|
||||||
this.zyInfoStudentService.removeByIds(Arrays.asList(ids.split(",")));
|
|
||||||
return Result.OK("批量删除成功!");
|
try {
|
||||||
|
String idsList[] = ids.split(",");
|
||||||
|
if(idsList.length>0){
|
||||||
|
ZyInfoStudent zyInfoStudentPar = zyInfoStudentService.getById(idsList[0]);
|
||||||
|
QueryWrapper<ZyInfoStudent> zyInfoStudentQueryWrapper = new QueryWrapper<>();
|
||||||
|
zyInfoStudentQueryWrapper.eq("main_id",zyInfoStudentPar.getMainId());
|
||||||
|
List<ZyInfoStudent> list = zyInfoStudentService.list(zyInfoStudentQueryWrapper);
|
||||||
|
int a = list.size();
|
||||||
|
|
||||||
|
QueryWrapper<ZyInfoStudent> zyInfoStudentQueryWrapper2 = new QueryWrapper<>();
|
||||||
|
zyInfoStudentQueryWrapper2.eq("main_id",zyInfoStudentPar.getMainId());
|
||||||
|
zyInfoStudentQueryWrapper2.eq("score_fabu","1");
|
||||||
|
List<ZyInfoStudent> list2 = zyInfoStudentService.list(zyInfoStudentQueryWrapper2);
|
||||||
|
int b = list2.size();
|
||||||
|
if(a==b){
|
||||||
|
UpdateWrapper<ZyInfo> 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<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||||
|
this.zyInfoStudentService.removeByIds(Arrays.asList(ids.split(",")));
|
||||||
|
return Result.OK("批量删除成功!");
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 通过id查询
|
* 通过id查询
|
||||||
|
@ -320,6 +359,8 @@ public class ZyInfoStudentController extends JeecgController<ZyInfoStudent, IZyI
|
||||||
zyDbtx.setRwbh(zyInfo.getRwbh());
|
zyDbtx.setRwbh(zyInfo.getRwbh());
|
||||||
zyDbtx.setContent("您有一条新的作业待审批!");
|
zyDbtx.setContent("您有一条新的作业待审批!");
|
||||||
zyDbtx.setFlag("0");
|
zyDbtx.setFlag("0");
|
||||||
|
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
|
zyDbtx.setFbr(user.getUsername());
|
||||||
zyDbtxService.save(zyDbtx);
|
zyDbtxService.save(zyDbtx);
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -112,6 +112,8 @@ public class ZyInfoStudent implements Serializable {
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String aigccc;
|
private String aigccc;
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
|
private String xncc;
|
||||||
|
@TableField(exist = false)
|
||||||
private String zyname;
|
private String zyname;
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String teacherNo;
|
private String teacherNo;
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="cdxxlist" resultType="org.jeecg.modules.kc.zyInfoStudent.entity.ZyInfoStudent">
|
<select id="cdxxlist" resultType="org.jeecg.modules.kc.zyInfoStudent.entity.ZyInfoStudent">
|
||||||
select a.*,b.wwcc,b.nwcc,b.aigccc,b.title as zyname from zy_info_student a
|
select a.*,b.wwcc,b.nwcc,b.aigccc,b.xncc,b.title as zyname from zy_info_student a
|
||||||
left join zy_info b on a.main_id = b.id
|
left join zy_info b on a.main_id = b.id
|
||||||
${ew.customSqlSegment}
|
${ew.customSqlSegment}
|
||||||
</select>
|
</select>
|
||||||
|
|
|
@ -29,4 +29,6 @@ public interface IZyInfoStudentService extends IService<ZyInfoStudent> {
|
||||||
IPage<ZyInfoStudent> cdxxlist(Page<ZyInfoStudent> page, QueryWrapper<ZyInfoStudent> queryWrapper);
|
IPage<ZyInfoStudent> cdxxlist(Page<ZyInfoStudent> page, QueryWrapper<ZyInfoStudent> queryWrapper);
|
||||||
|
|
||||||
List<ZyInfoStudent> getCcjg(ZyInfoStudent zyInfoStudent);
|
List<ZyInfoStudent> getCcjg(ZyInfoStudent zyInfoStudent);
|
||||||
|
|
||||||
|
void fabuBatch(List<String> asList);
|
||||||
}
|
}
|
||||||
|
|
|
@ -155,6 +155,16 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl<ZyInfoStudentMapper, Z
|
||||||
return baseMapper.getCcjg(zyInfoStudent);
|
return baseMapper.getCcjg(zyInfoStudent);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void fabuBatch(List<String> 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提交
|
//aigc提交
|
||||||
private void aigcSave(ZyInfoStudent zyInfoStudent,HttpServletResponse response) {
|
private void aigcSave(ZyInfoStudent zyInfoStudent,HttpServletResponse response) {
|
||||||
String url = "https://vims.fanyu.com/tool/AIGCCheck/paperSubmit";
|
String url = "https://vims.fanyu.com/tool/AIGCCheck/paperSubmit";
|
||||||
|
|
|
@ -150,6 +150,7 @@ public class ZyJxdgController extends JeecgController<ZyJxdg, IZyJxdgService> {
|
||||||
KcKechengbiao kcKechengbiao = new KcKechengbiao();
|
KcKechengbiao kcKechengbiao = new KcKechengbiao();
|
||||||
kcKechengbiao.setRwbh(zyJxdg.getRwbh());
|
kcKechengbiao.setRwbh(zyJxdg.getRwbh());
|
||||||
kcKechengbiao.setXqxn(zyJxdg.getXqxn());
|
kcKechengbiao.setXqxn(zyJxdg.getXqxn());
|
||||||
|
kcKechengbiao.setJgh(zyJxdg.getTeano());
|
||||||
kcKechengbiao = kcKechengbiaoService.getKcbhByRwbh(kcKechengbiao);
|
kcKechengbiao = kcKechengbiaoService.getKcbhByRwbh(kcKechengbiao);
|
||||||
if(kcKechengbiao != null){
|
if(kcKechengbiao != null){
|
||||||
zyJxdg.setKcbh(kcKechengbiao.getKcbh());
|
zyJxdg.setKcbh(kcKechengbiao.getKcbh());
|
||||||
|
@ -303,10 +304,11 @@ public class ZyJxdgController extends JeecgController<ZyJxdg, IZyJxdgService> {
|
||||||
|
|
||||||
@ApiOperation(value="获取课程介绍和教学大纲内容", notes="获取课程介绍和教学大纲内容")
|
@ApiOperation(value="获取课程介绍和教学大纲内容", notes="获取课程介绍和教学大纲内容")
|
||||||
@GetMapping(value = "/getKcjsJxdg")
|
@GetMapping(value = "/getKcjsJxdg")
|
||||||
public Result<ZyJxdg> getKcjsJxdg(@RequestParam(name="rwbh",required=true) String rwbh,@RequestParam(name="xqxn",required=true) String xqxn) {
|
public Result<ZyJxdg> getKcjsJxdg(@RequestParam(name="rwbh",required=true) String rwbh,@RequestParam(name="xqxn",required=true) String xqxn,@RequestParam(name="teano",required=false) String teano) {
|
||||||
QueryWrapper<ZyJxdg> queryWrapper = new QueryWrapper<ZyJxdg>();
|
QueryWrapper<ZyJxdg> queryWrapper = new QueryWrapper<ZyJxdg>();
|
||||||
queryWrapper.eq("rwbh",rwbh);
|
queryWrapper.eq("rwbh",rwbh);
|
||||||
queryWrapper.eq("xqxn",xqxn);
|
queryWrapper.eq("xqxn",xqxn);
|
||||||
|
queryWrapper.eq("create_by",teano);
|
||||||
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
// queryWrapper.eq("create_by",sysUser.getUsername());
|
// queryWrapper.eq("create_by",sysUser.getUsername());
|
||||||
queryWrapper.last("limit 1");
|
queryWrapper.last("limit 1");
|
||||||
|
|
|
@ -4,10 +4,8 @@ import java.io.Serializable;
|
||||||
import java.io.UnsupportedEncodingException;
|
import java.io.UnsupportedEncodingException;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.*;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
@ -87,4 +85,6 @@ public class ZyJxdg implements Serializable {
|
||||||
@Excel(name = "pdf附件", width = 15)
|
@Excel(name = "pdf附件", width = 15)
|
||||||
@ApiModelProperty(value = "pdf附件")
|
@ApiModelProperty(value = "pdf附件")
|
||||||
private java.lang.String jxrlPdfPath;
|
private java.lang.String jxrlPdfPath;
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String teano;
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,9 +10,11 @@ import java.net.URLDecoder;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
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.api.vo.Result;
|
||||||
import org.jeecg.common.system.query.QueryGenerator;
|
import org.jeecg.common.system.query.QueryGenerator;
|
||||||
|
import org.jeecg.common.system.vo.LoginUser;
|
||||||
import org.jeecg.common.util.oConvertUtils;
|
import org.jeecg.common.util.oConvertUtils;
|
||||||
import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks;
|
import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks;
|
||||||
import org.jeecg.modules.kc.grab.imports.service.IXxhbbksService;
|
import org.jeecg.modules.kc.grab.imports.service.IXxhbbksService;
|
||||||
|
@ -82,6 +84,7 @@ public class ZyTlqController extends JeecgController<ZyTlq, IZyTlqService> {
|
||||||
HttpServletRequest req) {
|
HttpServletRequest req) {
|
||||||
QueryWrapper<ZyTlq> queryWrapper = QueryGenerator.initQueryWrapper(zyTlq, req.getParameterMap());
|
QueryWrapper<ZyTlq> queryWrapper = QueryGenerator.initQueryWrapper(zyTlq, req.getParameterMap());
|
||||||
Page<ZyTlq> page = new Page<ZyTlq>(pageNo, pageSize);
|
Page<ZyTlq> page = new Page<ZyTlq>(pageNo, pageSize);
|
||||||
|
queryWrapper.eq(StringUtils.isNotBlank(zyTlq.getTeano()),"create_by",zyTlq.getTeano());
|
||||||
IPage<ZyTlq> pageList = zyTlqService.page(page, queryWrapper);
|
IPage<ZyTlq> pageList = zyTlqService.page(page, queryWrapper);
|
||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
}
|
}
|
||||||
|
@ -209,6 +212,8 @@ public class ZyTlqController extends JeecgController<ZyTlq, IZyTlqService> {
|
||||||
zyDbtx.setRwbh(par.getRwbh());
|
zyDbtx.setRwbh(par.getRwbh());
|
||||||
zyDbtx.setContent("您有一条新的讨论话题,请即时进行讨论");
|
zyDbtx.setContent("您有一条新的讨论话题,请即时进行讨论");
|
||||||
zyDbtx.setFlag("0");
|
zyDbtx.setFlag("0");
|
||||||
|
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
|
zyDbtx.setFbr(user.getUsername());
|
||||||
zyDbtxService.save(zyDbtx);
|
zyDbtxService.save(zyDbtx);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,10 +4,8 @@ import java.io.Serializable;
|
||||||
import java.io.UnsupportedEncodingException;
|
import java.io.UnsupportedEncodingException;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.*;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
@ -70,4 +68,8 @@ public class ZyTlq implements Serializable {
|
||||||
private java.lang.String rwbh;
|
private java.lang.String rwbh;
|
||||||
private java.lang.String sffb;
|
private java.lang.String sffb;
|
||||||
|
|
||||||
|
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String teano;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -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
|
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
|
#local\minio\alioss
|
||||||
uploadType: local
|
# uploadType: local
|
||||||
|
uploadType: sftp
|
||||||
# 前端访问地址
|
# 前端访问地址
|
||||||
domainUrl:
|
domainUrl:
|
||||||
pc: http://210.47.17.166
|
pc: http://210.47.17.166
|
||||||
|
@ -343,4 +344,14 @@ weipu:
|
||||||
wjx:
|
wjx:
|
||||||
appid: 1321039
|
appid: 1321039
|
||||||
appkey: 55328ebd11964fc8b40c10011bcb425d
|
appkey: 55328ebd11964fc8b40c10011bcb425d
|
||||||
url: https://www.wjx.cn/openapi/default.aspx
|
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
|
Loading…
Reference in New Issue