#32825 作業一覧画面改善

3493050a · Lee Jaebin · fcc8f297 · 3493050a · 3493050a · 3493050a
Commit 3493050a authored Mar 24, 2019 by Lee Jaebin
6 changed files
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/OperationContentDao.java
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/OperationContentDao.java
@@ -62,6 +62,15 @@ public class OperationContentDao extends AbstractDao {
        return rawQueryGetLongList("select content_id from r_operation_content where operation_id=?", new String[]{""+ operationId});
    }
+    /**
+     * 資料IDに紐づいた作業が存在しないと資料を削除する判定
+     * @param contentId
+     * @return
+     */
+    public boolean isDeleteContent (Long contentId) {
+        return rawQueryGetInt("select COUNT(*) from r_operation_content where content_id=?", new String[]{"" + contentId }) == 0;
+    }
    public boolean insertOperationContent(OperationContentDto dto) {
        StringBuffer sql = new StringBuffer();

--- 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
@@ -211,13 +211,13 @@ public class OperationDao extends AbstractDao {
    public void deleteAll() {
        delete("t_push_message", null, null);
        delete("r_operation_content", null, null);
+        delete("r_task_worker_group", null, null);
        delete("t_operation", null, null);
        delete("t_task", null, null);
        delete("t_task_report", null, null);
        delete("t_task_report_send", null, null);
        delete("t_task_report_items", null, null);
        delete("m_worker_group", null, null);
-        delete("r_task_worker_group", null, null);
    }
    public List<OperationDto> getOperations(String searchOperationName, String searchStartDateStr, String searchEndDateStr, String reportTypeStr) {

--- 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
@@ -247,6 +247,14 @@ public class TaskReportDao extends AbstractDao {
    }
    /**
+     * テーブル物理削除
+     * @param dto
+     */
+    public void delete(TaskReportDto dto) {
+        delete("t_task_report", "task_key=? and task_report_level=?", new String[] { dto.taskKey, "" + dto.taskReportLevel });
+    }
+    /**
     * テーブル物理削除（定期点検専用）
     * @param dto
     */

--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
+++ b/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
@@ -77,7 +77,6 @@ import jp.agentec.abook.abv.bl.download.ContentFileExtractor;
 import jp.agentec.abook.abv.bl.download.ContentZipDownloadNotification;
 import jp.agentec.abook.abv.bl.dto.ContentDto;
 import jp.agentec.abook.abv.bl.dto.FixPushMessageDto;
-import jp.agentec.abook.abv.bl.dto.RoutineTaskReportDto;
 import jp.agentec.abook.abv.bl.dto.OperationContentDto;
 import jp.agentec.abook.abv.bl.dto.OperationDto;
 import jp.agentec.abook.abv.bl.dto.PushMessageDto;
@@ -825,6 +824,7 @@ public class OperationListActivity extends ABVUIActivity {
        OperationDto operationDto = mOperationLogic.getOperation(operationId);
        OperationContentDto operationContentDto = mOperationContentDao.getOperationMainContent(operationId);
        List<TaskDto> localTaskList = mTaskDao.selectAllTaskByOperationId(operationId);
        Date lastEditDate;
        OperationDataJSON json = AcmsClient.getInstance(ABVDataCache.getInstance().getUrlPath(), ABVEnvironment.getInstance().networkAdapter).getOpereationData(param);
@@ -835,26 +835,35 @@ public class OperationListActivity extends ABVUIActivity {
            progress = 40 / json.taskDtoList.size();
        }
+        boolean isRoutineTask = operationDto.reportType == Constant.ReportType.Routine;
        JSONObject taskReportJson;
        for (TaskDto serverTaskDto : json.taskDtoList) {
-        if (operationDto.reportType == Constant.ReportType.Routine) {
-            if (isExistsTaskInList(localTaskList, serverTaskDto)) {
-                mTaskDao.update(serverTaskDto);
-            } else {
-                mTaskDao.insert(serverTaskDto);
-            }
-            List<TaskReportDto> localTaskReportList = mTaskReportDao.getNotNullStartDateTaskReportByTaskKey(serverTaskDto.taskKey);
            List<TaskReportDto> localRemove = new ArrayList();
-            // 先にローカルにしか存在しない事を削除 : DB, files
+            List<TaskReportDto> localTaskReportList = mTaskReportDao.getTaskReportListByTaskKey(serverTaskDto.taskKey);
            for (TaskReportDto localTaskReportDto : localTaskReportList) {
-                if (!isExistsRoutinTaskReportInList(serverTaskDto.taskReportDtoList, localTaskReportDto)) {
+                if (!isExistsTaskReportInList(serverTaskDto.taskReportDtoList, localTaskReportDto, isRoutineTask)) {
+                    if (isRoutineTask) {
                        mOperationLogic.deleteRoutineTaskReport(operationId, operationContentDto.contentId, localTaskReportDto);
-                    localRemove.add(localTaskReportDto);
+                    } else {
+                        // taskDtoが存在するとtaskReportLevel 0 (作業報告)が存在しないことはないので、報告（回答）のみチェックして削除
+                        if (localTaskReportDto.taskReportLevel == Constant.TaskReportLevel.ReportReplyType) {
+                            // 作業報告のディレクトリ削除
+                            mOperationLogic.deleteTaskReportReplyFileData(operationId, operationContentDto.contentId, serverTaskDto.taskKey);
+                            mTaskReportDao.delete(localTaskReportDto);
+                        }
+                    }
+                    localTaskReportList.remove(localTaskReportDto);
                }
            }
-            localTaskReportList.removeAll(localRemove);
+        if (operationDto.reportType == Constant.ReportType.Routine) {
+            if (isExistsTaskInList(localTaskList, serverTaskDto)) {
+                mTaskDao.update(serverTaskDto);
+            } else {
+                mTaskDao.insert(serverTaskDto);
+            }
            // サーバーからの情報で更新
            for (TaskReportDto taskReportDto : serverTaskDto.taskReportDtoList) {
@@ -866,7 +875,7 @@ public class OperationListActivity extends ABVUIActivity {
                if (isSyncGetTaskFileError) {
                    return null;
                }
-                if (isExistsRoutinTaskReportInList(localTaskReportList, taskReportDto)) {
+                if (isExistsTaskReportInList(localTaskReportList, taskReportDto, true)) {
                    // 報告データが存在すると作業報告を更新する
                    if (taskReportDto.jsonData != null) {
                        mOperationLogic.updateRoutineTaskReport(serverTaskDto.operationId, operationContentDto.contentId, taskReportDto, false, false, false, false);
@@ -901,8 +910,13 @@ public class OperationListActivity extends ABVUIActivity {
                    } else {
                        // 作業報告（回答）
                            if (taskReportDto.jsonData != null) {
-                            mOperationLogic.updateTaskReportReplyLevel(serverTaskDto.taskKey, serverTaskDto.operationId, operationContentDto.contentId,
+                                // データの更新
+                                mOperationLogic.updateTaskReportReply(serverTaskDto.taskKey, serverTaskDto.operationId, operationContentDto.contentId, taskReportDto.enableReport,
                                    new JSONObject(taskReportDto.jsonData), attachedFileName, false, false);
+                            } else {
+                                // jsonDataがない場合
+                                mOperationLogic.insertTaskReportReply(serverTaskDto.taskKey, operationContentDto.operationId, operationContentDto.contentId, taskReportDto.enableReport,
+                                        null, attachedFileName, false, false);
                            }
                    }
                    // 更新済みの場合、localTaskListから削除
@@ -928,8 +942,12 @@ public class OperationListActivity extends ABVUIActivity {
                                taskReportJson, serverTaskDto.taskHotSpotInfo, attachedFileName, false, false);
                    } else {
                        if (taskReportDto.jsonData != null) {
-                            mOperationLogic.insertTaskReportReply(serverTaskDto.taskKey, operationContentDto.operationId, operationContentDto.contentId,
+                            mOperationLogic.insertTaskReportReply(serverTaskDto.taskKey, operationContentDto.operationId, operationContentDto.contentId, taskReportDto.enableReport,
                                    new JSONObject(taskReportDto.jsonData), attachedFileName, false, false);
+                        } else {
+                            // jsonDataがない場合
+                            mOperationLogic.insertTaskReportReply(serverTaskDto.taskKey, operationContentDto.operationId, operationContentDto.contentId, taskReportDto.enableReport,
+                                    null, attachedFileName, false, false);
                        }
                    }
                }
@@ -1549,18 +1567,27 @@ public class OperationListActivity extends ABVUIActivity {
    }
    /**
-     * 定期点検の報告存在チェック
+     * 報告存在チェック
     * @param listDto
     * @param rDto
     * @return
     */
-    private boolean isExistsRoutinTaskReportInList(List<TaskReportDto> listDto, TaskReportDto rDto) {
+    private boolean isExistsTaskReportInList(List<TaskReportDto> listDto, TaskReportDto rDto, boolean isRoutineTask) {
        for (TaskReportDto lDto : listDto) {
+            if (isRoutineTask) {
+                // 定期点検の場合、taskKey,taskReportId,reportStartDateで判定
                if (lDto.taskKey.equals(rDto.taskKey) &&
                        lDto.taskReportId == rDto.taskReportId  &&
                        lDto.reportStartDate.equals(rDto.reportStartDate)) {
                    return true;
                }
+            } else {
+                // taskKeyと作業報告階層で判定
+                if (lDto.taskKey.equals(rDto.taskKey) &&
+                        lDto.taskReportLevel == rDto.taskReportLevel) {
+                    return true;
+                }
+            }
        }
        return false;
    }

--- 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
@@ -97,7 +97,11 @@ public class ABookCheckWebViewHelper extends ABookHelper {
                    mOperationLogic.createJsonForOperationContent(operationId, contentPath, false);
                    copyRoutineTaskReportAttachedMovie(operationId, contentId, taskKey, taskReportId, reportStartDate);
                } else {
+                    if (taskReportLevel == Constant.TaskReportLevel.ReportType) {
+                        mOperationLogic.deleteTaskReport(operationId, contentId, taskKey);
+                    } else {
                        mOperationLogic.deleteTaskReportReply(operationId, contentId, taskKey);
+                    }
                    mOperationLogic.createJsonForOperationContent(operationId, contentPath, false);
                    copyTaskAttachedMovie(operationId, contentId, taskKey, taskReportLevel);
                }
@@ -301,9 +305,9 @@ public class ABookCheckWebViewHelper extends ABookHelper {
                    }
                } else {
                    if (insertFlg) {
-                        mOperationLogic.insertTaskReportReply(taskKey, operationId, contentId, taskReportJson, null, attachedChangeFlag, true);
+                        mOperationLogic.insertTaskReportReply(taskKey, operationId, contentId, Constant.EnableReport.YES, taskReportJson, null, attachedChangeFlag, true);
                    } else {
-                        mOperationLogic.updateTaskReportReplyLevel(taskKey, operationId, contentId, taskReportJson, null, attachedChangeFlag, true);
+                        mOperationLogic.updateTaskReportReply(taskKey, operationId, contentId, Constant.EnableReport.YES, taskReportJson, null, attachedChangeFlag, true);
                    }
                }
            mOperationLogic.createJsonForOperationContent(operationId, contentPath, false);