修改听课任务查看导出功能的听课数量统计
This commit is contained in:
parent
133dff7c72
commit
ce1e459408
|
@ -77,6 +77,8 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
|
||||||
@Value("${jeecg.path.upload}")
|
@Value("${jeecg.path.upload}")
|
||||||
private String upLoadPath;
|
private String upLoadPath;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IKcEvaluationService kcEvaluationService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 分页列表查询
|
* 分页列表查询
|
||||||
|
@ -494,17 +496,36 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
|
||||||
tjMap.put(x.getXnxq() + "-" + x.getJgh(),x);
|
tjMap.put(x.getXnxq() + "-" + x.getJgh(),x);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
//------------评课统计---2024-02-29新增的-------------------
|
||||||
|
QueryWrapper<KcEvaluation> kcEvaluationQueryWrapper = new QueryWrapper<>();
|
||||||
|
kcEvaluationQueryWrapper.in("kt.xnxq",xqxnSet);
|
||||||
|
kcEvaluationQueryWrapper.groupBy("concat(xnxq,'-',upuserid)");
|
||||||
|
kcEvaluationQueryWrapper.orderByDesc("kt.skrq");
|
||||||
|
List<KcEvaluation> pktjList = kcEvaluationService.findTj(kcEvaluationQueryWrapper);
|
||||||
|
Map<String,KcEvaluation> pktjMap = Maps.newHashMap();
|
||||||
|
pktjList.forEach(x -> {
|
||||||
|
pktjMap.put(x.getXnxq() + "-" + x.getUpuserid(),x);
|
||||||
|
});
|
||||||
|
//------------评课统计---2024-02-29新增的-------------------
|
||||||
|
|
||||||
//根据当前学期学年,硬合并出来一个数据
|
//根据当前学期学年,硬合并出来一个数据
|
||||||
exportList.forEach(x -> {
|
exportList.forEach(x -> {
|
||||||
x.setTkxttj("0");
|
x.setTkxttj("0");
|
||||||
x.setYskcs("0");
|
x.setYskcs("0");
|
||||||
if(tjMap.containsKey(x.getXqxn() + "-" + x.getGh())){
|
if(tjMap.containsKey(x.getXqxn() + "-" + x.getGh())){
|
||||||
KcTkcstj tkcstj = tjMap.get(x.getXqxn() + "-" + x.getGh());
|
KcTkcstj tkcstj = tjMap.get(x.getXqxn() + "-" + x.getGh());
|
||||||
x.setTkxttj(StringUtils.defaultString(tkcstj.getTkxttj(),"0"));
|
// x.setTkxttj(StringUtils.defaultString(tkcstj.getTkxttj(),"0"));
|
||||||
x.setYskcs(StringUtils.defaultString(tkcstj.getYskcs(),"0"));
|
x.setYskcs(StringUtils.defaultString(tkcstj.getYskcs(),"0"));
|
||||||
//x.setXqxn(kcXqxnHistory.getTitle());
|
//x.setXqxn(kcXqxnHistory.getTitle());
|
||||||
}
|
}
|
||||||
|
//------------评课统计---2024-02-29新增的-------------------
|
||||||
|
if(pktjMap.containsKey(x.getXqxn() + "-" + x.getGh())){
|
||||||
|
KcEvaluation pkcstj = pktjMap.get(x.getXqxn() + "-" + x.getGh());
|
||||||
|
x.setTkxttj(StringUtils.defaultString(pkcstj.getPkNum()+"","0"));
|
||||||
|
}
|
||||||
|
//------------评课统计---2024-02-29新增的-------------------
|
||||||
});
|
});
|
||||||
|
|
||||||
// Step.3 AutoPoi 导出Excel
|
// Step.3 AutoPoi 导出Excel
|
||||||
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
|
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
|
||||||
//此处设置的filename无效 ,前端会重更新设置一下
|
//此处设置的filename无效 ,前端会重更新设置一下
|
||||||
|
|
|
@ -44,4 +44,6 @@ public interface KcEvaluationMapper extends BaseMapper<KcEvaluation> {
|
||||||
List<KcEvaluation> findTj(@Param(Constants.WRAPPER) QueryWrapper<KcEvaluation> queryWrapper);
|
List<KcEvaluation> findTj(@Param(Constants.WRAPPER) QueryWrapper<KcEvaluation> queryWrapper);
|
||||||
|
|
||||||
KcBdgxbcopy getOpenId(String skjs);
|
KcBdgxbcopy getOpenId(String skjs);
|
||||||
|
|
||||||
|
List<KcEvaluation> getCountlist(KcEvaluation kcEvaluation);
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,4 +42,6 @@ public interface IKcEvaluationService extends IService<KcEvaluation> {
|
||||||
IPage<KcEvaluation> queryPkZuJiPage(Page<KcEvaluation> page, QueryWrapper<KcEvaluation> queryWrapper);
|
IPage<KcEvaluation> queryPkZuJiPage(Page<KcEvaluation> page, QueryWrapper<KcEvaluation> queryWrapper);
|
||||||
|
|
||||||
List<KcEvaluation> findTj(QueryWrapper<KcEvaluation> queryWrapper);
|
List<KcEvaluation> findTj(QueryWrapper<KcEvaluation> queryWrapper);
|
||||||
|
|
||||||
|
List<KcEvaluation> getCountlist(KcEvaluation kcEvaluation);
|
||||||
}
|
}
|
||||||
|
|
|
@ -155,6 +155,11 @@ public class KcEvaluationServiceImpl extends ServiceImpl<KcEvaluationMapper, KcE
|
||||||
return baseMapper.findTj(queryWrapper);
|
return baseMapper.findTj(queryWrapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<KcEvaluation> getCountlist(KcEvaluation kcEvaluation) {
|
||||||
|
return baseMapper.getCountlist(kcEvaluation);
|
||||||
|
}
|
||||||
|
|
||||||
// appId
|
// appId
|
||||||
private static final String appId = "wx59920eb69d611d7f";//东师
|
private static final String appId = "wx59920eb69d611d7f";//东师
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue