Merge branch 'master' of https://gitee.com/mini-org-project/course_information_center_java
# Conflicts: # jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java # jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java # jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java
This commit is contained in:
commit
261edbd999
|
|
@ -102,6 +102,7 @@ public class Export extends BaseExport {
|
|||
|
||||
|
||||
KcXqxnHistory common = changeTingKeTongJi.getXqConfig(xqxnParam);
|
||||
//默认取最大的学期
|
||||
if(StringUtils.isBlank(xqxnParam)){
|
||||
xqxnParam = common.getTitle();
|
||||
}
|
||||
|
|
@ -158,9 +159,9 @@ public class Export extends BaseExport {
|
|||
//********************************通用*************************************************************/
|
||||
result.put("xqxn",xqxnParam);
|
||||
//填进去数量
|
||||
result.put("oneListSize", String.valueOf(oneList.size()));
|
||||
result.put("twoListSize", String.valueOf(twoList.size()));
|
||||
result.put("threeListSize", String.valueOf(threeList.size()));
|
||||
result.put("oneListSize", StringUtils.defaultString(String.valueOf(oneList.size()),"0"));
|
||||
result.put("twoListSize", StringUtils.defaultString(String.valueOf(twoList.size()),"0"));
|
||||
result.put("threeListSize", StringUtils.defaultString(String.valueOf(threeList.size()),"0"));
|
||||
|
||||
//********************************表头END**********************************************************/
|
||||
wo.replaceTextPlus(result);
|
||||
|
|
@ -179,9 +180,11 @@ public class Export extends BaseExport {
|
|||
}
|
||||
});
|
||||
index = 4;
|
||||
WordOperator.fillNullCall(mainList,oneList,2,3);
|
||||
//从固定位置开始添加（1为第二个表格，第二个1为固定位置）
|
||||
wo.insert2Table(0, index, true, mainList);
|
||||
|
||||
|
||||
index += mainList.size() + 2;
|
||||
mainList.clear();
|
||||
twoList.forEach(x -> {
|
||||
|
|
@ -195,6 +198,7 @@ public class Export extends BaseExport {
|
|||
}
|
||||
});
|
||||
//从固定位置开始添加（1为第二个表格，第二个1为固定位置）
|
||||
WordOperator.fillNullCall(mainList,twoList,2,3);
|
||||
wo.insert2Table(0, index, true, mainList);
|
||||
|
||||
index += mainList.size() + 2;
|
||||
|
|
@ -210,6 +214,7 @@ public class Export extends BaseExport {
|
|||
}
|
||||
});
|
||||
//从固定位置开始添加（1为第二个表格，第二个1为固定位置）
|
||||
WordOperator.fillNullCall(mainList,threeList,2,3);
|
||||
wo.insert2Table(0, index, true, mainList);
|
||||
return wo;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,6 @@
|
|||
package org.jeecg.modules.kc.ktgl.controller;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
import java.io.IOException;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
|
|
@ -16,6 +13,7 @@ import cn.hutool.core.date.DatePattern;
|
|||
import cn.hutool.core.date.DateTime;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
||||
import com.beust.jcommander.internal.Sets;
|
||||
import com.google.common.collect.Maps;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.jeecg.common.api.CommonAPI;
|
||||
|
|
@ -75,6 +73,7 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
|
|||
private CommonAPI commonApi;
|
||||
|
||||
String startTime = "";
|
||||
String endTime = "";
|
||||
|
||||
private String getBxqStartTime(){
|
||||
if(StringUtils.isNotBlank(startTime)) return startTime;
|
||||
|
|
@ -85,6 +84,15 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
|
|||
return startTime;
|
||||
}
|
||||
|
||||
private String getBxqEndTime(){
|
||||
if(StringUtils.isNotBlank(endTime)) return endTime;
|
||||
//查找本学期学年的
|
||||
KcXqxnHistory kcXqxnHistory = changeTingKeTongJi.getXqConfig();
|
||||
|
||||
endTime = DateUtil.format(kcXqxnHistory.getEndTime(), DatePattern.NORM_DATETIME_FORMAT);
|
||||
return endTime;
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
|
|
@ -102,12 +110,59 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
|
|||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<KcKetangbiao> queryWrapper = QueryGenerator.initQueryWrapper(kcKetangbiao, req.getParameterMap());
|
||||
//查本学期学年的
|
||||
if(kcKetangbiao.isSearchByNowXqxn()){
|
||||
queryWrapper.ge("skrq",getBxqStartTime());//<=
|
||||
queryWrapper.le("skrq",getBxqEndTime());//>=
|
||||
}
|
||||
queryWrapper.apply(StringUtils.isNotBlank(kcKetangbiao.getYwmc())," (skjs like '%"+kcKetangbiao.getYwmc()+"%' or kcmc like '%"+kcKetangbiao.getYwmc()+"%')");
|
||||
queryWrapper.ne(StringUtils.isNotBlank(kcKetangbiao.getYwskxs()),"skxs",kcKetangbiao.getYwskxs());
|
||||
Page<KcKetangbiao> page = new Page<KcKetangbiao>(pageNo, pageSize);
|
||||
IPage<KcKetangbiao> pageList = kcKetangbiaoService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param kcKetangbiao
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "课堂管理-子表-分页列表查询")
|
||||
@ApiOperation(value="课堂管理-子表-分页列表查询", notes="课堂管理-子表-分页列表查询")
|
||||
@GetMapping(value = "/fundAllPjjgList")
|
||||
public Result<IPage<KcKetangbiao>> fundAllPjjgList(KcKetangbiao kcKetangbiao,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<KcKetangbiao> queryWrapper = QueryGenerator.initQueryWrapper(kcKetangbiao, req.getParameterMap());
|
||||
//查本学期学年的
|
||||
if(kcKetangbiao.isSearchByNowXqxn()){
|
||||
queryWrapper.ge("skrq",getBxqStartTime());//<=
|
||||
queryWrapper.le("skrq",getBxqEndTime());//>=
|
||||
}
|
||||
queryWrapper.apply(StringUtils.isNotBlank(kcKetangbiao.getYwmc())," (skjs like '%"+kcKetangbiao.getYwmc()+"%' or kcmc like '%"+kcKetangbiao.getYwmc()+"%')");
|
||||
queryWrapper.ne(StringUtils.isNotBlank(kcKetangbiao.getYwskxs()),"skxs",kcKetangbiao.getYwskxs());
|
||||
Page<KcKetangbiao> page = new Page<KcKetangbiao>(pageNo, pageSize);
|
||||
|
||||
Set<String> idSet = Sets.newHashSet();
|
||||
IPage<KcKetangbiao> pageList = kcKetangbiaoService.fundAllPjjgList(page, queryWrapper);
|
||||
pageList.getRecords().forEach(x -> idSet.add(x.getId()));
|
||||
//查询平均分
|
||||
|
||||
//查询教师平均分
|
||||
|
||||
|
||||
//查询学生平均分
|
||||
|
||||
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 添加
|
||||
|
|
|
|||
|
|
@ -288,4 +288,7 @@ public class KcKetangbiao implements Serializable {
|
|||
@TableField(exist = false)
|
||||
private String szkc;
|
||||
|
||||
@TableField(exist = false)
|
||||
private boolean searchByNowXqxn;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package org.jeecg.modules.kc.ktgl.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Constants;
|
||||
|
|
@ -49,4 +50,6 @@ public interface KcKetangbiaoMapper extends BaseMapper<KcKetangbiao> {
|
|||
List<Map<String, Object>> getTeacherjlrkcb(Map<String, String> queryMap);
|
||||
|
||||
List<KcKetangbiao> getKtbjList(KcKetangbiao kcKetangbiao);
|
||||
|
||||
IPage<KcKetangbiao> fundAllPjjgList(Page<KcKetangbiao> page, @Param(Constants.ENTITY) QueryWrapper<KcKetangbiao> queryWrapper);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -545,6 +545,14 @@
|
|||
) a
|
||||
LEFT JOIN zongtipingjiapingjunfen b ON a.kechengbiaoid = b.kechengbiaoid
|
||||
</select>
|
||||
<select id="fundAllPjjgList" resultType="org.jeecg.modules.kc.ktgl.entity.KcKetangbiao">
|
||||
SELECT
|
||||
a.*,
|
||||
fen.avgscore
|
||||
from kc_ketangbiao a
|
||||
left join zongtipingjiapingjunfen fen on fen.kechengbiaoid = a.id
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
|
||||
|
||||
<select id="getKtbjList" parameterType="org.jeecg.modules.kc.ktgl.entity.KcKetangbiao" resultType="org.jeecg.modules.kc.ktgl.entity.KcKetangbiao">
|
||||
|
|
|
|||
|
|
@ -52,4 +52,6 @@ public interface IKcKetangbiaoService extends IService<KcKetangbiao> {
|
|||
List<Map<String, Object>> getTeacherjlrkcb(Map<String, String> queryMap);
|
||||
|
||||
List<KcKetangbiao> getKtbjList(KcKetangbiao kcKetangbiao);
|
||||
|
||||
IPage<KcKetangbiao> fundAllPjjgList(Page<KcKetangbiao> page, QueryWrapper<KcKetangbiao> queryWrapper);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -101,4 +101,9 @@ public class KcKetangbiaoServiceImpl extends ServiceImpl<KcKetangbiaoMapper, KcK
|
|||
public List<KcKetangbiao> getKtbjList(KcKetangbiao kcKetangbiao) {
|
||||
return baseMapper.getKtbjList(kcKetangbiao);
|
||||
}
|
||||
|
||||
@Override
|
||||
public IPage<KcKetangbiao> fundAllPjjgList(Page<KcKetangbiao> page, QueryWrapper<KcKetangbiao> queryWrapper) {
|
||||
return baseMapper.fundAllPjjgList(page,queryWrapper);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -413,6 +413,7 @@ public class KcEvaluationController extends JeecgController<KcEvaluation, IKcEva
|
|||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<KcEvaluation> queryWrapper = QueryGenerator.initQueryWrapper("a",kcEvaluation, req.getParameterMap());
|
||||
queryWrapper.eq(StringUtils.isNotBlank(kcEvaluation.getJgh()),"kt.jgh",kcEvaluation.getJgh());
|
||||
queryWrapper.eq("eq.genre",0);
|
||||
// queryWrapper.eq("a.upuserid",);
|
||||
queryWrapper.orderByDesc("a.up_timestamp");
|
||||
|
|
|
|||
Loading…
Reference in New Issue