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
4ec3f0c9
Commit
4ec3f0c9
authored
Feb 21, 2023
by
Kazuyuki Hida
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
初回起動時に差戻のアイコンやメッセージが表示されない不具合を修正
insertの時に差戻やロックの情報を渡していなかった。
parent
3e188be6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
0 deletions
+16
-0
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
+12
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
+2
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ABookCheckWebViewHelper.java
+2
-0
No files found.
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
View file @
4ec3f0c9
...
@@ -306,6 +306,8 @@ public class OperationLogic extends AbstractLogic {
...
@@ -306,6 +306,8 @@ public class OperationLogic extends AbstractLogic {
boolean
attachedChangeFlag
,
boolean
attachedChangeFlag
,
boolean
dataSendFlg
,
boolean
dataSendFlg
,
boolean
localSavedFlg
,
boolean
localSavedFlg
,
TaskReportDto
.
SendBackInfo
sendBackInfo
,
TaskReportDto
.
LockInfo
lockInfo
,
int
taskStatus
int
taskStatus
)
throws
IOException
{
)
throws
IOException
{
TaskDto
taskDto
=
mTaskDao
.
getTaskByTaskKey
(
taskKey
);
TaskDto
taskDto
=
mTaskDao
.
getTaskByTaskKey
(
taskKey
);
...
@@ -337,6 +339,16 @@ public class OperationLogic extends AbstractLogic {
...
@@ -337,6 +339,16 @@ public class OperationLogic extends AbstractLogic {
if
(
localAttachedFileName
!=
null
)
{
if
(
localAttachedFileName
!=
null
)
{
taskReportDto
.
localAttachedFileName
=
localAttachedFileName
;
taskReportDto
.
localAttachedFileName
=
localAttachedFileName
;
}
}
if
(
sendBackInfo
!=
null
)
{
taskReportDto
.
sendBackUserId
=
sendBackInfo
.
sendBackUserId
;
taskReportDto
.
sendBackUserName
=
sendBackInfo
.
sendBackUserName
;
taskReportDto
.
sendBackComment
=
sendBackInfo
.
sendBackComment
;
}
if
(
lockInfo
!=
null
)
{
taskReportDto
.
reportLockUserId
=
lockInfo
.
reportLockUserId
;
taskReportDto
.
reportLockUserName
=
lockInfo
.
reportLockUserName
;
taskReportDto
.
reportLockTime
=
lockInfo
.
reportLockTime
;
}
taskReportDto
.
taskStatus
=
taskStatus
;
taskReportDto
.
taskStatus
=
taskStatus
;
mTaskReportDao
.
insert
(
taskReportDto
);
mTaskReportDao
.
insert
(
taskReportDto
);
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
View file @
4ec3f0c9
...
@@ -1061,6 +1061,8 @@ public class OperationListActivity extends OperationActivity {
...
@@ -1061,6 +1061,8 @@ public class OperationListActivity extends OperationActivity {
false
,
false
,
false
,
false
,
false
,
false
,
serverTaskReportDto
.
getSendBackInfo
(),
serverTaskReportDto
.
getLockInfo
(),
serverTaskDto
.
taskStatus
);
serverTaskDto
.
taskStatus
);
}
else
{
}
else
{
// 更新
// 更新
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ABookCheckWebViewHelper.java
View file @
4ec3f0c9
...
@@ -398,6 +398,8 @@ public class ABookCheckWebViewHelper extends ABookHelper {
...
@@ -398,6 +398,8 @@ public class ABookCheckWebViewHelper extends ABookHelper {
attachedChangeFlag
,
attachedChangeFlag
,
localSavedFlg
?
false
:
true
,
localSavedFlg
?
false
:
true
,
localSavedFlg
,
localSavedFlg
,
null
,
null
,
1
1
);
);
}
}
...
...
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