Merge branch 'gzdyh_prod'

xusd

2 days ago c490640493f04e2ed0fc5c4c8fbc92ebdd4d5380

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

@@ -175,7 +175,7 @@

        //经办人ID
        String systemSource = request.getParameter("systemSource");
        if (StringUtils.isNotBlank(mediator)) {
        if (StringUtils.isNotBlank(systemSource)) {
            terms.put("systemSource", systemSource);
        }

@@ -1097,6 +1097,29 @@
    }

    /**
     * 工作统计
     *
     * @return Object
     * @url {ctx}/api/web/caseInfo/workStatistics
     * @CurrentUser String userId
     */
    @GetMapping("/workStatistics")
    public Object workStatistics(@CurrentUser String userId) {
        try {
            Map<String, Object> terms = getParameterAll();
            //统计类型 1-个人,2-单位
            String workType = request.getParameter("workType");
            if (ObjectUtils.isNotEmpty(workType)) {
                terms.put("workType", workType);
            }
            return ReturnSucUtils.getRepInfo("处理成功", service.workStatistics(terms, userId));
        } catch (Exception e) {
            log.error("Controller接口[CaseInfoWebController.workStatistics]请求异常：" + e, e);
            return ReturnFailUtils.getRepInfo();
        }
    }

    /**
     * 解纷态势
     *
     * @return Object