fix:解纷态势-兼容白云数据

zhouxiantao

2024-10-21 b1c3a007984187ccd4df2854b320fa5e82c291f5

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

@@ -81,10 +81,11 @@
            terms.put("createStart", fileStart+ " 00:00:00");
            terms.put("createEnd", fileEnd+ " 23:59:59");
        }
        String areaType = request.getParameter("areaType");
        if (StringUtils.isNotBlank(areaType)){
            terms.put("areaType", areaType);
        String queRoad = request.getParameter("queRoad");
        if (StringUtils.isNotBlank(queRoad)){
            terms.put("areaType", "2");
        }

        // 实际调解组织编号
        String mediateUnitId = request.getParameter("mediateUnitId");
        if (StringUtils.isNotBlank(mediateUnitId)){
@@ -116,6 +117,7 @@
        if (StringUtils.isNotBlank(mediResult)){
            terms.put("mediResult", mediResult);
        }

        String peopleNum = request.getParameter("peopleNum");
        if (StringUtils.isNotBlank(peopleNum)){
            String[] split = peopleNum.split("-");
@@ -699,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())){
@@ -724,16 +727,34 @@
    }

    /**
     * 综合查询
     * 解纷态势
     * @url {ctx}/api/web/caseInfo/statistics
     * @return Object
     * @CurrentUser String userId
     */
    @GetMapping("/statistics")
    public Object 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) {
            log.error("Controller接口[CaseInfoWebController.statistics]请求异常："+e, e);
            return ReturnFailUtils.getRepInfo();
        }
    }

    /**
     * 解纷态势-纠纷类型
     * @url {ctx}/api/web/caseInfo/statisticsCaseType
     * @return Object
     * @CurrentUser String userId
     */
    @GetMapping("/statisticsCaseType")
    public Object statisticsCaseType(@CurrentUser String userId) {
        try {
            Map<String, Object> terms = getParameterAll();
            return ReturnSucUtils.getRepInfo( "处理成功", service.statistics(terms));
            return ReturnSucUtils.getRepInfo( "处理成功", service.statisticsCaseType(terms,userId));
        } catch (Exception e) {
            log.error("Controller接口[CaseInfoWebController.statistics]请求异常："+e, e);
            return ReturnFailUtils.getRepInfo();