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

初回起動時に差戻のアイコンやメッセージが表示されない不具合を修正

See merge request !291

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

@@ -306,6 +306,8 @@ public class OperationLogic extends AbstractLogic {
             boolean attachedChangeFlag,
             boolean attachedChangeFlag,
             boolean dataSendFlg,
             boolean dataSendFlg,
             boolean localSavedFlg,
             boolean localSavedFlg,
+            TaskReportDto.SendBackInfo sendBackInfo,
+            TaskReportDto.LockInfo lockInfo,
             int taskStatus
             int taskStatus
     ) throws IOException {
     ) throws IOException {
         TaskDto taskDto = mTaskDao.getTaskByTaskKey(taskKey);
         TaskDto taskDto = mTaskDao.getTaskByTaskKey(taskKey);
@@ -337,6 +339,16 @@ public class OperationLogic extends AbstractLogic {
         if (localAttachedFileName != null) {
         if (localAttachedFileName != null) {
             taskReportDto.localAttachedFileName = localAttachedFileName;
             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;
         taskReportDto.taskStatus = taskStatus;
 
 
         mTaskReportDao.insert(taskReportDto);
         mTaskReportDao.insert(taskReportDto);

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

@@ -1061,6 +1061,8 @@ public class OperationListActivity extends OperationActivity {
                                 false,
                                 false,
                                 false,
                                 false,
                                 false,
                                 false,
+                                serverTaskReportDto.getSendBackInfo(),
+                                serverTaskReportDto.getLockInfo(),
                                 serverTaskDto.taskStatus);
                                 serverTaskDto.taskStatus);
                     } else {
                     } else {
                         // 更新
                         // 更新

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

@@ -398,6 +398,8 @@ public class ABookCheckWebViewHelper extends ABookHelper {
                         attachedChangeFlag,
                         attachedChangeFlag,
                         localSavedFlg ? false : true,
                         localSavedFlg ? false : true,
                         localSavedFlg,
                         localSavedFlg,
+                        null,
+                        null,
                         1
                         1
                 );
                 );
             }
             }