修改bug
This commit is contained in:
parent
d171890732
commit
e00e49ba4c
|
@ -68,6 +68,7 @@ public class KcXqxnHistoryController extends JeecgController<KcXqxnHistory, IKcX
|
||||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||||
HttpServletRequest req) {
|
HttpServletRequest req) {
|
||||||
QueryWrapper<KcXqxnHistory> queryWrapper = QueryGenerator.initQueryWrapper(kcXqxnHistory, req.getParameterMap());
|
QueryWrapper<KcXqxnHistory> queryWrapper = QueryGenerator.initQueryWrapper(kcXqxnHistory, req.getParameterMap());
|
||||||
|
queryWrapper.orderByDesc("start_time");
|
||||||
Page<KcXqxnHistory> page = new Page<KcXqxnHistory>(pageNo, pageSize);
|
Page<KcXqxnHistory> page = new Page<KcXqxnHistory>(pageNo, pageSize);
|
||||||
IPage<KcXqxnHistory> pageList = kcXqxnHistoryService.page(page, queryWrapper);
|
IPage<KcXqxnHistory> pageList = kcXqxnHistoryService.page(page, queryWrapper);
|
||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
|
|
|
@ -707,7 +707,9 @@ public class KcZzThpjbController extends JeecgController<KcZzThpjb, IKcZzThpjbSe
|
||||||
//1200条 saveBatch消耗时间3687毫秒 循环插入消耗时间5212毫秒
|
//1200条 saveBatch消耗时间3687毫秒 循环插入消耗时间5212毫秒
|
||||||
log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
|
log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
|
||||||
//update-end-author:taoyan date:20190528 for:批量插入数据
|
//update-end-author:taoyan date:20190528 for:批量插入数据
|
||||||
rest = "文件导入成功数据行数:" + newList.size();
|
if(newList.size()>0){
|
||||||
|
rest = "文件导入成功!数据行数:" + newList.size();
|
||||||
|
}
|
||||||
if(StringUtils.isNotBlank(errorRest)){
|
if(StringUtils.isNotBlank(errorRest)){
|
||||||
errorRest = "<br/>共错误:"+errNum+"行;错误数据如下:<br/>"+errorRest;
|
errorRest = "<br/>共错误:"+errNum+"行;错误数据如下:<br/>"+errorRest;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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;
|
||||||
|
@ -215,4 +213,7 @@ public class KcZzThpjb implements Serializable {
|
||||||
// @Excel(name = "19.其它建议", width = 15)
|
// @Excel(name = "19.其它建议", width = 15)
|
||||||
@ApiModelProperty(value = "19.其它建议")
|
@ApiModelProperty(value = "19.其它建议")
|
||||||
private java.lang.String ans19;
|
private java.lang.String ans19;
|
||||||
|
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String xqxn;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,4 +2,9 @@
|
||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="org.jeecg.modules.kc.kcZzThpjb.mapper.KcZzThpjbMapper">
|
<mapper namespace="org.jeecg.modules.kc.kcZzThpjb.mapper.KcZzThpjbMapper">
|
||||||
|
|
||||||
|
<select id="selectPage" resultType="org.jeecg.modules.kc.kcZzThpjb.entity.KcZzThpjb">
|
||||||
|
select a.*,b.title as xqxn from kc_zz_thpjb a
|
||||||
|
LEFT JOIN kc_xqxn_history b on a.sksj >= b.start_time + '' and a.sksj <= b.end_time +''
|
||||||
|
${ew.customSqlSegment}
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
|
@ -467,7 +467,10 @@ public class KcZzXstkbController extends JeecgController<KcZzXstkb, IKcZzXstkbSe
|
||||||
//1200条 saveBatch消耗时间3687毫秒 循环插入消耗时间5212毫秒
|
//1200条 saveBatch消耗时间3687毫秒 循环插入消耗时间5212毫秒
|
||||||
log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
|
log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
|
||||||
//update-end-author:taoyan date:20190528 for:批量插入数据
|
//update-end-author:taoyan date:20190528 for:批量插入数据
|
||||||
rest = "文件导入成功!数据行数:" + newList.size();
|
// rest = "文件导入成功!数据行数:" + newList.size();
|
||||||
|
if(newList.size()>0){
|
||||||
|
rest = "文件导入成功!数据行数:" + newList.size();
|
||||||
|
}
|
||||||
if(StringUtils.isNotBlank(errorRest)){
|
if(StringUtils.isNotBlank(errorRest)){
|
||||||
errorRest = "<br/>共错误:"+errNum+"行;错误数据如下:<br/>"+errorRest;
|
errorRest = "<br/>共错误:"+errNum+"行;错误数据如下:<br/>"+errorRest;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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;
|
||||||
|
@ -142,4 +140,7 @@ public class KcZzXstkb implements Serializable {
|
||||||
@Excel(name = "10.其它建议", width = 15)
|
@Excel(name = "10.其它建议", width = 15)
|
||||||
@ApiModelProperty(value = "10.其它建议")
|
@ApiModelProperty(value = "10.其它建议")
|
||||||
private java.lang.String pjnr;
|
private java.lang.String pjnr;
|
||||||
|
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String xqxn;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,4 +2,9 @@
|
||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="org.jeecg.modules.kc.kcZzXstkb.mapper.KcZzXstkbMapper">
|
<mapper namespace="org.jeecg.modules.kc.kcZzXstkb.mapper.KcZzXstkbMapper">
|
||||||
|
|
||||||
|
<select id="selectPage" resultType="org.jeecg.modules.kc.kcZzXstkb.entity.KcZzXstkb">
|
||||||
|
select a.*,b.title as xqxn from kc_zz_xstkb a
|
||||||
|
LEFT JOIN kc_xqxn_history b on a.sksj >= b.start_time + '' and a.sksj <= b.end_time +''
|
||||||
|
${ew.customSqlSegment}
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
|
@ -97,7 +97,7 @@ public class KcZzYbtkbController extends JeecgController<KcZzYbtkb, IKcZzYbtkbSe
|
||||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||||
HttpServletRequest req) {
|
HttpServletRequest req) {
|
||||||
QueryWrapper<KcZzYbtkb> queryWrapper = QueryGenerator.initQueryWrapper(kcZzYbtkb, req.getParameterMap());
|
QueryWrapper<KcZzYbtkb> queryWrapper = QueryGenerator.initQueryWrapper("a",kcZzYbtkb, req.getParameterMap());
|
||||||
Page<KcZzYbtkb> page = new Page<KcZzYbtkb>(pageNo, pageSize);
|
Page<KcZzYbtkb> page = new Page<KcZzYbtkb>(pageNo, pageSize);
|
||||||
IPage<KcZzYbtkb> pageList = kcZzYbtkbService.page(page, queryWrapper);
|
IPage<KcZzYbtkb> pageList = kcZzYbtkbService.page(page, queryWrapper);
|
||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
|
@ -472,7 +472,10 @@ public class KcZzYbtkbController extends JeecgController<KcZzYbtkb, IKcZzYbtkbSe
|
||||||
//1200条 saveBatch消耗时间3687毫秒 循环插入消耗时间5212毫秒
|
//1200条 saveBatch消耗时间3687毫秒 循环插入消耗时间5212毫秒
|
||||||
log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
|
log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
|
||||||
//update-end-author:taoyan date:20190528 for:批量插入数据
|
//update-end-author:taoyan date:20190528 for:批量插入数据
|
||||||
rest = "文件导入成功!数据行数:" + newList.size();
|
// rest = "文件导入成功!数据行数:" + newList.size();
|
||||||
|
if(newList.size()>0){
|
||||||
|
rest = "文件导入成功!数据行数:" + newList.size();
|
||||||
|
}
|
||||||
if(StringUtils.isNotBlank(errorRest)){
|
if(StringUtils.isNotBlank(errorRest)){
|
||||||
errorRest = "<br/>共错误:"+errNum+"行;错误数据如下:<br/>"+errorRest;
|
errorRest = "<br/>共错误:"+errNum+"行;错误数据如下:<br/>"+errorRest;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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;
|
||||||
|
@ -140,4 +138,7 @@ public class KcZzYbtkb implements Serializable {
|
||||||
@Excel(name = "请填写对课堂内容以及其他方面的具体意见或建议", width = 15)
|
@Excel(name = "请填写对课堂内容以及其他方面的具体意见或建议", width = 15)
|
||||||
@ApiModelProperty(value = "请填写对课堂内容以及其他方面的具体意见或建议")
|
@ApiModelProperty(value = "请填写对课堂内容以及其他方面的具体意见或建议")
|
||||||
private java.lang.String ans10;
|
private java.lang.String ans10;
|
||||||
|
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String xqxn;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,4 +2,9 @@
|
||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="org.jeecg.modules.kc.kcZzYbtkb.mapper.KcZzYbtkbMapper">
|
<mapper namespace="org.jeecg.modules.kc.kcZzYbtkb.mapper.KcZzYbtkbMapper">
|
||||||
|
|
||||||
|
<select id="selectPage" resultType="org.jeecg.modules.kc.kcZzYbtkb.entity.KcZzYbtkb">
|
||||||
|
select a.*,b.title as xqxn from kc_zz_ybtkb a
|
||||||
|
LEFT JOIN kc_xqxn_history b on a.SKRQ >= b.start_time + '' and a.SKRQ <= b.end_time +''
|
||||||
|
${ew.customSqlSegment}
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
|
@ -21,6 +21,8 @@ import org.jeecg.common.api.CommonAPI;
|
||||||
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.grab.SynchronizationService.tools.ChangeTingKeTongJi;
|
import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi;
|
||||||
|
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.ktgl.entity.KcKetangbiao;
|
import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao;
|
||||||
import org.jeecg.modules.kc.ktgl.service.IKcKetangbiaoService;
|
import org.jeecg.modules.kc.ktgl.service.IKcKetangbiaoService;
|
||||||
|
@ -60,6 +62,8 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private IKcEvaluationstudentService kcEvaluationstudentService;
|
private IKcEvaluationstudentService kcEvaluationstudentService;
|
||||||
|
@Autowired
|
||||||
|
private IKcSysConfigService kcSysConfigService;
|
||||||
|
|
||||||
@Lazy
|
@Lazy
|
||||||
@Autowired
|
@Autowired
|
||||||
|
@ -134,8 +138,9 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
|
||||||
QueryWrapper<KcKetangbiao> queryWrapper = QueryGenerator.initQueryWrapper(kcKetangbiao, req.getParameterMap());
|
QueryWrapper<KcKetangbiao> queryWrapper = QueryGenerator.initQueryWrapper(kcKetangbiao, req.getParameterMap());
|
||||||
//查本学期学年的
|
//查本学期学年的
|
||||||
if(kcKetangbiao.isSearchByNowXqxn()){
|
if(kcKetangbiao.isSearchByNowXqxn()){
|
||||||
queryWrapper.ge("skrq",getBxqStartTime());//<=
|
KcSysConfig kcSysConfig =kcSysConfigService.getById("1");
|
||||||
queryWrapper.le("skrq",getBxqEndTime());//>=
|
queryWrapper.ge("skrq",kcSysConfig.getBxqkssj());//<=
|
||||||
|
queryWrapper.le("skrq",kcSysConfig.getBxqjssj()+" 23:59:59");//>=
|
||||||
}
|
}
|
||||||
queryWrapper.apply(StringUtils.isNotBlank(kcKetangbiao.getYwmc())," (skjs like '%"+kcKetangbiao.getYwmc()+"%' or kcmc like '%"+kcKetangbiao.getYwmc()+"%')");
|
queryWrapper.apply(StringUtils.isNotBlank(kcKetangbiao.getYwmc())," (skjs like '%"+kcKetangbiao.getYwmc()+"%' or kcmc like '%"+kcKetangbiao.getYwmc()+"%')");
|
||||||
queryWrapper.ne(StringUtils.isNotBlank(kcKetangbiao.getYwskxs()),"skxs",kcKetangbiao.getYwskxs());
|
queryWrapper.ne(StringUtils.isNotBlank(kcKetangbiao.getYwskxs()),"skxs",kcKetangbiao.getYwskxs());
|
||||||
|
@ -345,6 +350,8 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
|
||||||
}
|
}
|
||||||
//查询第三句-累计课堂
|
//查询第三句-累计课堂
|
||||||
|
|
||||||
|
KcSysConfig kcSysConfig =kcSysConfigService.getById("1");
|
||||||
|
|
||||||
QueryWrapper qw3 = new QueryWrapper();
|
QueryWrapper qw3 = new QueryWrapper();
|
||||||
qw3.select("count(*) - 0 num",//【已开课堂数:总数】
|
qw3.select("count(*) - 0 num",//【已开课堂数:总数】
|
||||||
"count( CASE WHEN zbpx = '1' THEN '1' END ) txktnum",//【腾讯课堂数】
|
"count( CASE WHEN zbpx = '1' THEN '1' END ) txktnum",//【腾讯课堂数】
|
||||||
|
@ -353,15 +360,15 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
|
||||||
"count( CASE WHEN date_format( now(), '%H%i' ) > hhjs THEN 1 END ) xkktnum",//【下课课堂数】
|
"count( CASE WHEN date_format( now(), '%H%i' ) > hhjs THEN 1 END ) xkktnum",//【下课课堂数】
|
||||||
"count( CASE WHEN date_format( now(), '%H%i' ) < hhjs AND date_format( now(), '%H%i' ) > hhks THEN 1 END ) zzsknum"//【正在上课课堂数】
|
"count( CASE WHEN date_format( now(), '%H%i' ) < hhjs AND date_format( now(), '%H%i' ) > hhks THEN 1 END ) zzsknum"//【正在上课课堂数】
|
||||||
);
|
);
|
||||||
qw3.ge("skrq",getBxqStartTime());//<=
|
qw3.ge("skrq",kcSysConfig.getBxqkssj());//<=
|
||||||
qw3.le("skrq",skrq);//>=
|
qw3.le("skrq",kcSysConfig.getBxqjssj()+" 23:59:59");//>=
|
||||||
List<Map<String, Object>> kcKetangbiao3List = kcKetangbiaoService.listMaps(qw3);
|
List<Map<String, Object>> kcKetangbiao3List = kcKetangbiaoService.listMaps(qw3);
|
||||||
if(kcKetangbiao3List != null && !kcKetangbiao3List.isEmpty()){
|
if(kcKetangbiao3List != null && !kcKetangbiao3List.isEmpty()){
|
||||||
rmap.put("yiKaiKeTang",kcKetangbiao3List.get(0));
|
rmap.put("yiKaiKeTang",kcKetangbiao3List.get(0));
|
||||||
}
|
}
|
||||||
KcKetangbiao kcKetangbiao = new KcKetangbiao();
|
KcKetangbiao kcKetangbiao = new KcKetangbiao();
|
||||||
kcKetangbiao.setStartTime(getBxqStartTime());
|
kcKetangbiao.setStartTime(kcSysConfig.getBxqkssj());
|
||||||
kcKetangbiao.setEndTime(skrq);
|
kcKetangbiao.setEndTime(kcSysConfig.getBxqjssj()+" 23:59:59");
|
||||||
List<Map<String, Object>> listTjIndex = kcKetangbiaoService.getIndexYkktstj(kcKetangbiao);
|
List<Map<String, Object>> listTjIndex = kcKetangbiaoService.getIndexYkktstj(kcKetangbiao);
|
||||||
if(listTjIndex != null && !listTjIndex.isEmpty()){
|
if(listTjIndex != null && !listTjIndex.isEmpty()){
|
||||||
rmap.put("yiKaiKeTangNew",listTjIndex.get(0));
|
rmap.put("yiKaiKeTangNew",listTjIndex.get(0));
|
||||||
|
@ -437,10 +444,11 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
|
||||||
String skrq,String kkdw,String hh,String kcxz,String ywTime,String ywmc) {
|
String skrq,String kkdw,String hh,String kcxz,String ywTime,String ywmc) {
|
||||||
|
|
||||||
|
|
||||||
|
KcSysConfig kcSysConfig =kcSysConfigService.getById("1");
|
||||||
|
|
||||||
QueryWrapper<KcKetangbiao> qw3 = new QueryWrapper<>();
|
QueryWrapper<KcKetangbiao> qw3 = new QueryWrapper<>();
|
||||||
qw3.ge("kt.skrq",getBxqStartTime());//<=
|
qw3.ge("kt.skrq",kcSysConfig.getBxqkssj());//<=
|
||||||
qw3.le("kt.skrq",skrq);//>=
|
qw3.le("kt.skrq",kcSysConfig.getBxqjssj()+" 23:59:59");//>=
|
||||||
qw3.eq(StringUtils.isNotBlank(kkdw),"kt.kkdw",kkdw);
|
qw3.eq(StringUtils.isNotBlank(kkdw),"kt.kkdw",kkdw);
|
||||||
qw3.eq(StringUtils.isNotBlank(hh),"kt.hh",hh);
|
qw3.eq(StringUtils.isNotBlank(hh),"kt.hh",hh);
|
||||||
qw3.eq(StringUtils.isNotBlank(kcxz),"kt.kcxz",kcxz);
|
qw3.eq(StringUtils.isNotBlank(kcxz),"kt.kcxz",kcxz);
|
||||||
|
@ -486,9 +494,12 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
|
||||||
public Result<?> ykkttkktList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
public Result<?> ykkttkktList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||||
String skrq,String kkdw,String hh,String kcxz,String ywTime,String ywmc) {
|
String skrq,String kkdw,String hh,String kcxz,String ywTime,String ywmc) {
|
||||||
//查询第三句-已开课堂听课课堂
|
//查询第三句-已开课堂听课课堂
|
||||||
|
|
||||||
|
KcSysConfig kcSysConfig =kcSysConfigService.getById("1");
|
||||||
|
|
||||||
KcKetangbiao kcKetangbiao = new KcKetangbiao();
|
KcKetangbiao kcKetangbiao = new KcKetangbiao();
|
||||||
kcKetangbiao.setStartTime(getBxqStartTime());
|
kcKetangbiao.setStartTime(kcSysConfig.getBxqkssj());
|
||||||
kcKetangbiao.setEndTime(skrq);
|
kcKetangbiao.setEndTime(kcSysConfig.getBxqjssj()+" 23:59:59");
|
||||||
kcKetangbiao.setKkdw(kkdw);
|
kcKetangbiao.setKkdw(kkdw);
|
||||||
kcKetangbiao.setHh(hh);
|
kcKetangbiao.setHh(hh);
|
||||||
kcKetangbiao.setKcxz(kcxz);
|
kcKetangbiao.setKcxz(kcxz);
|
||||||
|
@ -510,9 +521,10 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
|
||||||
public Result<?> ykkttkrcList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
public Result<?> ykkttkrcList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||||
String skrq,String kkdw,String hh,String kcxz,String ywTime,String ywmc) {
|
String skrq,String kkdw,String hh,String kcxz,String ywTime,String ywmc) {
|
||||||
//查询第三句-已开课堂听课课堂
|
//查询第三句-已开课堂听课课堂
|
||||||
|
KcSysConfig kcSysConfig =kcSysConfigService.getById("1");
|
||||||
KcKetangbiao kcKetangbiao = new KcKetangbiao();
|
KcKetangbiao kcKetangbiao = new KcKetangbiao();
|
||||||
kcKetangbiao.setStartTime(getBxqStartTime());
|
kcKetangbiao.setStartTime(kcSysConfig.getBxqkssj());
|
||||||
kcKetangbiao.setEndTime(skrq);
|
kcKetangbiao.setEndTime(kcSysConfig.getBxqjssj()+" 23:59:59");
|
||||||
kcKetangbiao.setKkdw(kkdw);
|
kcKetangbiao.setKkdw(kkdw);
|
||||||
kcKetangbiao.setHh(hh);
|
kcKetangbiao.setHh(hh);
|
||||||
kcKetangbiao.setKcxz(kcxz);
|
kcKetangbiao.setKcxz(kcxz);
|
||||||
|
|
|
@ -18,6 +18,7 @@ import org.jeecg.common.system.vo.LoginUser;
|
||||||
import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi;
|
import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi;
|
||||||
import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig;
|
import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig;
|
||||||
import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory;
|
import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory;
|
||||||
|
import org.jeecg.modules.kc.kcXqxnHistory.service.IKcXqxnHistoryService;
|
||||||
import org.jeecg.modules.kc.qa.entity.KcEvaluation;
|
import org.jeecg.modules.kc.qa.entity.KcEvaluation;
|
||||||
import org.jeecg.modules.kc.qa.entity.KcEvaluationPkmx;
|
import org.jeecg.modules.kc.qa.entity.KcEvaluationPkmx;
|
||||||
import org.jeecg.modules.kc.qa.entity.KcEvaluations;
|
import org.jeecg.modules.kc.qa.entity.KcEvaluations;
|
||||||
|
@ -63,6 +64,9 @@ public class KcEvaluationController extends JeecgController<KcEvaluation, IKcEva
|
||||||
@Autowired
|
@Autowired
|
||||||
private ChangeTingKeTongJi changeTingKeTongJi;
|
private ChangeTingKeTongJi changeTingKeTongJi;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IKcXqxnHistoryService kcXqxnHistoryService;
|
||||||
|
|
||||||
@Value("${jeecg.path.upload}")
|
@Value("${jeecg.path.upload}")
|
||||||
private String upLoadPath;
|
private String upLoadPath;
|
||||||
|
|
||||||
|
@ -412,9 +416,20 @@ public class KcEvaluationController extends JeecgController<KcEvaluation, IKcEva
|
||||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||||
HttpServletRequest req) {
|
HttpServletRequest req) {
|
||||||
|
String xnxq = kcEvaluation.getXnxq();
|
||||||
|
if(org.apache.commons.lang3.StringUtils.isNotBlank(xnxq)){
|
||||||
|
QueryWrapper<KcXqxnHistory> kcXqxnHistoryQueryWrapper = new QueryWrapper<>();
|
||||||
|
kcXqxnHistoryQueryWrapper.eq("title",xnxq);
|
||||||
|
kcXqxnHistoryQueryWrapper.last("limit 1");
|
||||||
|
KcXqxnHistory kcXqxnHistory =kcXqxnHistoryService.getOne(kcXqxnHistoryQueryWrapper);
|
||||||
|
kcEvaluation.setStartDate(DateUtil.format(kcXqxnHistory.getStartTime(),"yyyy-MM-dd"));
|
||||||
|
kcEvaluation.setEndDate(DateUtil.format(kcXqxnHistory.getEndTime(),"yyyy-MM-dd"));
|
||||||
|
}
|
||||||
QueryWrapper<KcEvaluation> queryWrapper = QueryGenerator.initQueryWrapper("a",kcEvaluation, req.getParameterMap());
|
QueryWrapper<KcEvaluation> queryWrapper = QueryGenerator.initQueryWrapper("a",kcEvaluation, req.getParameterMap());
|
||||||
queryWrapper.eq(StringUtils.isNotBlank(kcEvaluation.getJgh()),"kt.jgh",kcEvaluation.getJgh());
|
queryWrapper.eq(StringUtils.isNotBlank(kcEvaluation.getJgh()),"kt.jgh",kcEvaluation.getJgh());
|
||||||
queryWrapper.eq("eq.genre",0);
|
queryWrapper.eq("eq.genre",0);
|
||||||
|
queryWrapper.ge(org.apache.commons.lang3.StringUtils.isNotBlank(kcEvaluation.getStartDate()),"a.up_date",kcEvaluation.getStartDate());
|
||||||
|
queryWrapper.le(org.apache.commons.lang3.StringUtils.isNotBlank(kcEvaluation.getEndDate()),"a.up_date",kcEvaluation.getEndDate()+" 23:59:59");
|
||||||
// queryWrapper.eq("a.upuserid",);
|
// queryWrapper.eq("a.upuserid",);
|
||||||
queryWrapper.orderByDesc("a.up_timestamp");
|
queryWrapper.orderByDesc("a.up_timestamp");
|
||||||
Page<KcEvaluation> page = new Page<KcEvaluation>(pageNo, pageSize);
|
Page<KcEvaluation> page = new Page<KcEvaluation>(pageNo, pageSize);
|
||||||
|
|
|
@ -129,6 +129,10 @@ public class KcEvaluation implements Serializable {
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String xnxq;//学期学年
|
private String xnxq;//学期学年
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String startDate;//
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String endDate;//
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -19,6 +19,7 @@ import org.jeecg.common.system.query.QueryGenerator;
|
||||||
import org.jeecg.common.system.vo.LoginUser;
|
import org.jeecg.common.system.vo.LoginUser;
|
||||||
import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi;
|
import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi;
|
||||||
import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory;
|
import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory;
|
||||||
|
import org.jeecg.modules.kc.kcXqxnHistory.service.IKcXqxnHistoryService;
|
||||||
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;
|
||||||
import org.jeecg.modules.kc.tktj.entity.KcKkdw;
|
import org.jeecg.modules.kc.tktj.entity.KcKkdw;
|
||||||
|
@ -56,6 +57,8 @@ public class KcTingkeController extends JeecgController<KcTingke, IKcTingkeServi
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private ChangeTingKeTongJi changeTingKeTongJi;
|
private ChangeTingKeTongJi changeTingKeTongJi;
|
||||||
|
@Autowired
|
||||||
|
private IKcXqxnHistoryService kcXqxnHistoryService;
|
||||||
|
|
||||||
@Value("${jeecg.path.upload}")
|
@Value("${jeecg.path.upload}")
|
||||||
private String upLoadPath;
|
private String upLoadPath;
|
||||||
|
@ -96,10 +99,19 @@ public class KcTingkeController extends JeecgController<KcTingke, IKcTingkeServi
|
||||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||||
HttpServletRequest req) {
|
HttpServletRequest req) {
|
||||||
|
String xnxq = kcTingke.getXnxq();
|
||||||
|
if(StringUtils.isNotBlank(xnxq)){
|
||||||
|
QueryWrapper<KcXqxnHistory> kcXqxnHistoryQueryWrapper = new QueryWrapper<>();
|
||||||
|
kcXqxnHistoryQueryWrapper.eq("title",xnxq);
|
||||||
|
kcXqxnHistoryQueryWrapper.last("limit 1");
|
||||||
|
KcXqxnHistory kcXqxnHistory =kcXqxnHistoryService.getOne(kcXqxnHistoryQueryWrapper);
|
||||||
|
kcTingke.setStartDate(DateUtil.format(kcXqxnHistory.getStartTime(),"yyyy-MM-dd"));
|
||||||
|
kcTingke.setEndDate(DateUtil.format(kcXqxnHistory.getEndTime(),"yyyy-MM-dd"));
|
||||||
|
}
|
||||||
QueryWrapper<KcTingke> queryWrapper = QueryGenerator.initQueryWrapper("a",kcTingke, req.getParameterMap());
|
QueryWrapper<KcTingke> queryWrapper = QueryGenerator.initQueryWrapper("a",kcTingke, req.getParameterMap());
|
||||||
queryWrapper.apply(StringUtils.isNotBlank(kcTingke.getSearchInput()),"( a.kcmc like '%"+kcTingke.getSearchInput()+"%' or a.skjs like '%"+kcTingke.getSearchInput()+"%')");
|
queryWrapper.apply(StringUtils.isNotBlank(kcTingke.getSearchInput()),"( a.kcmc like '%"+kcTingke.getSearchInput()+"%' or a.skjs like '%"+kcTingke.getSearchInput()+"%')");
|
||||||
queryWrapper.ge(StringUtils.isNotBlank(kcTingke.getStartTime()),"a.tingketime",kcTingke.getStartDate());
|
queryWrapper.ge(StringUtils.isNotBlank(kcTingke.getStartDate()),"a.tingketime",kcTingke.getStartDate());
|
||||||
queryWrapper.le(StringUtils.isNotBlank(kcTingke.getEndTime()),"a.tingketime",kcTingke.getEndDate()+" 23:59:59");
|
queryWrapper.le(StringUtils.isNotBlank(kcTingke.getEndDate()),"a.tingketime",kcTingke.getEndDate()+" 23:59:59");
|
||||||
queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getKkdw()),"a.kkdw",kcTingke.getKkdw());
|
queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getKkdw()),"a.kkdw",kcTingke.getKkdw());
|
||||||
queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getHh()),"a.hh",kcTingke.getHh());
|
queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getHh()),"a.hh",kcTingke.getHh());
|
||||||
if("0".equals(kcTingke.getPj())){
|
if("0".equals(kcTingke.getPj())){
|
||||||
|
|
Loading…
Reference in New Issue