Skip to content

A
abook_check
Commit e518450d by Kazuyuki Hida
Options

Merge branch 'feature/contract/sato/1.0.300_fix_lock' into contract/sato/1.0.300_hida

parents c3a7adee b5dc7caf
Showing with 9 additions and 9 deletions
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/LockReportLogic.java
...@@ -202,13 +202,13 @@ public class LockReportLogic extends AbstractLogic { ...@@ -202,13 +202,13 @@ public class LockReportLogic extends AbstractLogic {
extParam.put(ReportStatus, String.valueOf(reportStatus)); extParam.put(ReportStatus, String.valueOf(reportStatus));
extParam.put(ReportLockUserId, reportLockUserId); extParam.put(ReportLockUserId, reportLockUserId);
extParam.put(ReportLockUserName, reportLockUserName); extParam.put(ReportLockUserName, reportLockUserName);
extParam.put(ReportLockTime, DateTimeUtil.toStringInTimeZone(reportLockTime, DateTimeFormat.yyyyMMddHHmmssSSS_hyphen, "UTC")); extParam.put(ReportLockTime, DateTimeUtil.toStringInTimeZone(reportLockTime, DateTimeFormat.yyyyMMddHHmmss_hyphen, "UTC"));
if (taskReportId != null && taskReportId != 0) { if (taskReportId != null && taskReportId != 0) {
extParam.put(TaskReportId, taskReportId); extParam.put(TaskReportId, taskReportId);
} }
if (reportStartDate != null) { if (reportStartDate != null) {
extParam.put(ReportStartDate, DateTimeUtil.toStringInTimeZone(reportStartDate, DateTimeFormat.yyyyMMddHHmmssSSS_hyphen, "UTC")); extParam.put(ReportStartDate, DateTimeUtil.toStringInTimeZone(reportStartDate, DateTimeFormat.yyyyMMddHHmmss_hyphen, "UTC"));
} }
return extParam.toString(); return extParam.toString();
} }
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/UnlockReportLogic.java
...@@ -150,7 +150,7 @@ public class UnlockReportLogic extends AbstractLogic { ...@@ -150,7 +150,7 @@ public class UnlockReportLogic extends AbstractLogic {
extParam.put(TaskReportId, taskReportId); extParam.put(TaskReportId, taskReportId);
} }
if (reportStartDate != null) { if (reportStartDate != null) {
extParam.put(ReportStartDate, DateTimeUtil.toStringInTimeZone(reportStartDate, DateTimeFormat.yyyyMMddHHmmssSSS_hyphen, "UTC")); extParam.put(ReportStartDate, DateTimeUtil.toStringInTimeZone(reportStartDate, DateTimeFormat.yyyyMMddHHmmss_hyphen, "UTC"));
} }
return extParam.toString(); return extParam.toString();
} }
......
gradle.properties
...@@ -37,10 +37,10 @@ app_versioncode=1 ...@@ -37,10 +37,10 @@ app_versioncode=1
# abvEnvironments.xml # abvEnvironments.xml
#cms server #cms server
acms_address=https://check.abookcloud.com/acms #acms_address=https://check.abookcloud.com/acms
download_server_address=https://check.abookcloud.com/acms #download_server_address=https://check.abookcloud.com/acms
#acms_address=https://abook188-1.abook.bz/acms acms_address=https://abook188-1.abook.bz/acms
#download_server_address=https://abook188-1.abook.bz/acms download_server_address=https://abook188-1.abook.bz/acms
#acms_address=http://10.0.2.2:8080/acms #acms_address=http://10.0.2.2:8080/acms
#download_server_address=http://10.0.2.2:8080/acms #download_server_address=http://10.0.2.2:8080/acms
...@@ -96,8 +96,8 @@ hope_page=http://www.sato.co.jp ...@@ -96,8 +96,8 @@ hope_page=http://www.sato.co.jp
contact_email=grp-atform_support@sato-global.com contact_email=grp-atform_support@sato-global.com
#Log Settings #Log Settings
log_level=2 #log_level=2
#log_level=1 log_level=1
default_log_name=abvje default_log_name=abvje
#エラーレポート/Exportログ送信方法 1:acms 2:平文メール（開発・テスト時のみ） 3:暗号化添付メール #エラーレポート/Exportログ送信方法 1:acms 2:平文メール（開発・テスト時のみ） 3:暗号化添付メール
......
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