diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/controller/LwKhclController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/controller/LwKhclController.java index 2ba4066..b09af61 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/controller/LwKhclController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/controller/LwKhclController.java @@ -114,6 +114,75 @@ public class LwKhclController extends JeecgController { return Result.OK(pageList); } + + @GetMapping(value = "/listAll") + public Result> listAll(LwKhcl lwKhcl, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + + + String ktbg = lwKhcl.getKtbg(); + String zqjc = lwKhcl.getZqjc(); + String lwzg = lwKhcl.getLwzg(); + String lwcj = lwKhcl.getBylwCjPar(); + lwKhcl.setKtbg(null); + lwKhcl.setZqjc(null); + lwKhcl.setLwzg(null); + + + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lwKhcl, req.getParameterMap()); + if(StringUtils.isNotBlank(ktbg)){ + if(StringUtils.equals(ktbg,"1")){ + queryWrapper.isNotNull("ktbg"); + }else{ + queryWrapper.isNull("ktbg"); + } + } + + if(StringUtils.isNotBlank(zqjc)){ + if(StringUtils.equals(zqjc,"1")){ + queryWrapper.isNotNull("zqjc"); + }else{ + queryWrapper.isNull("zqjc"); + } + } + + if(StringUtils.isNotBlank(lwzg)){ + if(StringUtils.equals(lwzg,"1")){ + queryWrapper.isNotNull("lwzg"); + }else{ + queryWrapper.isNull("lwzg"); + } + } + + if(StringUtils.isNotBlank(lwcj)){ + try { + if(StringUtils.equals(lwcj,"1")){ + queryWrapper.ge("bylw_cj",90); + }else if(StringUtils.equals(lwcj,"2")){ + queryWrapper.ge("bylw_cj",80); + queryWrapper.lt("bylw_cj",90); + }else if(StringUtils.equals(lwcj,"3")){ + queryWrapper.ge("bylw_cj",70); + queryWrapper.lt("bylw_cj",80); + }else if(StringUtils.equals(lwcj,"4")){ + queryWrapper.ge("bylw_cj",60); + queryWrapper.lt("bylw_cj",70); + }else if(StringUtils.equals(lwcj,"5")){ + queryWrapper.lt("bylw_cj",60); + } + + } catch (Exception e) { + e.printStackTrace(); + } + } + + Page page = new Page(pageNo, pageSize); + IPage pageList = lwKhclService.page(page, queryWrapper); + return Result.OK(pageList); + } + /** * 导出excel * @param request @@ -169,6 +238,80 @@ public class LwKhclController extends JeecgController { return mv; } + + @RequestMapping(value = "/expor2tXls") + public ModelAndView expor2tXls(HttpServletRequest request, LwKhcl lwKhcl) { + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String ktbg = lwKhcl.getKtbg(); + String zqjc = lwKhcl.getZqjc(); + String lwzg = lwKhcl.getLwzg(); + String lwcj = lwKhcl.getBylwCjPar(); + lwKhcl.setKtbg(null); + lwKhcl.setZqjc(null); + lwKhcl.setLwzg(null); + + + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lwKhcl, request.getParameterMap()); + if(StringUtils.isNotBlank(ktbg)){ + if(StringUtils.equals(ktbg,"1")){ + queryWrapper.isNotNull("ktbg"); + }else{ + queryWrapper.isNull("ktbg"); + } + } + + if(StringUtils.isNotBlank(zqjc)){ + if(StringUtils.equals(zqjc,"1")){ + queryWrapper.isNotNull("zqjc"); + }else{ + queryWrapper.isNull("zqjc"); + } + } + + if(StringUtils.isNotBlank(lwzg)){ + if(StringUtils.equals(lwzg,"1")){ + queryWrapper.isNotNull("lwzg"); + }else{ + queryWrapper.isNull("lwzg"); + } + } + + if(StringUtils.isNotBlank(lwcj)){ + try { + if(StringUtils.equals(lwcj,"1")){ + queryWrapper.ge("bylw_cj",90); + }else if(StringUtils.equals(lwcj,"2")){ + queryWrapper.ge("bylw_cj",80); + queryWrapper.lt("bylw_cj",90); + }else if(StringUtils.equals(lwcj,"3")){ + queryWrapper.ge("bylw_cj",70); + queryWrapper.lt("bylw_cj",80); + }else if(StringUtils.equals(lwcj,"4")){ + queryWrapper.ge("bylw_cj",60); + queryWrapper.lt("bylw_cj",70); + }else if(StringUtils.equals(lwcj,"5")){ + queryWrapper.lt("bylw_cj",60); + } + + } catch (Exception e) { + e.printStackTrace(); + } + } + + List exportList = lwKhclService.list(queryWrapper); + //此处设置的filename无效 ,前端会重更新设置一下 + mv.addObject(NormalExcelConstants.FILE_NAME, "论文考核材料列表"); + mv.addObject(NormalExcelConstants.CLASS, LwKhcl.class); + //update-begin--Author:liusq Date:20210126 for:图片导出报错,ImageBasePath未设置-------------------- + ExportParams exportParams=new ExportParams("论文考核材料", "导出人:" + sysUser.getRealname(), "sheet1"); + exportParams.setImageBasePath(jeecgBaseConfig.getPath().getUpload()); + //update-end--Author:liusq Date:20210126 for:图片导出报错,ImageBasePath未设置---------------------- + mv.addObject(NormalExcelConstants.PARAMS,exportParams); + mv.addObject(NormalExcelConstants.DATA_LIST, exportList); + return mv; + } + /** * 分页列表查询 * diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/entity/LwKhcl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/entity/LwKhcl.java index 0c61f6d..095e24b 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/entity/LwKhcl.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/entity/LwKhcl.java @@ -32,29 +32,45 @@ public class LwKhcl implements Serializable { @ApiModelProperty(value = "主键") private String id; + + + @Excel(name = "院系名称", width = 25) + @ApiModelProperty(value = "院系名称") + private String ssyxmc; + + @Excel(name = "校内专业", width = 35) + @ApiModelProperty(value = "校内专业") + private String ssxnzymc; + + @Excel(name = "学生学号", width = 35) + @ApiModelProperty(value = "学生学号") + private String xsxh; + + @Excel(name = "学生姓名", width = 35) + @ApiModelProperty(value = "学生姓名") + private String xsxm; + + @Excel(name = "论文题目", width = 35) + @ApiModelProperty(value = "论文题目") + private String bylwTm; + + @Excel(name = "指导教师姓名", width = 35) + @ApiModelProperty(value = "指导教师姓名") + private String zdjsxm; + + @Excel(name = "职称", width = 35) + @ApiModelProperty(value = "职称") + private String zdjszc; + @Excel(name = "毕业年份", width = 15) @ApiModelProperty(value = "毕业年份") private String bynf; - @Excel(name = "所属院系名称", width = 25) - @ApiModelProperty(value = "所属院系名称") - private String ssyxmc; - @Excel(name = "所属校内专业(大类)名称", width = 35) - @ApiModelProperty(value = "所属校内专业(大类)名称") - private String ssxnzymc; - - @ApiModelProperty(value = "学生学号") - private String xsxh; - - @ApiModelProperty(value = "学生姓名") - private String xsxm; @ApiModelProperty(value = "班级") private String bj; - @ApiModelProperty(value = "毕业论文(设计)题目") - private String bylwTm; @ApiModelProperty(value = "毕业论文(设计)类别") private String bylwLb; @@ -62,11 +78,6 @@ public class LwKhcl implements Serializable { @ApiModelProperty(value = "毕业论文(设计)成绩") private String bylwCj; - @ApiModelProperty(value = "指导教师姓名") - private String zdjsxm; - - @ApiModelProperty(value = "指导教师职称") - private String zdjszc; @ApiModelProperty(value = "是否实现电子化管理") private String sfsxdzhgl; diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhclXz/controller/LwKhclXzController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhclXz/controller/LwKhclXzController.java index 1f0cde9..9ac609c 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhclXz/controller/LwKhclXzController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhclXz/controller/LwKhclXzController.java @@ -141,7 +141,79 @@ public class LwKhclXzController extends JeecgController pageList = lwKhclXzService.page(page, queryWrapper); return Result.OK(pageList); } - + + + @GetMapping(value = "/listAll") + public Result> listAll(LwKhclXz lwKhclXz, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + + String ktbg = lwKhclXz.getKtbg(); + String zqjc = lwKhclXz.getZqjc(); + String lwzg = lwKhclXz.getLwzg(); + String lwcj = lwKhclXz.getBylwCjPar(); + lwKhclXz.setKtbg(null); + lwKhclXz.setZqjc(null); + lwKhclXz.setLwzg(null); + + + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lwKhclXz, req.getParameterMap()); + if(StringUtils.isNotBlank(ktbg)){ + if(StringUtils.equals(ktbg,"1")){ + queryWrapper.isNotNull("ktbg"); + }else{ + queryWrapper.isNull("ktbg"); + } + } + + if(StringUtils.isNotBlank(zqjc)){ + if(StringUtils.equals(zqjc,"1")){ + queryWrapper.isNotNull("zqjc"); + }else{ + queryWrapper.isNull("zqjc"); + } + } + + if(StringUtils.isNotBlank(lwzg)){ + if(StringUtils.equals(lwzg,"1")){ + queryWrapper.isNotNull("lwzg"); + }else{ + queryWrapper.isNull("lwzg"); + } + } + + if(StringUtils.isNotBlank(lwcj)){ + try { + if(StringUtils.equals(lwcj,"1")){ + queryWrapper.ge("bylw_cj",90); + }else if(StringUtils.equals(lwcj,"2")){ + queryWrapper.ge("bylw_cj",80); + queryWrapper.lt("bylw_cj",90); + }else if(StringUtils.equals(lwcj,"3")){ + queryWrapper.ge("bylw_cj",70); + queryWrapper.lt("bylw_cj",80); + }else if(StringUtils.equals(lwcj,"4")){ + queryWrapper.ge("bylw_cj",60); + queryWrapper.lt("bylw_cj",70); + }else if(StringUtils.equals(lwcj,"5")){ + queryWrapper.lt("bylw_cj",60); + } + + } catch (Exception e) { + e.printStackTrace(); + } + } + + + + + + Page page = new Page(pageNo, pageSize); + IPage pageList = lwKhclXzService.page(page, queryWrapper); + return Result.OK(pageList); + } + /** * 添加 * diff --git a/jeecgboot-vue3/src/views/bl/lwKhclXz/LwKhclXz.api.ts b/jeecgboot-vue3/src/views/bl/lwKhclXz/LwKhclXz.api.ts index fbafc73..018cf27 100644 --- a/jeecgboot-vue3/src/views/bl/lwKhclXz/LwKhclXz.api.ts +++ b/jeecgboot-vue3/src/views/bl/lwKhclXz/LwKhclXz.api.ts @@ -5,12 +5,14 @@ const { createConfirm } = useMessage(); enum Api { list = '/lwKhclXz/lwKhclXz/list', + listAll = '/lwKhcl/lwKhcl/listAll', save='/lwKhclXz/lwKhclXz/add', edit='/lwKhclXz/lwKhclXz/edit', deleteOne = '/lwKhclXz/lwKhclXz/delete', deleteBatch = '/lwKhclXz/lwKhclXz/deleteBatch', importExcel = '/lwKhclXz/lwKhclXz/importExcel', exportXls = '/lwKhclXz/lwKhclXz/exportXls', + export2Xls = '/lwKhcl/lwKhcl/expor2tXls', } /** @@ -18,6 +20,7 @@ enum Api { * @param params */ export const getExportUrl = Api.exportXls; +export const getExport2Url = Api.export2Xls; /** * 导入api @@ -29,6 +32,7 @@ export const getImportUrl = Api.importExcel; * @param params */ export const list = (params) => defHttp.get({ url: Api.list, params }); +export const listAll = (params) => defHttp.get({ url: Api.listAll, params }); /** * 删除单个 diff --git a/jeecgboot-vue3/src/views/bl/lwKhclXz/LwkhclAllList.vue b/jeecgboot-vue3/src/views/bl/lwKhclXz/LwkhclAllList.vue new file mode 100644 index 0000000..6ba2a53 --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/lwKhclXz/LwkhclAllList.vue @@ -0,0 +1,433 @@ + + + + +