Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
abook_check
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_android
abook_check
Commits
e518450d
Commit
e518450d
authored
Feb 01, 2023
by
Kazuyuki Hida
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/contract/sato/1.0.300_fix_lock' into contract/sato/1.0.300_hida
parents
c3a7adee
b5dc7caf
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
+9
-9
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/LockReportLogic.java
+2
-2
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/UnlockReportLogic.java
+1
-1
gradle.properties
+6
-6
No files found.
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/LockReportLogic.java
View file @
e518450d
...
...
@@ -202,13 +202,13 @@ public class LockReportLogic extends AbstractLogic {
extParam
.
put
(
ReportStatus
,
String
.
valueOf
(
reportStatus
));
extParam
.
put
(
ReportLockUserId
,
reportLockUserId
);
extParam
.
put
(
ReportLockUserName
,
reportLockUserName
);
extParam
.
put
(
ReportLockTime
,
DateTimeUtil
.
toStringInTimeZone
(
reportLockTime
,
DateTimeFormat
.
yyyyMMddHHmmss
SSS
_hyphen
,
"UTC"
));
extParam
.
put
(
ReportLockTime
,
DateTimeUtil
.
toStringInTimeZone
(
reportLockTime
,
DateTimeFormat
.
yyyyMMddHHmmss_hyphen
,
"UTC"
));
if
(
taskReportId
!=
null
&&
taskReportId
!=
0
)
{
extParam
.
put
(
TaskReportId
,
taskReportId
);
}
if
(
reportStartDate
!=
null
)
{
extParam
.
put
(
ReportStartDate
,
DateTimeUtil
.
toStringInTimeZone
(
reportStartDate
,
DateTimeFormat
.
yyyyMMddHHmmss
SSS
_hyphen
,
"UTC"
));
extParam
.
put
(
ReportStartDate
,
DateTimeUtil
.
toStringInTimeZone
(
reportStartDate
,
DateTimeFormat
.
yyyyMMddHHmmss_hyphen
,
"UTC"
));
}
return
extParam
.
toString
();
}
...
...
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/UnlockReportLogic.java
View file @
e518450d
...
...
@@ -150,7 +150,7 @@ public class UnlockReportLogic extends AbstractLogic {
extParam
.
put
(
TaskReportId
,
taskReportId
);
}
if
(
reportStartDate
!=
null
)
{
extParam
.
put
(
ReportStartDate
,
DateTimeUtil
.
toStringInTimeZone
(
reportStartDate
,
DateTimeFormat
.
yyyyMMddHHmmss
SSS
_hyphen
,
"UTC"
));
extParam
.
put
(
ReportStartDate
,
DateTimeUtil
.
toStringInTimeZone
(
reportStartDate
,
DateTimeFormat
.
yyyyMMddHHmmss_hyphen
,
"UTC"
));
}
return
extParam
.
toString
();
}
...
...
gradle.properties
View file @
e518450d
...
...
@@ -37,10 +37,10 @@ app_versioncode=1
# abvEnvironments.xml
#cms server
acms_address
=
https://check.abookcloud.com/acms
download_server_address
=
https://check.abookcloud.com/acms
#
acms_address=https://abook188-1.abook.bz/acms
#
download_server_address=https://abook188-1.abook.bz/acms
#
acms_address=https://check.abookcloud.com/acms
#
download_server_address=https://check.abookcloud.com/acms
acms_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
#download_server_address=http://10.0.2.2:8080/acms
...
...
@@ -96,8 +96,8 @@ hope_page=http://www.sato.co.jp
contact_email
=
grp-atform_support@sato-global.com
#Log Settings
log_level
=
2
#
log_level=1
#
log_level=2
log_level
=
1
default_log_name
=
abvje
#エラーレポート/Exportログ送信方法 1:acms 2:平文メール(開発・テスト時のみ) 3:暗号化添付メール
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment