Merge remote-tracking branch 'origin/master'

liyj

2024-09-10 abb0d631ffed8b67b0a78205ba127b46a4cb546b

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

@@ -336,7 +336,7 @@
        if (StringUtils.isNotBlank(inputWay)){
            terms.put("inputWay", inputWay);
        }
        // 事项状态，1：待签收，2：待受理，3：办理中，4：结案审核，5：待评价，6：已归档
        // 事项状态，1：待分派，2：待签收，3：待受理，:4：办理中，5：结案审核，6：待评价，7：已归档
        String status = request.getParameter("status");
        if (StringUtils.isNotBlank(status)){
            terms.put("status", status);
@@ -355,6 +355,16 @@
        String processName = request.getParameter("processName");
        if (StringUtils.isNotBlank(processName)){
            terms.put("processName", processName);
        }
        // 对外展示事项进度，1：待受理，2：办理中，3：已结案
        String infoProcess = request.getParameter("process");
        if (StringUtils.isNotBlank(infoProcess)){
            terms.put("infoProcess", infoProcess);
        }
        // 对外展示事项进度
        String infoProcessName = request.getParameter("infoProcessName");
        if (StringUtils.isNotBlank(infoProcessName)){
            terms.put("infoProcessName", infoProcessName);
        }
        // 意向调解组织编号
        String wantUnitId = request.getParameter("wantUnitId");
@@ -542,6 +552,32 @@
    public Object pageQueryAll(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size) {
        try {
            Map<String, Object> terms = getParameter();
//            // 来访时间
            String visitTimeStart = request.getParameter("visitTimeStart");
            String visitTimeEnd = request.getParameter("visitTimeEnd");
            if(StringUtils.isNotBlank(visitTimeStart) && StringUtils.isNotBlank(visitTimeEnd)) {
                terms.put("visitTimeStart", visitTimeStart + " 00:00:00");
                terms.put("visitTimeEnd", visitTimeEnd + " 23:59:59");
            }
            String createStart = request.getParameter("createStart");
            String createEnd = request.getParameter("createEnd");
            if(StringUtils.isNotBlank(createStart) && StringUtils.isNotBlank(createEnd)) {
                terms.put("createStart", createStart+ " 00:00:00");
                terms.put("createEnd", createEnd+ " 23:59:59");
            }
            String closeStart = request.getParameter("closeStart");
            String closeEnd = request.getParameter("closeEnd");
            if(StringUtils.isNotBlank(closeStart) && StringUtils.isNotBlank(closeEnd)) {
                terms.put("createStart", closeStart+ " 00:00:00");
                terms.put("createEnd", closeEnd+ " 23:59:59");
            }
            String fileStart = request.getParameter("fileStart");
            String fileEnd = request.getParameter("fileEnd");
            if(StringUtils.isNotBlank(fileStart) && StringUtils.isNotBlank(fileEnd)) {
                terms.put("createStart", fileStart+ " 00:00:00");
                terms.put("createEnd", fileEnd+ " 23:59:59");
            }

            Sort sort = Sort.by(Sort.Direction.DESC, "a.create_time");
            PageRequest pageRequest = PageRequest.of(page-1, size, sort);
            Page<CasePageDTO> caseInfoPage = service.pageQueryAll(pageRequest, terms);