Merge branch 'gzdyh_test' into gzdyh_grid

xusd

2024-10-28 b0b1e641a31a0494262187f97034807fc53515dd

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoWebController.java

@@ -117,6 +117,7 @@
        if (StringUtils.isNotBlank(mediResult)){
            terms.put("mediResult", mediResult);
        }

        String peopleNum = request.getParameter("peopleNum");
        if (StringUtils.isNotBlank(peopleNum)){
            String[] split = peopleNum.split("-");
@@ -700,6 +701,7 @@
            Map<String, Object> terms = getParameterAll();
            Sort sort = Sort.by(Sort.Direction.DESC, "a.create_time");
            PageRequest pageRequest = PageRequest.of(0, 1000000, sort);
            terms.put("report","report");
            Page<CasePageDTO> caseInfoPage = service.pageQueryAll(pageRequest, terms);
            List<CaseInfoWeExcelDTO> excelList = new ArrayList<>();
            if(ObjectUtils.isNotEmpty(caseInfoPage.getContent())){
@@ -733,6 +735,7 @@
    @GetMapping("/statistics")
    public Object statistics(@CurrentUser String userId) {
        try {
//            String userId = "2409240631181052";
            Map<String, Object> terms = getParameterAll();
            return ReturnSucUtils.getRepInfo( "处理成功", service.statistics(terms,userId));
        } catch (Exception e) {