Commit 7efcd0ae by Yujin Seo

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

一時保存時にtaskStatusを設問に含まれる情報から取り出すようにした。

See merge request !308
parents 02b212b1 9002cb98
......@@ -16,9 +16,9 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import jp.agentec.abook.abv.bl.common.ABVEnvironment;
import jp.agentec.abook.abv.bl.common.Callback;
......@@ -373,7 +373,21 @@ public class ABookCheckWebViewHelper extends ABookHelper {
// task登録・更新処理
mOperationLogic.registTaskData(taskKey, operationId, hotSpotInfo, taskJson);
TaskReportDto taskReportDto = mOperationLogic.getTaskReport(taskKey, taskReportLevel);
int taskStatus = taskReportDto != null ? taskReportDto.taskStatus : 0;
if (localSavedFlg) {
// 一時保存の場合、q_3_???の値でtaskStatusを取り出す
Iterator<String> keys = taskJson.keys();
while (keys.hasNext()) {
String key = keys.next();
if (key.startsWith("q_3_")) {
taskStatus = taskJson.getInt(key);
}
}
}
if (taskReportDto != null) {
// 更新
mOperationLogic.updateTaskReport(
......@@ -389,7 +403,7 @@ public class ABookCheckWebViewHelper extends ABookHelper {
localSavedFlg,
taskReportDto.getSendBackInfo(),
taskReportDto.getLockInfo(),
taskReportDto.taskStatus
taskStatus
);
} else {
// 登録
......@@ -406,7 +420,7 @@ public class ABookCheckWebViewHelper extends ABookHelper {
localSavedFlg,
null,
null,
0
taskStatus
);
}
mOperationLogic.createJsonForOperationContent(operationId, contentPath, false);
......
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