Kazuyuki Hida · @hida-k · Kazuyuki Hida · Yujin Seo · Kazuyuki Hida · Yujin Seo
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/ReportStatusDao.java
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/ReportStatusDao.java
        return sql;
    }

-    public List<ReportStatusDto> getUntouchedReport() {
+    public List<ReportStatusDto> getNotStartedReport() {
        StringBuilder sql = reportStatusSql();
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/TaskReportDto.java
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/TaskReportDto.java
+
+    public static class SendBackInfo {
+        public final String sendBackUserId;
+        public final String sendBackUserName;
+        public final String sendBackComment;
+
+        public SendBackInfo(
+                String sendBackUserId,
+                String sendBackUserName,
+                String sendBackComment
+        ) {
+            this.sendBackUserId = sendBackUserId;
+            this.sendBackUserName = sendBackComment;
+            this.sendBackComment = sendBackComment;
+        }
+    }
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
-    public void updateTaskReport(String taskKey, long operationId, long contentId, int taskReportLevel, int enableReport, JSONObject taskReportJson, String localAttachedFileName, boolean attachedChangeFlag, boolean dataSendFlg, boolean localSavedFlg) throws IOException {
+    public void updateTaskReport(
+            String taskKey,
+            long operationId,
+            long contentId,
+            int taskReportLevel,
+            int enableReport,
+            JSONObject taskReportJson,
+            String localAttachedFileName,
+            boolean attachedChangeFlag,
+            boolean dataSendFlg,
+            boolean localSavedFlg,
+            TaskReportDto.SendBackInfo sendBackInfo,
+            TaskReportDto.LockInfo lockInfo,
+            int taskStatus
+    ) throws IOException {
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
            taskReportDto.localAttachedFileName = localAttachedFileName;
        }

+        if (sendBackInfo != null) {
+            taskReportDto.sendBackUserId = sendBackInfo.sendBackUserId;
+            taskReportDto.sendBackUserName = sendBackInfo.sendBackUserName;
+            taskReportDto.sendBackComment = sendBackInfo.sendBackComment;
+        }
+        if (lockInfo != null) {
+            taskReportDto.reportLockUserId = lockInfo.reportLockUserId;
+            taskReportDto.reportLockUserName = lockInfo.reportLockUserName;
+            taskReportDto.reportLockTime = lockInfo.reportLockTime;
+        }
+        taskReportDto.taskStatus = taskStatus;
+
--- 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
+                        mOperationLogic.updateTaskReport(
+                                serverTaskDto.taskKey,
+                                operationId,
+                                operationContentDto.contentId,
+                                serverTaskReportDto.taskReportLevel,
+                                serverTaskReportDto.enableReport,
+                                taskReportJson,
+                                attachedFileName,
+                                false,
+                                false,
+                                localTaskReportDto.localSavedFlg,
+                                serverTaskReportDto.getSendBackInfo(),
+                                serverTaskReportDto.getLockInfo(),
+                                serverTaskReportDto.taskStatus
+                        );
                    }
--- 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
-                mOperationLogic.updateTaskReport(taskReportDto.taskKey, operationId, contentId, taskReportLevel, Constant.EnableEditReport.YES, taskReportJson, null, attachedChangeFlag, localSavedFlg ? false : true, localSavedFlg);
+                mOperationLogic.updateTaskReport(
+                        taskReportDto.taskKey,
+                        operationId,
+                        contentId,
+                        taskReportLevel,
+                        Constant.EnableEditReport.YES,
+                        taskReportJson,
+                        null,
+                        attachedChangeFlag,
+                        localSavedFlg ? false : true,
+                        localSavedFlg,
+                        taskReportDto.getSendBackInfo(),
+                        taskReportDto.getLockInfo(),
+                        taskReportDto.taskStatus
+                );
--- 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
+                );
            } else {
                // 登録
-                mOperationLogic.insertTaskReport(taskKey, operationId, contentId, taskReportLevel, Constant.EnableEditReport.YES, taskReportJson, null, attachedChangeFlag, localSavedFlg ? false : true, localSavedFlg);
+                mOperationLogic.insertTaskReport(
+                        taskKey,
+                        operationId,
+                        contentId,
+                        taskReportLevel,
+                        Constant.EnableEditReport.YES,
+                        taskReportJson,
+                        null,
+                        attachedChangeFlag,
+                        localSavedFlg ? false : true,
+                        localSavedFlg
+                );