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
b10a77da
Commit
b10a77da
authored
Feb 06, 2023
by
Kazuyuki Hida
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ダッシュボードの件数表示と一覧表示の不具合を修正
parent
f87bac92
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/AcmsJSONParser.java
+5
-3
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/DashboardStatusJSON.java
+3
-1
No files found.
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/AcmsJSONParser.java
View file @
b10a77da
...
...
@@ -181,13 +181,15 @@ public abstract class AcmsJSONParser extends CloneableObject {
}
}
protected
Date
getDateOrNull
(
JSONObject
json
,
String
key
)
{
protected
Date
getDateOrNull
(
JSONObject
json
,
String
key
,
String
timeZone
)
{
if
(
json
.
has
(
key
))
{
return
DateTimeUtil
.
toDate
(
json
.
getString
(
key
),
"UTC"
,
DateTimeFormat
.
yyyyMMddHHmmss_hyphen
);
return
DateTimeUtil
.
toDate
(
json
.
getString
(
key
),
timeZone
,
DateTimeFormat
.
yyyyMMddHHmmss_hyphen
);
}
else
{
return
null
;
}
}
protected
Date
getDateOrNull
(
JSONObject
json
,
String
key
)
{
return
getDateOrNull
(
json
,
key
,
"UTC"
);
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/DashboardStatusJSON.java
View file @
b10a77da
...
...
@@ -6,6 +6,7 @@ import org.json.adf.JSONObject;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.TimeZone
;
import
jp.agentec.abook.abv.bl.common.exception.AcmsException
;
import
jp.agentec.abook.abv.bl.common.log.Logger
;
...
...
@@ -34,6 +35,7 @@ public class DashboardStatusJSON extends AcmsCommonJSON {
// 使わないので無視 → //presentTimeUTC = dateOrNull(json.getString("presentTimeUTC"));
JSONArray
oprations
=
json
.
getJSONArray
(
OperationList
);
String
timeZone
=
TimeZone
.
getDefault
().
getID
();
reportStatuses
=
new
ArrayList
<
DashboardStatusDto
>();
for
(
int
i
=
0
;
i
<
oprations
.
length
();
i
++)
{
...
...
@@ -46,7 +48,7 @@ public class DashboardStatusJSON extends AcmsCommonJSON {
JSONObject
repJson
=
reports
.
getJSONObject
(
j
);
String
taskKey
=
getStringOrNull
(
repJson
,
TaskKey
);
Long
taskReportId
=
getLongOrNull
(
repJson
,
TaskReportId
);
Date
reportStartDate
=
getDateOrNull
(
repJson
,
ReportStartDate
);
Date
reportStartDate
=
getDateOrNull
(
repJson
,
ReportStartDate
,
timeZone
);
int
reportStatus
=
getIntOrZero
(
repJson
,
ReportStatus
);
DashboardStatusDto
rep
=
new
DashboardStatusDto
(
taskKey
,
...
...
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