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

2023年6月15日 修改评课量表筛选和查询

This commit is contained in:
bai 2023-06-15 10:11:55 +08:00
parent 023e181808
commit 8234dda933
6 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java
View File

@ -251,10 +251,10 @@ public class KcEvaluationController extends JeecgController<KcEvaluation, IKcEva
List<KcEvaluation> exportList = kcEvaluationService.selectKkdwExportList(kcEvaluation);
Map<Integer,String> sourceDictMap = Maps.newHashMap();
//0：门户添加，1：老系统，2：政务大厅，3后台导入
sourceDictMap.put(0,"门户添加");
sourceDictMap.put(0,"信息中心");
sourceDictMap.put(1,"老系统");
sourceDictMap.put(2,"政务大厅");
sourceDictMap.put(3,"后台导入");
sourceDictMap.put(2,"服务大厅");
sourceDictMap.put(3,"线下纸质");
//更改字典项
exportList.forEach(x -> {
x.setSourceName(sourceDictMap.get(x.getSource()));
@ -353,10 +353,10 @@ public class KcEvaluationController extends JeecgController<KcEvaluation, IKcEva
Map<Integer,String> sourceDictMap = Maps.newHashMap();
//0：门户添加，1：老系统，2：政务大厅，3后台导入
sourceDictMap.put(0,"门户添加");
sourceDictMap.put(0,"信息中心");
sourceDictMap.put(1,"老系统");
sourceDictMap.put(2,"政务大厅");
sourceDictMap.put(3,"后台导入");
sourceDictMap.put(2,"服务大厅");
sourceDictMap.put(3,"线下纸质");
//更改字典项
exportList.forEach(x -> {
x.setSourceName(sourceDictMap.get(x.getSource()));

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationMapper.java
View File

@ -31,4 +31,6 @@ public interface KcEvaluationMapper extends BaseMapper<KcEvaluation> {
List<KcEvaluationPkmx> selectPkmxExportList(KcEvaluationPkmx kcEvaluationPkmx);
List<KcEvaluation> keTangList(Page<KcEvaluation> page, @Param(Constants.WRAPPER) QueryWrapper<KcEvaluation> queryWrapper);
List<KcEvaluation> selectPageAndKcmc(Page<KcEvaluation> page, @Param(Constants.WRAPPER) QueryWrapper<KcEvaluation> queryWrapper);
}

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

@ -393,5 +393,12 @@
${ew.customSqlSegment}
</select>
<select id="selectPageAndKcmc" resultType="org.jeecg.modules.kc.qa.entity.KcEvaluation">
select
kt.kcmc,a.*
from kc_evaluation a
left join kc_ketangbiao kt on kt.id = a.minkcid
${ew.customSqlSegment}
</select>
</mapper>

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationService.java
View File

@ -32,4 +32,6 @@ public interface IKcEvaluationService extends IService<KcEvaluation> {
List<KcEvaluationPkmx> selectPkmxExportList(KcEvaluationPkmx kcEvaluationPkmx);
IPage<KcEvaluation> keTangList(Page<KcEvaluation> page, QueryWrapper<KcEvaluation> queryWrapper);
IPage<KcEvaluation> selectPageAndKcmc(Page<KcEvaluation> page, QueryWrapper<KcEvaluation> queryWrapper);
}

5
jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationServiceImpl.java
View File

@ -105,4 +105,9 @@ public class KcEvaluationServiceImpl extends ServiceImpl<KcEvaluationMapper, KcE
return page.setRecords(baseMapper.keTangList(page,queryWrapper));
}
@Override
public IPage<KcEvaluation> selectPageAndKcmc(Page<KcEvaluation> page, QueryWrapper<KcEvaluation> queryWrapper) {
return page.setRecords(baseMapper.selectPageAndKcmc(page,queryWrapper));
}
}

20
jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java
View File

@ -65,9 +65,9 @@ public class TingKeStatisticsController{
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<KcEvaluation> queryWrapper = QueryGenerator.initQueryWrapper(evaluation, req.getParameterMap());
queryWrapper.isNotNull("upuserid");
queryWrapper.isNotNull("minkcid");
QueryWrapper<KcEvaluation> queryWrapper = QueryGenerator.initQueryWrapper("a",evaluation, req.getParameterMap());
queryWrapper.isNotNull("a.upuserid");
queryWrapper.isNotNull("a.minkcid");
List<KcXqxnHistory> kcXqxnHistoryList = kcXqxnHistoryService.list();
//查询所在单位
@ -82,26 +82,26 @@ public class TingKeStatisticsController{
List<KcXqxnHistory> xqxnHistoryList = kcXqxnHistoryList.stream().filter(x -> StringUtils.equals(x.getTitle(),evaluation.getXqxn())).collect(Collectors.toList());
if(xqxnHistoryList != null && !xqxnHistoryList.isEmpty()){
KcXqxnHistory xqxnHistory = xqxnHistoryList.get(0);
queryWrapper.ge("up_date",xqxnHistory.getStartTime());
queryWrapper.le("up_date",xqxnHistory.getEndTime());
queryWrapper.ge("a.up_date",xqxnHistory.getStartTime());
queryWrapper.le("a.up_date",xqxnHistory.getEndTime());
}
}
if(StringUtils.isNotBlank(evaluation.getDwmc())){
List<Xxhbuser> xxhbuserList = szdwList.stream().filter(x -> StringUtils.equals(x.getDwh(),evaluation.getDwmc())).collect(Collectors.toList());
Set<String> ghSet = xxhbuserList.stream().map(x -> x.getGh()).collect(Collectors.toSet());
queryWrapper.in("upuserid",ghSet);
queryWrapper.in("a.upuserid",ghSet);
}
Page<KcEvaluation> page = new Page<>(pageNo, pageSize);
IPage<KcEvaluation> pageList = kcEvaluationService.page(page, queryWrapper);
IPage<KcEvaluation> pageList = kcEvaluationService.selectPageAndKcmc(page, queryWrapper);
//---------------------补数据1------------------------------------------
Map<Integer,String> sourceDictMap = Maps.newHashMap();
//0：门户添加，1：老系统，2：政务大厅，3后台导入
sourceDictMap.put(0,"门户添加");
sourceDictMap.put(0,"信息中心");
sourceDictMap.put(1,"老系统");
sourceDictMap.put(2,"政务大厅");
sourceDictMap.put(3,"后台导入");
sourceDictMap.put(2,"服务大厅");
sourceDictMap.put(3,"线下纸质");
//---------------------补数据1------------------------------------------
Set<String> tjSet = Sets.newHashSet();