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

他の端末で登録された報告が未実施扱いになっている不具合を修正

See merge request !288

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

@@ -295,7 +295,19 @@ public class OperationLogic extends AbstractLogic {
      * @param 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) 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);
         if (taskDto == null) {
             //TODO error
@@ -325,6 +337,7 @@ public class OperationLogic extends AbstractLogic {
         if (localAttachedFileName != null) {
             taskReportDto.localAttachedFileName = localAttachedFileName;
         }
+        taskReportDto.taskStatus = taskStatus;
 
         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) {
                         // 登録
-                        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 {
                         // 更新
                         // 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,
                         attachedChangeFlag,
                         localSavedFlg ? false : true,
-                        localSavedFlg
+                        localSavedFlg,
+                        0
                 );
             }
             mOperationLogic.createJsonForOperationContent(operationId, contentPath, false);