Merge branch 'gzdyh_prod'

xusd

2 days ago c490640493f04e2ed0fc5c4c8fbc92ebdd4d5380

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

@@ -173,6 +173,12 @@
            terms.put("mediator", mediator);
        }

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

        String peopleNum = request.getParameter("peopleNum");
        if (StringUtils.isNotBlank(peopleNum)) {
            String[] split = peopleNum.split("-");
@@ -1324,83 +1330,41 @@
            // 查询类型 1-本系统，2-12345，3-人民调解，4-信访，5-劳动仲裁，6-非警务纠纷
            String ledgerType = request.getParameter("ledgerType");

            if("1".equals(ledgerType)){
                terms.put("canalList", Arrays.asList("22_00001-1","22_00001-2","22_00001-3"));
            }else if("2".equals(ledgerType)){
                terms.put("canal", "22_00001-4");
                terms.put("canalSecond", "22_00003-3");
                terms.put("canalSecondNot", "22_00003-2");
            }else if("6".equals(ledgerType)){
                terms.put("canal", "22_00001-4");
                terms.put("canalSecond", "22_00003-4");
                terms.put("canalSecondNot", "22_00003-2");
            }else if("4".equals(ledgerType)){
                terms.put("canal", "22_00001-4");
                terms.put("canalSecond", "22_00003-6");
                terms.put("canalSecondNot", "22_00003-2");
            }else if("5".equals(ledgerType)){
                terms.put("canal", "22_00001-4");
                terms.put("canalSecond", "22_00003-5");
                terms.put("canalSecondNot", "22_00003-2");
            }else if("3".equals(ledgerType)){
                terms.put("canal", "22_00001-4");
                terms.put("canalSecond", "22_00003-1");
                terms.put("canalSecondNot", "22_00003-2");
            }else{
                terms.put("canalSecondAll", "22_00003-2");
            //所有表里面的数据都是本系统，其他的后续会新建表存储
            if(ObjectUtils.isNotEmpty(ledgerType) && !"1".equals(ledgerType)){
                terms.put("canal", "-1");
            }
            return ReturnSucUtils.getRepInfo("处理成功", service.ledger(terms, userId));
            return ReturnSucUtils.getRepInfo("处理成功", service.ledger(terms, userId, ledgerType));
        } catch (Exception e) {
            log.error("Controller接口[CaseInfoWebController.ledger]请求异常：" + e, e);
            return ReturnFailUtils.getRepInfo();
        }
    }
    // /**
    //  * 解纷态势
    //  *
    //  * @return Object
    //  * @url {ctx}/api/web/caseInfo/ledger
    //  * @CurrentUser String userId
    //  */
    // @GetMapping("/ledger")
    // public Object ledger(@CurrentUser String userId) {
    //     try {
    //         Map<String, Object> terms = getParameterAll();
    //         // 查询类型 1-本系统，2-12345，3-人民调解，4-信访，5-劳动仲裁，6-非警务纠纷
    //         String ledgerType = request.getParameter("ledgerType");
    //
    //         if("1".equals(ledgerType)){
    //             terms.put("canalList", Arrays.asList("22_00001-1","22_00001-2","22_00001-3"));
    //         }else if("2".equals(ledgerType)){
    //             terms.put("canal", "22_00001-4");
    //             terms.put("canalSecond", "22_00003-3");
    //             terms.put("canalSecondNot", "22_00003-2");
    //         }else if("3".equals(ledgerType)){
    //             terms.put("canal", "22_00001-4");
    //             terms.put("canalSecond", "22_00003-4");
    //             terms.put("canalSecondNot", "22_00003-2");
    //         }else if("4".equals(ledgerType)){
    //             terms.put("canal", "22_00001-4");
    //             terms.put("canalSecond", "22_00003-6");
    //             terms.put("canalSecondNot", "22_00003-2");
    //         }else if("5".equals(ledgerType)){
    //             terms.put("canal", "22_00001-4");
    //             terms.put("canalSecond", "22_00003-5");
    //             terms.put("canalSecondNot", "22_00003-2");
    //         }else if("6".equals(ledgerType)){
    //             terms.put("canal", "22_00001-4");
    //             terms.put("canalSecond", "22_00003-1");
    //             terms.put("canalSecondNot", "22_00003-2");
    //         }else{
    //             terms.put("canalSecondAll", "22_00003-2");
    //         }
    //         return ReturnSucUtils.getRepInfo("处理成功", service.ledger(terms, userId));
    //     } catch (Exception e) {
    //         log.error("Controller接口[CaseInfoWebController.ledger]请求异常：" + e, e);
    //         return ReturnFailUtils.getRepInfo();
    //     }
    // }

    /**
     * 解纷态势
     *
     * @return Object
     * @url {ctx}/api/web/caseInfo/ledgerCount
     * @CurrentUser String userId
     */
    @GetMapping("/ledgerCount")
    public Object ledgerCount(@CurrentUser String userId) {
        try {
            Map<String, Object> terms = getParameterAll();
            // 查询类型 1-本系统，2-12345，3-人民调解，4-信访，5-劳动仲裁，6-非警务纠纷
            String ledgerType = request.getParameter("ledgerType");

            //所有表里面的数据都是本系统，其他的后续会新建表存储
            if(ObjectUtils.isNotEmpty(ledgerType) && !"1".equals(ledgerType)){
                terms.put("canal", "-1");
            }
            return ReturnSucUtils.getRepInfo("处理成功", service.ledgerCount(terms, userId));
        } catch (Exception e) {
            log.error("Controller接口[CaseInfoWebController.ledger]请求异常：" + e, e);
            return ReturnFailUtils.getRepInfo();
        }
    }

    /**
     * 查询重复事项