diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/MaintainSummaryServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/MaintainSummaryServiceImpl.java index 8616a79..af7aab5 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/MaintainSummaryServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/MaintainSummaryServiceImpl.java @@ -47,7 +47,6 @@ public class MaintainSummaryServiceImpl implements MaintainSummaryService { if(null == companyId || companyId == 0L || companyId == 100L){ companyId = null; } - Map respMap = new HashMap<>(); Long finalCompanyId = companyId; // 巡查计划、已完成、未完成 Map countInspectionPlan = countInspectionPlanByCompanyId(finalCompanyId); @@ -58,7 +57,8 @@ public class MaintainSummaryServiceImpl implements MaintainSummaryService { // 已完成工单 有效工单、无效工单 Map countCompletedWorkOrder = countCompletedWorkOrder(finalCompanyId); - // 等待所有查询完成 + + Map respMap = new HashMap<>(); respMap.put("inspectionPlan", countInspectionPlan); respMap.put("maintainPlan", countMaintainPlan); respMap.put("inProgressWorkOrder", countInProgressWorkOrder); @@ -602,17 +602,17 @@ public class MaintainSummaryServiceImpl implements MaintainSummaryService { // 2. 初始化响应Map并设置默认空字符串 Map respMap = new HashMap<>(); for (String type : queryTypes) { - respMap.put(type, "0"); + respMap.put(type, 0); } Integer sumTotalCount = 0; List> orderMap = homepageSummaryMapper.countCompletedWorkOrder(companyId); if (ObjectUtil.isNotEmpty(orderMap)) { for (Map mapItem : orderMap) { - String busiLine = mapItem.get("validOrder"); - if (ObjectUtil.isNotEmpty(busiLine) && respMap.containsKey(busiLine)) { + String workStatus = mapItem.get("workorder_valid_status"); + if (ObjectUtil.isNotEmpty(workStatus) && respMap.containsKey(workStatus)) { String totalCount = String.valueOf(mapItem.get("totalCount")); if (ObjectUtil.isNotEmpty(totalCount)) { - respMap.put(busiLine, totalCount); + respMap.put(workStatus, Integer.parseInt(totalCount)); sumTotalCount = sumTotalCount + Integer.parseInt(totalCount); } } diff --git a/urbanops-module-garden/src/main/resources/mapper/homepage/HomepageSummaryMapper.xml b/urbanops-module-garden/src/main/resources/mapper/homepage/HomepageSummaryMapper.xml index c9b0e28..df43b53 100644 --- a/urbanops-module-garden/src/main/resources/mapper/homepage/HomepageSummaryMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/homepage/HomepageSummaryMapper.xml @@ -14,7 +14,7 @@ t.deleted = 0 - AND t.worker_company_id = #{companyId} + AND t.company_id = #{companyId} @@ -31,7 +31,7 @@ t.deleted = 0 - AND t.worker_company_id = #{companyId} + AND t.company_id = #{companyId}