Commit fa2b2b86 by Yujin Seo

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

ロックに使うreportStartDateのタイムゾーンの指定が間違っていたのを修正。

See merge request !275
parents c5689db7 26ebcc7b
...@@ -29,7 +29,7 @@ public class LockReportParameters extends AcmsParameters { ...@@ -29,7 +29,7 @@ public class LockReportParameters extends AcmsParameters {
this.sid = sid; this.sid = sid;
this.taskKey = taskKey; this.taskKey = taskKey;
this.taskReportId = taskReportId; this.taskReportId = taskReportId;
this.reportStartDate = DateTimeUtil.toString(reportStartDate, DateTimeFormat.yyyyMMddHHmmssSSS_hyphen); this.reportStartDate = DateTimeUtil.toStringInTimeZone(reportStartDate, DateTimeFormat.yyyyMMddHHmmss_hyphen, "UTC");
this.userId = userId; this.userId = userId;
this.userName = userName; this.userName = userName;
} }
......
...@@ -24,7 +24,7 @@ public class UnlockReportParameters extends AcmsParameters { ...@@ -24,7 +24,7 @@ public class UnlockReportParameters extends AcmsParameters {
this.taskKey = taskKey; this.taskKey = taskKey;
this.taskReportId = taskReportId; this.taskReportId = taskReportId;
this.reportStartDate = DateTimeUtil.toString(reportStartDate, DateTimeFormat.yyyyMMddHHmmssSSS_hyphen); this.reportStartDate = DateTimeUtil.toStringInTimeZone(reportStartDate, DateTimeFormat.yyyyMMddHHmmssSSS_hyphen, "UTC");
} }
public String getTaskKey() { public String getTaskKey() {
......
...@@ -20,7 +20,6 @@ import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.ReportL ...@@ -20,7 +20,6 @@ import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.ReportL
import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.ReportStartDate; import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.ReportStartDate;
import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.ReportStatus; import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.ReportStatus;
import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.TaskReportId; import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.TaskReportId;
import static jp.agentec.abook.abv.bl.common.constant.ABookKeys.TASK_KEY;
public class LockReportLogic extends AbstractLogic { public class LockReportLogic extends AbstractLogic {
......
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