Merge branch 'feature/contract/sato/1.0.300_52681_local_saved_count' into 'contract/sato/1.0.300'

カテゴリを絞った際にも、一時保存の件数を加算するようにした。

See merge request !309

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/OperationGroupMasterListHelper.java

 package jp.agentec.abook.abv.ui.home.helper;
 package jp.agentec.abook.abv.ui.home.helper;
 
 
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 import jp.agentec.abook.abv.bl.acms.type.OperationSortingType;
 import jp.agentec.abook.abv.bl.acms.type.OperationSortingType;
 import jp.agentec.abook.abv.bl.common.ABVEnvironment;
 import jp.agentec.abook.abv.bl.common.ABVEnvironment;
 import jp.agentec.abook.abv.bl.common.log.Logger;
 import jp.agentec.abook.abv.bl.common.log.Logger;
 import jp.agentec.abook.abv.bl.data.dao.AbstractDao;
 import jp.agentec.abook.abv.bl.data.dao.AbstractDao;
 import jp.agentec.abook.abv.bl.data.dao.OperationGroupMasterDao;
 import jp.agentec.abook.abv.bl.data.dao.OperationGroupMasterDao;
+import jp.agentec.abook.abv.bl.data.dao.WorkingReportDao;
 import jp.agentec.abook.abv.bl.dto.OperationDto;
 import jp.agentec.abook.abv.bl.dto.OperationDto;
 import jp.agentec.abook.abv.bl.dto.OperationGroupMasterDto;
 import jp.agentec.abook.abv.bl.dto.OperationGroupMasterDto;
 import jp.agentec.abook.abv.bl.logic.AbstractLogic;
 import jp.agentec.abook.abv.bl.logic.AbstractLogic;
@@ -82,7 +84,18 @@ public class OperationGroupMasterListHelper extends CategoryOperationListHelper<
         // 報告 or 定期点検
         // 報告 or 定期点検
         String reportTypeStr = getUserPref(mAppActivity, AppDefType.UserPrefKey.OPERATION_REPORT_TYPES, null);
         String reportTypeStr = getUserPref(mAppActivity, AppDefType.UserPrefKey.OPERATION_REPORT_TYPES, null);
 
 
-        return mOperationGroupMasterLogic.getOperationByOperationGroupMasterId(peekOperationGroupMasterDto.operationGroupMasterId, reportTypeStr, operationSortingType);
+        List<OperationDto> list = mOperationGroupMasterLogic.getOperationByOperationGroupMasterId(peekOperationGroupMasterDto.operationGroupMasterId, reportTypeStr, operationSortingType);
+
+        // ローカル保存している分を補正する
+        WorkingReportDao dao = AbstractDao.getDao(WorkingReportDao.class);
+        Map<Long, Integer> working = dao.getWorkingTaskReportCounts();
+        for (OperationDto dto : list) {
+            Integer workingCount = working.get(dto.operationId);
+            if (workingCount != null) {
+                dto.statusNotStartedCount += workingCount;
+            }
+        }
+        return list;
     }
     }
 
 
     /**
     /**