displayPermissionFlg対応

ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/OperationListJSON.java

@@ -63,6 +63,7 @@ public class OperationListJSON extends AcmsCommonJSON {
     public static final String QuickReport = "quickReport";
     public static final String PermitCode = "permitCode";
     public static final String PermitCodeRequiredFlg = "permitCodeRequiredFlg";
+    public static final String DisplayPermissionFlg = "displayPermissionFlg";
 
     public List<OperationDto> operationList;
 
@@ -96,6 +97,7 @@ public class OperationListJSON extends AcmsCommonJSON {
                 dto.quickReport = operationJson.has(QuickReport) ? operationJson.getInt(QuickReport) : 0;
                 dto.permitCode = operationJson.has(PermitCode) ? operationJson.getString(PermitCode) : "";
                 dto.permitCodeRequiredFlg = operationJson.has(PermitCodeRequiredFlg) ? operationJson.getInt(PermitCodeRequiredFlg) : 0;
+                dto.displayPermissionFlg = operationJson.has(DisplayPermissionFlg) ? operationJson.getInt(DisplayPermissionFlg) : 0;
 
                 // 作業終了更新日
                 if (operationJson.has(OperationLastEditDate)) {

ABVJE_BL/src/jp/agentec/abook/abv/bl/common/constant/ABookKeys.java

@@ -28,6 +28,7 @@ public class ABookKeys {
     public static final String QUICK_REPORT = "quickReport";
     public static final String PERMIT_CODE_REQUIRED_FLG = "permitCodeRequiredFlg";
     public static final String PERMIT_CODE = "permitCode";
+    public static final String DISPLAY_PERMISSION_FLG = "displayPermissionFlg";
 
     public static final String OPERATION_GROUPMASTER_LIST = "operationGroupMasterList";
     public static final String OPERATION_GROUPMASTER_ID = "operationGroupMasterId";

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/DatabaseVersions.java

@@ -6,7 +6,7 @@ public class DatabaseVersions {
 	public static final int Ver1_1_0 = 11;
 	public static final int Ver1_2_0 = 21;
 	public static final int Ver1_2_3 = 22;
-	public static final int Ver1_4_0 = 41;
+	public static final int Ver1_4_0 = 42;
 	//連続作業機能追加
 	public static final int Ver1_2_360 = 23;
 	//チャット機能追加(1.2.360障害対応。)

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/OperationDao.java

@@ -126,6 +126,11 @@ public class OperationDao extends AbstractDao {
             dto.permitCodeRequiredFlg = cursor.getInt(column);
         }
 
+        column = cursor.getColumnIndex("display_permission_flg ");
+        if (column != -1) {
+            dto.displayPermissionFlg = cursor.getInt(column);
+        }
+
         return dto;
     }
 
@@ -203,9 +208,10 @@ public class OperationDao extends AbstractDao {
                         + "enable_add_report,"
                         + "quick_report,"
                         + "permit_code,"
-                        + "permit_code_required_flg) "
+                        + "permit_code_required_flg, "
+                        + "display_permission_flg) "
                         + "values "
-                        + "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
+                        + "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
                 dto.getInsertValues());
     }
 
@@ -229,7 +235,8 @@ public class OperationDao extends AbstractDao {
                         + "enable_add_report=?, "
                         + "quick_report=?, "
                         + "permit_code=?, "
-                        + "permit_code_required_flg=? "
+                        + "permit_code_required_flg=?, "
+                        + "display_permission_flg=? "
                         + "WHERE operation_id=?",
                 dto.getUpdateValues());
         return count > 0;

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/TOperation.java

@@ -41,7 +41,8 @@ public class TOperation extends SQLiteTableScript {
         sql.append("      , operation_open_date DATETIME ");
         sql.append("      , quick_report SMALLINT NOT NULL DEFAULT 0 ");
         sql.append("      , permit_code TEXT ");
-        sql.append("      , permit_code_required_flg ");
+        sql.append("      , display_permission_flg SMALLINT");
+        sql.append("      , permit_code_required_flg SMALLINT");
         sql.append("      , PRIMARY KEY (operation_id) ");
         sql.append(" ) ");
         ddl.add(sql.toString());
@@ -63,6 +64,7 @@ public class TOperation extends SQLiteTableScript {
         if (oldVersion < DatabaseVersions.Ver1_4_0) {
             ddl.add("ALTER TABLE t_operation ADD COLUMN permit_code TEXT ");
             ddl.add("ALTER TABLE t_operation ADD COLUMN permit_code_required_flg SMALLINT ");
+            ddl.add("ALTER TABLE t_operation ADD COLUMN display_permission_flg SMALLINT ");
         }
         return ddl;
     }

ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/OperationDto.java

@@ -34,6 +34,7 @@ public class OperationDto extends AbstractDto {
     public int quickReport;         // 簡易帳票区分
     public String permitCode;         // 許可スキャンコード
     public int permitCodeRequiredFlg;         // 許可スキャン必須フラグ
+    public int displayPermissionFlg;
 
     public List<OperationGroupMasterRelationDto> operationGroupMasterRelationDtoList; // 作業種別に紐づく作業Dto
 
@@ -51,12 +52,12 @@ public class OperationDto extends AbstractDto {
 
     @Override
     public Object[] getInsertValues() {
-        return new Object[] { operationId, operationName, operationDescriptions, operationStartDate, operationEndDate, operationType, reportType, lastEditDate, contentCreatingFlg, editLockFlg, needSyncFlg, reportCycle, enableReportUpdate, enableReportHistory, enableReportEdit, enableAddReport, quickReport, permitCode, permitCodeRequiredFlg};
+        return new Object[] { operationId, operationName, operationDescriptions, operationStartDate, operationEndDate, operationType, reportType, lastEditDate, contentCreatingFlg, editLockFlg, needSyncFlg, reportCycle, enableReportUpdate, enableReportHistory, enableReportEdit, enableAddReport, quickReport, permitCode, permitCodeRequiredFlg, displayPermissionFlg};
     }
 
     @Override
     public Object[] getUpdateValues() {
-        return new Object[] { operationName, operationDescriptions, operationStartDate, operationEndDate, operationType, reportType, lastEditDate, contentCreatingFlg, editLockFlg, needSyncFlg, reportCycle, enableReportUpdate, enableReportHistory, enableReportEdit, enableAddReport, quickReport, permitCode, permitCodeRequiredFlg, operationId };
+        return new Object[] { operationName, operationDescriptions, operationStartDate, operationEndDate, operationType, reportType, lastEditDate, contentCreatingFlg, editLockFlg, needSyncFlg, reportCycle, enableReportUpdate, enableReportHistory, enableReportEdit, enableAddReport, quickReport, permitCode, permitCodeRequiredFlg, displayPermissionFlg, operationId };
     }
 
     @Override

ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java

@@ -2021,6 +2021,7 @@ public class OperationLogic extends AbstractLogic {
                 operationJson.put(ABookKeys.QUICK_REPORT, operationList.get(i).quickReport);
                 operationJson.put(ABookKeys.PERMIT_CODE, operationList.get(i).permitCode);
                 operationJson.put(ABookKeys.PERMIT_CODE_REQUIRED_FLG, operationList.get(i).permitCodeRequiredFlg);
+                operationJson.put(ABookKeys.DISPLAY_PERMISSION_FLG, operationList.get(i).displayPermissionFlg);
                 operationJson.put(ABookKeys.CONTENT_ID, operationList.get(i).contentId);
                 operationJsonArray.put(operationJson);
             }