Kazuyuki Hida · @hida-k · Kazuyuki Hida · Yujin Seo · Kazuyuki Hida · Yujin Seo
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/OperationDao.java
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/OperationDao.java
+            Logger.e(TAG, e);
+        }
+    }
+
+    public void coutUpCompletedFromWorking(long operationId) {
+        beginTransaction();
+        try {
+            execSql(decrementCount(operationId, "status_working_count"));
+            execSql(incrementCount(operationId, "status_completed_count"));
+            commit();
+        } catch (Throwable e) {
+            rollback();
+            Logger.e(TAG, e);
+        }
+    }
+}
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/TaskReportDao.java
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/TaskReportDao.java
+        int count;
+        StringBuilder sql = new StringBuilder();
+        sql.append("SELECT count(*) FROM t_task_report");
+        sql.append("  WHERE task_report_info_id > 0");
+        if (reportStartDate == null) {
+            // 報告
+            sql.append("  AND task_key=?");
+            count = rawQueryGetInt(sql.toString(), new String[] { taskKey });
+        } else {
+            // 点検
+            sql.append("  AND task_report_id=?");
+            sql.append("  AND datetime(report_start_date)=datetime(?, 'utc')");
+            count = rawQueryGetInt(sql.toString(), new String[] { String.valueOf(taskReportId), reportStartDate });
+        }
+        return count > 0;
+    }
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/WorkingReportDao.java 0 → 100644
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/WorkingReportDao.java 0 → 100644
+        sql.append(" GROUP BY t_operation.operation_id");
+
+        List<WorkingReportDto> list = rawQueryGetDtoList(sql.toString(), null, WorkingReportDto.class);
+
+        Map<Long, Integer> map = new HashMap<Long, Integer>();
+
+        for (WorkingReportDto dto : list) {
+            Long id = dto.getOperationId();
+            Integer cnt = dto.getCount();
+            if (id != null && cnt != null) {
+                map.put(id, cnt);
+            }
+        }
+        return map;
+    }
+}
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/WorkingReportDto.java 0 → 100644
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/WorkingReportDto.java 0 → 100644
+        return new String[0];
+    }
+
+    @Override
+    public Object[] getInsertValues() {
+        return new Object[0];
+    }
+
+    public Long getOperationId() {
+        return operationId;
+    }
+
+    public Integer getCount() {
+        return count;
+    }
+}
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
+        List<OperationDto> list = mOperationDao.getOperations(searchWord, searchStartDateStr, searchEndDateStr, reportTypeStr);
+        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) {
+                if (dto.reportType == 1) {
+                    // 定期点検の場合は、先にレポートが作られるので、その分を差し引く
+                    dto.statusNotStartedCount -= workingCount;
+                }
+                dto.statusWorkingCount += workingCount;
+            }
+        }
+
--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/DashboardActivity.java
+++ b/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/DashboardActivity.java
        try {
            switch (cmd) {
                case CMD_GET_REPORT_STATUS_COUNT: {
+                    countInitialized = true;
                    return getReportStatusCount();
                }
                case CMD_GET_REPORT_LIST: {
+                    if (! countInitialized) {
+                        getReportStatusCount();
+                    }
--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/DashboardActivity.java
+++ b/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/DashboardActivity.java
    }

    private boolean getReportStatusCount() {
-        //todo
-        return false;
+        ReportStatusDao dao = AbstractDao.getDao(ReportStatusDao.class);
+        JSONObject extParam = dao.getReportStatusCountJson();
+        afterABookCheckApi(CMD_GET_REPORT_STATUS_COUNT, "", 0,"", extParam.toString());
+        return true;
--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ABookCheckWebViewHelper.java
+++ b/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ABookCheckWebViewHelper.java

        switch (cmd) {
            case ABookKeys.CMD_INSERT_TASK_REPORT:
-            case ABookKeys.CMD_UPDATE_TASK_REPORT:
+            case ABookKeys.CMD_UPDATE_TASK_REPORT: {
+                // もとから作業中だったかを調べる
+                TaskReportDao taskReportDao = AbstractDao.getDao(TaskReportDao.class);
+                int rportId = Integer.parseInt(String.valueOf(param.getOrDefault(TaskReportId, "0")));
+                String startDate = param.getOrDefault(ReportStartDate, null);
+                boolean isLocalSaved = taskReportDao.isLocalSaved(taskKey, rportId, startDate);
+                boolean isCompleted = taskReportDao.isCompleted(taskKey, rportId, startDate);
+                // 報告書の更新
--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ABookCheckWebViewHelper.java
+++ b/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ABookCheckWebViewHelper.java
+                TaskReportDao taskReportDao = AbstractDao.getDao(TaskReportDao.class);
+                int rportId = Integer.parseInt(String.valueOf(param.getOrDefault(TaskReportId, "0")));
+                String startDate = param.getOrDefault(ReportStartDate, null);
+                boolean isLocalSaved = taskReportDao.isLocalSaved(taskKey, rportId, startDate);
+                boolean isCompleted = taskReportDao.isCompleted(taskKey, rportId, startDate);
+                // 報告書の更新
                insertOrUpdateTaskReport(taskKey, enableReportHistory, operationId, contentId, param, contentPath, reportType, taskReportLevel, false);
                copyTaskAttachedMovie(operationId, contentId, taskKey, taskReportLevel);
                sendTaskData(context, operationId, taskKey, taskReportLevel);
+                // 作業ステータスのカウントを変える
+                OperationDao operationDao = AbstractDao.getDao(OperationDao.class);
+                if (isLocalSaved) {
+                    operationDao.coutUpCompletedFromWorking(operationId);
+                } else if (! isCompleted) {
+                    operationDao.countUpCompleted(operationId);
+                }
--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ABookCheckWebViewHelper.java
+++ b/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ABookCheckWebViewHelper.java
+                if (! isLocalSaved) {
+                    OperationDao operationDao = AbstractDao.getDao(OperationDao.class);
+                    operationDao.countUpWorking(operationId);
+                }
                mFinishCallback.callback(false);
                break;
-            case ABookKeys.CMD_DELETE_TASK_REPORT:
+            case ABookKeys.CMD_DELETE_TASK_REPORT: {
                int taskReportId = 0;
                String reportStartDate = "";
                boolean sendTaskReportDataFlg = false;

                if (reportType == Constant.ReportType.RoutineTask) {
                    taskReportId = Integer.valueOf(param.get(ABookKeys.TASK_REPORT_ID));
-                    reportStartDate = param.get(ABookKeys.REPORT_START_DATE).replace("T", " ");
+                    reportStartDate = param.get(ABookKeys.REPORT_START_DATE);
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/OperationDao.java
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/OperationDao.java
+        StringBuilder sql = new StringBuilder();
+
+        sql.append("UPDATE t_operation ");
+        sql.append("  SET ").append(column).append(" = (").append(column).append(" + 1)");
+        sql.append("  WHERE operation_id = ").append(operationId);
+
+        return sql.toString();
+    }
+
+    private String decrementCount(long operationId, String column) {
+        StringBuilder sql = new StringBuilder();
+
+        sql.append("UPDATE t_operation ");
+        sql.append("  SET ").append(column).append(" = (").append(column).append(" - 1)");
+        sql.append("  WHERE operation_id = ").append(operationId);
+        sql.append("  AND ").append(column).append(" > 0");