From bfb5b0c14bec340af93779d6de1f9e6e8fe03c37 Mon Sep 17 00:00:00 2001 From: zhouxiantao <1026371446@qq.com> Date: Sun, 22 Sep 2024 17:41:41 +0800 Subject: [PATCH] 首页弹窗 --- dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseRegisterInfoWebController.java | 46 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 39 insertions(+), 7 deletions(-) diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseRegisterInfoWebController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseRegisterInfoWebController.java index 80866bc..711bdfd 100644 --- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseRegisterInfoWebController.java +++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseRegisterInfoWebController.java @@ -1,5 +1,6 @@ package cn.huge.module.cases.controller.web; +import cn.huge.base.common.utils.ObjectUtils; import cn.huge.base.common.utils.ReturnFailUtils; import cn.huge.base.common.utils.ReturnSucUtils; import cn.huge.module.cases.domain.dto.CaseRegisterDTO; @@ -113,15 +114,46 @@ private CaseInfoService service; @GetMapping("/pageQuery") - public Object pageQuery(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size, @RequestParam(value = "orderBy") String orderBy) { + public Object pageQuery(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size + ) { try { - Sort sort = null; - if (StringUtil.isEmpty(orderBy)) { - sort = Sort.by(Sort.Direction.DESC, "createTime"); - } else { - sort = Sort.by(Sort.Direction.DESC, orderBy); - } Map<String, Object> terms = getParameter(); + // 排序 + Sort sort = null; + String sortName = null; + String sortColmnStr = request.getParameter("sortColmn"); + String sortTypeStr = request.getParameter("sortType"); + int sortColmn = 1; + int sortType = 1; + if(StringUtils.isNotBlank(sortColmnStr)){ + sortColmn = Integer.valueOf(sortColmnStr); + } + if(StringUtils.isNotBlank(sortTypeStr)){ + sortType = Integer.valueOf(sortTypeStr); + } + switch (sortColmn){ + case 1: + sortName = "t1.create_time"; + break; + case 2: + sortName = "t1.case_level"; + break; + case 3: + sortName = "t3.number"; + break; + } + switch (sortType){ + case 1: + sort = Sort.by(Sort.Direction.ASC, sortName); + break; + case 2: + sort = Sort.by(Sort.Direction.DESC, sortName); + break; + } + if(ObjectUtils.isEmpty(sort)){ + sort = Sort.by(Sort.Direction.DESC, "t1.create_time"); + } + PageRequest pageRequest = PageRequest.of(page - 1, size, sort); Page<CaseRegisterDTO> caseInfoPage = service.pageQueryRegister(pageRequest, terms); return ReturnSucUtils.getRepInfo("处理成功", caseInfoPage); -- Gitblit v1.8.0