多机构管理修改

ZQN

2024-06-25 7c9373a305e8d889cf386eedbcf06bd8291f5c28

 project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java

@@ -60,15 +60,15 @@
        int complaintNum = complaintLogService.count();
        int docNum = docService.count(docService.lq().eq(SysDoc::getDocStatus,0));
        Map<String, Object> result = new HashMap<>(7);
        result.put("companyNum", companyNum);
        result.put("enforceCompanyNum", enforceCompanyNum);
        result.put("enforceDeptNum", enforceDeptNum);
        result.put("enforceUserNum", enforceUserNum);
        result.put("enforceOrderNum", enforceOrderNum);
        result.put("enforceOrderCheckedNum", enforceOrderCheckedNum);
        result.put("enforceOrderCompleteNum", enforceOrderCompleteNum);
        result.put("complaintNum", complaintNum);
        result.put("docNum", docNum);
        result.put("companyNum", companyNum); //企业数
        result.put("enforceCompanyNum", enforceCompanyNum);//被执法企业数
        result.put("enforceDeptNum", enforceDeptNum);//执法单位
        result.put("enforceUserNum", enforceUserNum);//执法人员
        result.put("enforceOrderNum", enforceOrderNum);//执法单总数
        result.put("enforceOrderCheckedNum", enforceOrderCheckedNum);//已审批执法单数
        result.put("enforceOrderCompleteNum", enforceOrderCompleteNum);//执法单完成数
        result.put("complaintNum", complaintNum);//投诉数
        result.put("docNum", docNum);//政策数
        return result;
    }

@@ -164,10 +164,10 @@
    {
        return dictDataList.stream().map(e -> {
            KeyVal keyVal;
            if (resultMap.get(e.getDictValue()) == null) {
            if (resultMap.get(e.getDictCode().toString()) == null) {
                keyVal = new KeyVal(e.getDictLabel(), 0);
            } else {
                keyVal = new KeyVal(e.getDictLabel(), resultMap.get(e.getDictValue()));
                keyVal = new KeyVal(e.getDictLabel(), resultMap.get(e.getDictCode().toString()));
            }
            return keyVal;
        }).collect(Collectors.toList());