他の端末で追加したデータのレコードをinsertする際、taskStatusが渡されていなかった

ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java

@@ -295,7 +295,19 @@ public class OperationLogic extends AbstractLogic {
      * @param localSavedFlg
      * @param localSavedFlg
      * @throws IOException
      * @throws IOException
      */
      */
-    public void insertTaskReport(String taskKey, long operationId, long contentId, int reportLevel, int enableReport, JSONObject taskReportJson, String localAttachedFileName, boolean attachedChangeFlag, boolean dataSendFlg, boolean localSavedFlg) throws IOException {
+    public void insertTaskReport(
+            String taskKey,
+            long operationId,
+            long contentId,
+            int reportLevel,
+            int enableReport,
+            JSONObject taskReportJson,
+            String localAttachedFileName,
+            boolean attachedChangeFlag,
+            boolean dataSendFlg,
+            boolean localSavedFlg,
+            int taskStatus
+    ) throws IOException {
         TaskDto taskDto = mTaskDao.getTaskByTaskKey(taskKey);
         TaskDto taskDto = mTaskDao.getTaskByTaskKey(taskKey);
         if (taskDto == null) {
         if (taskDto == null) {
             //TODO error
             //TODO error
@@ -325,6 +337,7 @@ public class OperationLogic extends AbstractLogic {
         if (localAttachedFileName != null) {
         if (localAttachedFileName != null) {
             taskReportDto.localAttachedFileName = localAttachedFileName;
             taskReportDto.localAttachedFileName = localAttachedFileName;
         }
         }
+        taskReportDto.taskStatus = taskStatus;
 
 
         mTaskReportDao.insert(taskReportDto);
         mTaskReportDao.insert(taskReportDto);
 
 

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java

@@ -1050,9 +1050,18 @@ public class OperationListActivity extends OperationActivity {
                     }
                     }
                     if (localTaskReportDto == null) {
                     if (localTaskReportDto == null) {
                         // 登録
                         // 登録
-                        mOperationLogic.insertTaskReport(serverTaskDto.taskKey, operationId, operationContentDto.contentId,
-                                serverTaskReportDto.taskReportLevel, serverTaskReportDto.enableReport,
-                                taskReportJson, attachedFileName, false, false, false);
+                        mOperationLogic.insertTaskReport(
+                                serverTaskDto.taskKey,
+                                operationId,
+                                operationContentDto.contentId,
+                                serverTaskReportDto.taskReportLevel,
+                                serverTaskReportDto.enableReport,
+                                taskReportJson,
+                                attachedFileName,
+                                false,
+                                false,
+                                false,
+                                serverTaskDto.taskStatus);
                     } else {
                     } else {
                         // 更新
                         // 更新
                         // jsonDataが空で入る場合、taskReportJsonをnullで登録
                         // jsonDataが空で入る場合、taskReportJsonをnullで登録

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

@@ -397,7 +397,8 @@ public class ABookCheckWebViewHelper extends ABookHelper {
                         null,
                         null,
                         attachedChangeFlag,
                         attachedChangeFlag,
                         localSavedFlg ? false : true,
                         localSavedFlg ? false : true,
-                        localSavedFlg
+                        localSavedFlg,
+                        1//todo
                 );
                 );
             }
             }
             mOperationLogic.createJsonForOperationContent(operationId, contentPath, false);
             mOperationLogic.createJsonForOperationContent(operationId, contentPath, false);