Task #42713【iOS/And/Win】日付が変わっても未完了の報告は一覧に表示する

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

@@ -84,7 +84,7 @@ public class OperationLogic extends AbstractLogic {
     private PushMessageDao mPushMessageDao = AbstractDao.getDao(PushMessageDao.class);
     private PushMessageDao mPushMessageDao = AbstractDao.getDao(PushMessageDao.class);
 
 
     private TaskWorkerGroupDao mTaskWorkerGroupDao = AbstractDao.getDao(TaskWorkerGroupDao.class);
     private TaskWorkerGroupDao mTaskWorkerGroupDao = AbstractDao.getDao(TaskWorkerGroupDao.class);
-
+    private static final int FINISHED_STATUS = 999;
     public void initializeOperations() throws AcmsException, NetworkDisconnectedException {
     public void initializeOperations() throws AcmsException, NetworkDisconnectedException {
         // 作業グループリスト取得
         // 作業グループリスト取得
         setWorkingGroupList();
         setWorkingGroupList();
@@ -905,6 +905,17 @@ public class OperationLogic extends AbstractLogic {
         OperationDto operationDto = mOperationDao.getOperation(operationId);
         OperationDto operationDto = mOperationDao.getOperation(operationId);
         List<TaskReportDto> taskReportDtoList = mTaskReportDao.getTaskReportByOperationId(operationId);
         List<TaskReportDto> taskReportDtoList = mTaskReportDao.getTaskReportByOperationId(operationId);
 
 
+        //報告ステータスが完了のタスクキーを保存し、営業日変更時間チェック時に除外する。
+        List<TaskDto> taskDtoList = mTaskDao.selectAllTaskByOperationId(operationId);
+        List<String> finishStatusTaskKeyList = new ArrayList<String>();
+        for (TaskDto taskDto : taskDtoList) {
+            if (taskDto.taskStatus == FINISHED_STATUS) {
+                if (!finishStatusTaskKeyList.contains(taskDto.taskKey)) {
+                    finishStatusTaskKeyList.add(taskDto.taskKey);
+                }
+            }
+        }
+
         int level = 0;
         int level = 0;
         int listCount = 0;
         int listCount = 0;
         for (TaskReportDto dto : taskReportDtoList) {
         for (TaskReportDto dto : taskReportDtoList) {
@@ -917,10 +928,12 @@ public class OperationLogic extends AbstractLogic {
 
 
             if(dto.jsonData != null && dto.jsonData.length() > 0) {
             if(dto.jsonData != null && dto.jsonData.length() > 0) {
                 JSONObject editJson = new JSONObject(dto.jsonData);
                 JSONObject editJson = new JSONObject(dto.jsonData);
-                //営業日変更時間チェックを行う
+                //報告ステータスが完了の場合、営業日変更時間チェックを行う
+                if (finishStatusTaskKeyList.contains(dto.taskKey)) {
                     if (checkWorkdayChangeTime(editJson)) {
                     if (checkWorkdayChangeTime(editJson)) {
                         continue;
                         continue;
                     }
                     }
+                }
                 if (operationDto.reportType == Constant.ReportType.ReportReply) {
                 if (operationDto.reportType == Constant.ReportType.ReportReply) {
                     editJson.put(ABookKeys.HAS_AUTHORITY, dto.enableReport);
                     editJson.put(ABookKeys.HAS_AUTHORITY, dto.enableReport);
                     editJson.put(ABookKeys.LOCAL_SAVE_FLG, dto.localSavedFlg);
                     editJson.put(ABookKeys.LOCAL_SAVE_FLG, dto.localSavedFlg);