yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加听课要求列表

This commit is contained in:
yangjun 2023-10-19 20:00:27 +08:00
parent e873e31b43
commit 9335be053d
6 changed files with 135 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,8 @@ import org.jeecg.modules.kc.config.service.IKcExportConfigTpkwcqkjzglxService;
import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi; import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi;
import org.jeecg.modules.kc.grab.imports.entity.Xxhbuser; import org.jeecg.modules.kc.grab.imports.entity.Xxhbuser;
import org.jeecg.modules.kc.grab.imports.service.IXxhbuserService; import org.jeecg.modules.kc.grab.imports.service.IXxhbuserService;
import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig;
import org.jeecg.modules.kc.kcSysConfig.service.IKcSysConfigService;
import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory; import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory;
import org.jeecg.modules.kc.qa.entity.KcEvaluation; import org.jeecg.modules.kc.qa.entity.KcEvaluation;
import org.jeecg.modules.kc.qa.service.IKcEvaluationService; import org.jeecg.modules.kc.qa.service.IKcEvaluationService;
@ -69,6 +71,8 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
@Autowired @Autowired
private IKcEvaluationService evaluationService; private IKcEvaluationService evaluationService;
@Autowired
private IKcSysConfigService kcSysConfigService;
@Value("${jeecg.path.upload}") @Value("${jeecg.path.upload}")
private String upLoadPath; private String upLoadPath;
@ -404,4 +408,24 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
ExportWord.download_pdf(request, response, "file", wo); ExportWord.download_pdf(request, response, "file", wo);
} }
@ApiOperation(value="获取听课要求次数", notes="获取听课要求次数")
@GetMapping(value = "/queryTkyqPageList")
public Result<IPage<KcExportConfigTpkwcqkjzglx>> queryTkyqPageList(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<KcExportConfigTpkwcqkjzglx> queryWrapper = QueryGenerator.initQueryWrapper(kcExportConfigTpkwcqkjzglx, req.getParameterMap());
KcSysConfig kcSysConfig = kcSysConfigService.getById("1");
queryWrapper.eq("a.xqxn",kcSysConfig.getFlag1());
queryWrapper.apply("a.tklx is not null");
queryWrapper.groupBy("a.tklx,b.item_text,a.xqxn");
Page<KcExportConfigTpkwcqkjzglx> page = new Page<>(pageNo, pageSize);
IPage<KcExportConfigTpkwcqkjzglx> pageList = kcExportConfigTpkwcqkjzglxService.queryTkyqPageList(page, queryWrapper);
return Result.OK(pageList);
}
} }

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

@ -1,6 +1,11 @@
package org.jeecg.modules.kc.config.mapper; package org.jeecg.modules.kc.config.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx; import org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx;
/** /**
@ -11,4 +16,5 @@ import org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx;
*/ */
public interface KcExportConfigTpkwcqkjzglxMapper extends BaseMapper<KcExportConfigTpkwcqkjzglx> { public interface KcExportConfigTpkwcqkjzglxMapper extends BaseMapper<KcExportConfigTpkwcqkjzglx> {
IPage<KcExportConfigTpkwcqkjzglx> queryTkyqPageList(Page<KcExportConfigTpkwcqkjzglx> page, @Param(Constants.WRAPPER) QueryWrapper<KcExportConfigTpkwcqkjzglx> queryWrapper);
} }

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

@ -24,4 +24,11 @@
<!-- ${ew.customSqlSegment}--> <!-- ${ew.customSqlSegment}-->
<!-- </select>--> <!-- </select>-->
<select id="queryTkyqPageList" resultType="org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx">
select a.tklx,max(a.ytkcs) as ytkcs,b.item_text as sf,a.xqxn from kc_export_config_tpkwcqkjzglx a
left join sys_dict_item b on a.tklx = b.item_value and b.dict_id = '1682386362753224705'
${ew.customSqlSegment}
</select>
</mapper> </mapper>

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

@ -1,5 +1,8 @@
package org.jeecg.modules.kc.config.service; package org.jeecg.modules.kc.config.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx; import org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx;
@ -12,4 +15,6 @@ import org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx;
public interface IKcExportConfigTpkwcqkjzglxService extends IService<KcExportConfigTpkwcqkjzglx> { public interface IKcExportConfigTpkwcqkjzglxService extends IService<KcExportConfigTpkwcqkjzglx> {
void editAll(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx); void editAll(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx);
IPage<KcExportConfigTpkwcqkjzglx> queryTkyqPageList(Page<KcExportConfigTpkwcqkjzglx> page, QueryWrapper<KcExportConfigTpkwcqkjzglx> queryWrapper);
} }

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

@ -2,6 +2,8 @@ package org.jeecg.modules.kc.config.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx; import org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx;
@ -83,4 +85,9 @@ public class KcExportConfigTpkwcqkjzglxServiceImpl extends ServiceImpl<KcExportC
} }
} }
@Override
public IPage<KcExportConfigTpkwcqkjzglx> queryTkyqPageList(Page<KcExportConfigTpkwcqkjzglx> page, QueryWrapper<KcExportConfigTpkwcqkjzglx> queryWrapper) {
return baseMapper.queryTkyqPageList(page,queryWrapper);
}
} }

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

@ -71,92 +71,92 @@ 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("zc",KcKechengbiaoPar.getZc()); kcKechengbiaoQueryWrapper.eq("zc",KcKechengbiaoPar.getZc());
// 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("jsbh",KcKechengbiaoPar.getJsbh()); kcKechengbiaoQueryWrapper.eq("jsbh",KcKechengbiaoPar.getJsbh());
// 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){
// BeanUtils.copyProperties(KcKechengbiaoPar,KcKechengbiao); BeanUtils.copyProperties(KcKechengbiaoPar,KcKechengbiao);
// kcKechengbiaoService.updateById(KcKechengbiao); kcKechengbiaoService.updateById(KcKechengbiao);
// } }
// }else{ }else{
// kcKechengbiaoService.saveOne(KcKechengbiaoPar); kcKechengbiaoService.saveOne(KcKechengbiaoPar);
// } }
// } }
// //-----------------初始化数据------------------------ //-----------------初始化数据------------------------
//
// //-------------------删除本年的课程数据冰倩是当天及以后的---------------------- //-------------------删除本年的课程数据冰倩是当天及以后的----------------------
// 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());
// 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");