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
67bed2d6
Commit
67bed2d6
authored
Jan 30, 2023
by
Kazuyuki Hida
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
サブモジュールの更新
parent
eb63cad7
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
10 deletions
+12
-10
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/DBConnector.java
+1
-1
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/DatabaseVersions.java
+1
-4
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/TTaskReport.java
+6
-3
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/TTaskReportStatus.java
+4
-2
No files found.
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/DBConnector.java
View file @
67bed2d6
...
...
@@ -19,7 +19,7 @@ import jp.agentec.abook.abv.bl.common.db.SQLiteDatabase;
public
class
DBConnector
{
private
static
volatile
DBConnector
dbConnector
=
null
;
public
static
final
String
DatabaseName
=
"ABVJE"
;
public
static
final
int
DatabaseVersion
=
DatabaseVersions
.
Ver1_0_
7
;
public
static
final
int
DatabaseVersion
=
DatabaseVersions
.
Ver1_0_
4
;
protected
SQLiteDatabase
db
=
null
;
...
...
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/DatabaseVersions.java
View file @
67bed2d6
...
...
@@ -5,8 +5,5 @@ public class DatabaseVersions {
public
static
final
int
Ver1_0_0
=
1
;
public
static
final
int
Ver1_0_2
=
11
;
// SATO HACCP 1.0.2
public
static
final
int
Ver1_0_3
=
21
;
// @From カテゴリ選択機能追加
public
static
final
int
Ver1_0_4
=
31
;
// @From 作業の進捗状況を追加
public
static
final
int
Ver1_0_5
=
41
;
// @From 作業のロック、差し戻し対応
public
static
final
int
Ver1_0_6
=
51
;
// @From 作業のロック情報を追加
public
static
final
int
Ver1_0_7
=
61
;
// @From ダッシュボード対応
public
static
final
int
Ver1_0_4
=
31
;
// @From ロック、ダッシュボード対応
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/TTaskReport.java
View file @
67bed2d6
...
...
@@ -46,6 +46,8 @@ public class TTaskReport extends SQLiteTableScript {
sql
.
append
(
" ) "
);
ddl
.
add
(
sql
.
toString
());
ddl
.
add
(
"CREATE INDEX idx_task_key1 ON t_task_report(task_key, task_report_id, report_start_date)"
);
return
ddl
;
}
...
...
@@ -53,7 +55,7 @@ public class TTaskReport extends SQLiteTableScript {
@Override
public
List
<
String
>
getUpgradeScript
(
int
oldVersion
,
int
newVersion
)
{
List
<
String
>
ddl
=
new
ArrayList
<
String
>();
if
(
oldVersion
<
DatabaseVersions
.
Ver1_0_
5
)
{
if
(
oldVersion
<
DatabaseVersions
.
Ver1_0_
4
)
{
ddl
.
add
(
" ALTER TABLE t_task_report ADD COLUMN report_lock_user_id TEXT"
);
// 報告ロックユーザId
ddl
.
add
(
" ALTER TABLE t_task_report ADD COLUMN report_lock_user_name TEXT"
);
//報告ロックユーザ名
ddl
.
add
(
" ALTER TABLE t_task_report ADD COLUMN report_lock_time DATETIME"
);
// 報告ロック日時
...
...
@@ -61,10 +63,11 @@ public class TTaskReport extends SQLiteTableScript {
ddl
.
add
(
" ALTER TABLE t_task_report ADD COLUMN send_back_user_name TEXT"
);
// 差し戻しユーザ名 差し戻された場合のみ
ddl
.
add
(
" ALTER TABLE t_task_report ADD COLUMN send_back_comment TEXT"
);
// 確認コメント 差し戻された場合のみ
ddl
.
add
(
" ALTER TABLE t_task_report ADD COLUMN task_status INTEGER NOT NULL DEFAULT 0"
);
// 状況 0:未実施、1:作業中、999:作業完了
}
if
(
oldVersion
<
DatabaseVersions
.
Ver1_0_6
)
{
ddl
.
add
(
" ALTER TABLE t_task_report ADD COLUMN report_status INTEGER NOT NULL DEFAULT 0"
);
// 0:ロック成功、1:ロック中、2:承認中、999:その他エラー
ddl
.
add
(
"CREATE INDEX idx_task_key1 on t_task_report(task_key, task_id, report_start_date)"
);
ddl
.
add
(
"CREATE INDEX idx_task_key2 on t_task_report_status(task_key, task_id, report_start_date)"
);
}
return
ddl
;
}
...
...
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/TTaskReportStatus.java
View file @
67bed2d6
...
...
@@ -5,7 +5,7 @@ import java.util.List;
import
jp.agentec.abook.abv.bl.common.db.SQLiteDatabase
;
import
static
jp
.
agentec
.
abook
.
abv
.
bl
.
data
.
DatabaseVersions
.
Ver1_0_
7
;
import
static
jp
.
agentec
.
abook
.
abv
.
bl
.
data
.
DatabaseVersions
.
Ver1_0_
4
;
public
class
TTaskReportStatus
extends
SQLiteTableScript
{
...
...
@@ -34,12 +34,14 @@ public class TTaskReportStatus extends SQLiteTableScript {
ddl
.
add
(
sql
.
toString
());
ddl
.
add
(
"CREATE INDEX idx_task_key2 ON t_task_report_status(task_key, task_report_id, report_start_date)"
);
return
ddl
;
}
@Override
public
List
<
String
>
getUpgradeScript
(
int
oldVersion
,
int
newVersion
)
{
if
(
oldVersion
<
Ver1_0_
7
)
{
if
(
oldVersion
<
Ver1_0_
4
)
{
return
getCreateScript
(
newVersion
);
}
else
{
return
null
;
...
...
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