Skip to content

A
abook_check
Commit 87d19e98 by Lee Jaebin
Options

ホットスポット更新後、送信処理 

作業一覧で期間の文字列を削除
parent 3a339c8a
Showing with 24 additions and 23 deletions
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/TaskReportDao.java
...@@ -211,7 +211,7 @@ public class TaskReportDao extends AbstractDao { ...@@ -211,7 +211,7 @@ public class TaskReportDao extends AbstractDao {
} }
/** /**
* * ホットスポットが更新フラグがtrueのデータ取得
* @param operationId * @param operationId
* @param taskKey * @param taskKey
* @return * @return
...@@ -224,14 +224,23 @@ public class TaskReportDao extends AbstractDao { ...@@ -224,14 +224,23 @@ public class TaskReportDao extends AbstractDao {
sb.append(" t_task tt "); sb.append(" t_task tt ");
sb.append(" ON tt.task_key == ttr.task_key "); sb.append(" ON tt.task_key == ttr.task_key ");
sb.append(" WHERE tt.hotspot_changed_flg = 1"); sb.append(" WHERE tt.hotspot_changed_flg = 1");
sb.append(" AND tt.task_report_level = 0");
sb.append(" AND tt.operation_id = ?"); sb.append(" AND tt.operation_id = ?");
if (taskKey == null) { sb.append(" AND ttr.task_report_level = 0");
if (taskKey != null) {
sb.append(" AND ttr.task_key = ?"); sb.append(" AND ttr.task_key = ?");
} }
return rawQueryGetDtoList(sb.toString(), new String[]{"" + operationId}, TaskReportDto.class); return rawQueryGetDtoList(sb.toString(), new String[]{"" + operationId}, TaskReportDto.class);
} }
/**
* ホットスポットが更新フラグがtrueのデータ存在チェック
* @param operationId
* @return
*/
public boolean isExistUpdateTargetHotSpotTaskData(Long operationId) {
return getUpdateTargetHotSpotTaskData(operationId, null).size() > 0;
}
/** /**
* 送信フラグがtrueのデータを取得 * 送信フラグがtrueのデータを取得
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
...@@ -1009,8 +1009,8 @@ public class OperationLogic extends AbstractLogic { ...@@ -1009,8 +1009,8 @@ public class OperationLogic extends AbstractLogic {
List<OperationDto> operationDtoList; List<OperationDto> operationDtoList;
operationDtoList = mOperationDao.getOperations(searchWord, searchStartDateStr, searchEndDateStr, reportTypeStr); operationDtoList = mOperationDao.getOperations(searchWord, searchStartDateStr, searchEndDateStr, reportTypeStr);
for (OperationDto operationDto : operationDtoList) { for (OperationDto operationDto : operationDtoList) {
// 作業送信フラグが存在する場合、needSyncFlgをtrueにセット // 作業送信フラグが存在する場合またはホットスポット更新フラグが存在する場合、needSyncFlgをtrueにセット
if (mTaskReportDao.isExistSendTaskData(operationDto.operationId)) { if (mTaskReportDao.isExistSendTaskData(operationDto.operationId) || mTaskReportDao.isExistUpdateTargetHotSpotTaskData(operationDto.operationId)) {
mOperationDao.updateNeedSyncFlg(operationDto.operationId, true); mOperationDao.updateNeedSyncFlg(operationDto.operationId, true);
} }
} }
...@@ -1335,7 +1335,8 @@ public class OperationLogic extends AbstractLogic { ...@@ -1335,7 +1335,8 @@ public class OperationLogic extends AbstractLogic {
} }
/** /**
* ホットスポットのアップデートがあるが、sendテーブルに存在しない場合、登録 * ホットスポットのアップデートがあるが、sendテーブルに存在しない場合、登録して
* t_task_reportのdata_send_flgをtrueにセットする
* @param operationId * @param operationId
* @param taskKey * @param taskKey
* @throws IOException * @throws IOException
...@@ -1347,6 +1348,9 @@ public class OperationLogic extends AbstractLogic { ...@@ -1347,6 +1348,9 @@ public class OperationLogic extends AbstractLogic {
insertTaskReportSend(taskReportDto.taskKey, taskReportDto.taskReportId, DateTimeUtil.toString(taskReportDto.reportStartDate, insertTaskReportSend(taskReportDto.taskKey, taskReportDto.taskReportId, DateTimeUtil.toString(taskReportDto.reportStartDate,
DateTimeFormat.yyyyMMddHHmmss_hyphen), new JSONObject(taskReportDto.jsonData), false); DateTimeFormat.yyyyMMddHHmmss_hyphen), new JSONObject(taskReportDto.jsonData), false);
TaskDto taskDto = mTaskDao.getTaskByTaskKey(taskReportDto.taskKey); TaskDto taskDto = mTaskDao.getTaskByTaskKey(taskReportDto.taskKey);
taskReportDto.dataSendFlg = true;
mTaskReportDao.update(taskReportDto);
taskDto.hotspotChangeFlg = false; taskDto.hotspotChangeFlg = false;
mTaskDao.update(taskDto); mTaskDao.update(taskDto);
} }
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/adapter/OperationListAdapter.java
...@@ -94,22 +94,15 @@ public class OperationListAdapter extends AbstractOperationAdapter { ...@@ -94,22 +94,15 @@ public class OperationListAdapter extends AbstractOperationAdapter {
if (StringUtil.isNullOrEmpty(operationDto.reportPeriod)) { if (StringUtil.isNullOrEmpty(operationDto.reportPeriod)) {
// リソースパターンの適用 // リソースパターンの適用
holder.tvDate.setText(PatternStringUtil.patternToString(mContext, holder.tvDate.setText(PatternStringUtil.patternToString(mContext,
R.string.date_label_routineTask,
getUserPref(mContext, AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)) + " : " + PatternStringUtil.patternToString(mContext,
R.string.msg_no_report_data, R.string.msg_no_report_data,
getUserPref(mContext, AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0))); getUserPref(mContext, AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)));
} else { } else {
// リソースパターンの適用 // リソースパターンの適用
holder.tvDate.setText(PatternStringUtil.patternToString(mContext, holder.tvDate.setText(operationDto.reportPeriod);
R.string.date_label_routineTask,
getUserPref(mContext, AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)) + " : " + (mNormalSizeFlg ? "\n" : "") + operationDto.reportPeriod);
} }
} else { } else {
// リソースパターンの適用 // リソースパターンの適用
holder.tvDate.setText(PatternStringUtil.patternToString(mContext, holder.tvDate.setText(DateTimeUtil.toString(operationDto.operationStartDate, DateTimeFormat.yyyyMMdd_slash) + " ~ " + DateTimeUtil.toString(operationDto.operationEndDate, DateTimeFormat.yyyyMMdd_slash));
R.string.date_label,
getUserPref(mContext, AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)) + " : " + DateTimeUtil.toString(operationDto.operationStartDate, DateTimeFormat.yyyyMMdd_slash) + " ~ " + DateTimeUtil.toString(operationDto.operationEndDate, DateTimeFormat.yyyyMMdd_slash));
} }
// 同期ボタン表示・非表示 // 同期ボタン表示・非表示
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/adapter/OperationPanelAdapter.java
...@@ -126,21 +126,15 @@ public class OperationPanelAdapter extends AbstractOperationAdapter { ...@@ -126,21 +126,15 @@ public class OperationPanelAdapter extends AbstractOperationAdapter {
if (StringUtil.isNullOrEmpty(operationDto.reportPeriod)) { if (StringUtil.isNullOrEmpty(operationDto.reportPeriod)) {
// リソースパターンの適用 // リソースパターンの適用
holder.tvDate.setText(PatternStringUtil.patternToString(mContext, holder.tvDate.setText(PatternStringUtil.patternToString(mContext,
R.string.date_label_routineTask,
getUserPref(mContext, AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)) + " : " + PatternStringUtil.patternToString(mContext,
R.string.msg_no_report_data, R.string.msg_no_report_data,
getUserPref(mContext, AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0))); getUserPref(mContext, AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)));
} else { } else {
// リソースパターンの適用 // リソースパターンの適用
holder.tvDate.setText(PatternStringUtil.patternToString(mContext, holder.tvDate.setText(operationDto.reportPeriod);
R.string.date_label_routineTask,
getUserPref(mContext, AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)) + " : " + (mNormalSizeFlg ? "\n" : "") + operationDto.reportPeriod);
} }
} else { } else {
// リソースパターンの適用 // リソースパターンの適用
holder.tvDate.setText(PatternStringUtil.patternToString(mContext, holder.tvDate.setText(DateTimeUtil.toString(operationDto.operationStartDate, DateTimeFormat.yyyyMMdd_slash) + " ~ " + DateTimeUtil.toString(operationDto.operationEndDate, DateTimeFormat.yyyyMMdd_slash));
R.string.date_label,
getUserPref(mContext, AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)) + " : " + DateTimeUtil.toString(operationDto.operationStartDate, DateTimeFormat.yyyyMMdd_slash) + " ~ " + DateTimeUtil.toString(operationDto.operationEndDate, DateTimeFormat.yyyyMMdd_slash));
} }
// 同期ボタン表示・非表示 // 同期ボタン表示・非表示
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ContentViewActivity.java
...@@ -5227,6 +5227,7 @@ public class ContentViewActivity extends ABVContentViewActivity { ...@@ -5227,6 +5227,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
operationTaskLayout.setIconStatus(taskKey, true); operationTaskLayout.setIconStatus(taskKey, true);
operationTaskLayout.currentTaskDto.taskKey = taskKey; operationTaskLayout.currentTaskDto.taskKey = taskKey;
operationTaskLayout.currentTaskDto.taskCode = taskCode; operationTaskLayout.currentTaskDto.taskCode = taskCode;
operationTaskLayout.currentTaskDto.isFinished = operationTaskLayout.isTaskFinished(taskKey);
operationTaskLayout.addOperationTaskIcon(operationTaskLayout.currentLayout, operationTaskLayout.currentTaskDto); operationTaskLayout.addOperationTaskIcon(operationTaskLayout.currentLayout, operationTaskLayout.currentTaskDto);
//hideOperationTaskLayout(); //hideOperationTaskLayout();
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment