diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/controller/KcEvaluationsStatController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/controller/KcEvaluationsStatController.java index 5ba08306..7426566b 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/controller/KcEvaluationsStatController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/controller/KcEvaluationsStatController.java @@ -78,8 +78,16 @@ public class KcEvaluationsStatController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper("a",kcEvaluationsStat, req.getParameterMap()); - queryWrapper.eq(StringUtils.isNotBlank(kcEvaluationsStat.getSzkc()),"c.szkc",kcEvaluationsStat.getSzkc()); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(kcEvaluationsStat, req.getParameterMap()); + if(StringUtils.isNotBlank(kcEvaluationsStat.getSzkc())){ + String szkc = kcEvaluationsStat.getSzkc(); + if(StringUtils.equals("1",szkc)){ + queryWrapper.eq("col59","是"); + }else if(StringUtils.equals("0",szkc)){ + queryWrapper.eq("col59","否"); + } + } +// queryWrapper.eq(StringUtils.isNotBlank(kcEvaluationsStat.getSzkc()),"c.szkc",kcEvaluationsStat.getSzkc()); Page page = new Page(pageNo, pageSize); IPage pageList = kcEvaluationsStatService.page(page, queryWrapper); return Result.OK(pageList); @@ -176,27 +184,27 @@ public class KcEvaluationsStatController extends JeecgController clazz, String title) { - // Step.1 组装查询条件 - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper("a",object, request.getParameterMap()); - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - queryWrapper.eq(StringUtils.isNotBlank(object.getSzkc()),"c.szkc",object.getSzkc()); - // Step.2 获取导出数据 - List exportList = service.list(queryWrapper); - - // Step.3 AutoPoi 导出Excel - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - //此处设置的filename无效 ,前端会重更新设置一下 - mv.addObject(NormalExcelConstants.FILE_NAME, title); - mv.addObject(NormalExcelConstants.CLASS, clazz); - //update-begin--Author:liusq Date:20210126 for:图片导出报错,ImageBasePath未设置-------------------- - ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title); - exportParams.setImageBasePath(upLoadPath); - //update-end--Author:liusq Date:20210126 for:图片导出报错,ImageBasePath未设置---------------------- - mv.addObject(NormalExcelConstants.PARAMS,exportParams); - mv.addObject(NormalExcelConstants.DATA_LIST, exportList); - return mv; - } +// protected ModelAndView exportXls(HttpServletRequest request, KcEvaluationsStat object, Class clazz, String title) { +// // Step.1 组装查询条件 +// QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper("a",object, request.getParameterMap()); +// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// queryWrapper.eq(StringUtils.isNotBlank(object.getSzkc()),"c.szkc",object.getSzkc()); +// // Step.2 获取导出数据 +// List exportList = service.list(queryWrapper); +// +// // Step.3 AutoPoi 导出Excel +// ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); +// //此处设置的filename无效 ,前端会重更新设置一下 +// mv.addObject(NormalExcelConstants.FILE_NAME, title); +// mv.addObject(NormalExcelConstants.CLASS, clazz); +// //update-begin--Author:liusq Date:20210126 for:图片导出报错,ImageBasePath未设置-------------------- +// ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title); +// exportParams.setImageBasePath(upLoadPath); +// //update-end--Author:liusq Date:20210126 for:图片导出报错,ImageBasePath未设置---------------------- +// mv.addObject(NormalExcelConstants.PARAMS,exportParams); +// mv.addObject(NormalExcelConstants.DATA_LIST, exportList); +// return mv; +// } /** * 通过excel导入数据 diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml index 72a69670..e5f4e1f1 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml @@ -2,19 +2,6 @@ - - -