Merge branch 'gzdyh_prod'

xusd

1 days ago e9de6064cc94d6bc63685c5e62046ff810b96dab

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

@@ -1103,6 +1103,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
@@ -1185,6 +1208,9 @@
    @GetMapping("/pagePerson")
    public Object pagePerson(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size, @RequestParam(value = "certiNo") String certiNo) {
        try {
            if(StringUtils.isEmpty(certiNo)){
                return ReturnFailUtils.getRepInfo("请输入身份证号");
            }
            Map<String, Object> terms = getParameterAll();
            Sort sort = null;
            String sortName = null;