Merge branch 'contract/sato/1.0.300_dev' into contract/sato/1.0.300_hida

# Conflicts:
#	ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/TaskReportDao.java
#	ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/TaskReportDto.java
#	gradle.properties

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

@@ -94,9 +94,9 @@ public class OperationListJSON extends AcmsCommonJSON {
                 dto.enableReportEdit = operationJson.has(EnableReportEdit) ? operationJson.getInt(EnableReportEdit) : 0;          // 作業編集区分
                 dto.enableAddReport = operationJson.has(EnableAddReport) ? operationJson.getInt(EnableAddReport) : 0;          // 作業追加区分
                 dto.quickReport = operationJson.has(QuickReport) ? operationJson.getInt(QuickReport) : 0;
-                dto.statusNotStartedCount = operationJson.has(statusNotStartedCount) ? operationJson.getInt(statusNotStartedCount) : 1; //「未実施」数
-                dto.statusWorkingCount = operationJson.has(statusWorkingCount) ? operationJson.getInt(statusWorkingCount) : 2;          //「未実施」数      //「作業中」数
-                dto.statusCompletedCount = operationJson.has(statusCompletedCount) ? operationJson.getInt(statusCompletedCount) : 3;    //「未実施」数    // 「作業完了」数
+                dto.statusNotStartedCount = operationJson.has(statusNotStartedCount) ? operationJson.getInt(statusNotStartedCount) : 0; //「未実施」数
+                dto.statusWorkingCount = operationJson.has(statusWorkingCount) ? operationJson.getInt(statusWorkingCount) : 0;          //「未実施」数      //「作業中」数
+                dto.statusCompletedCount = operationJson.has(statusCompletedCount) ? operationJson.getInt(statusCompletedCount) : 0;    //「未実施」数    // 「作業完了」数
 
                 // 作業終了更新日
                 if (operationJson.has(OperationLastEditDate)) {

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

@@ -245,10 +245,7 @@ public class TaskReportDao extends AbstractDao {
         sql.append("    report_lock_time=? ");
         sql.append(" WHERE task_key=? ");
         if (reportStartDate != null) {
-            sql.append(" AND datetime(report_start_date)=datetime(?) ");
-        }
-        if (loginId != null) {
-            sql.append(" AND report_lock_user_id <> ? "); //自分以外のロックを変更しないため
+            sql.append("AND datetime(report_start_date)=datetime(?);");
         }
 
         args.add(reportStatus);

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

@@ -26,14 +26,14 @@ public class TaskReportDto extends AbstractDto {
     public String attachedFileName;
     public boolean localSavedFlg; // 一時保存用
 
-    public String reportLockUserId = null;      // 報告ロックユーザId
-    public String reportLockUserName = null;    // 報告ロックユーザ名
-    public Date reportLockTime = null;          // 報告ロック日時
-    public String sendBackUserId = null;        // 差し戻しユーザId	差し戻された場合のみ
-    public String sendBackUserName = null;      // 差し戻しユーザ名	差し戻された場合のみ
-    public String sendBackComment = null;       // 確認コメント	差し戻された場合のみ
-    public int taskStatus = 0;                  // 状況	0：未実施、1：作業中、999：作業完了
-    public int reportStatus = 0;
+    public String reportLockUserId;     // 報告ロックユーザId
+    public String reportLockUserName;   // 報告ロックユーザ名
+    public Date reportLockTime;         // 報告ロック日時
+    public String sendBackUserId;       // 差し戻しユーザId	差し戻された場合のみ
+    public String sendBackUserName;     // 差し戻しユーザ名	差し戻された場合のみ
+    public String sendBackComment;      // 確認コメント	差し戻された場合のみ
+    public int taskStatus;           // 状況	0：未実施、1：作業中、999：作業完了
+    public int reportStatus;
 
     @Override
     public Object[] getInsertValues() {

gradle.properties

@@ -37,12 +37,8 @@ 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=http://10.0.2.2:8080/acms
-#download_server_address=http://10.0.2.2:8080/acms
+acms_address=https://check.abookcloud.com/acms
+download_server_address=https://check.abookcloud.com/acms
 
 #syncview server
 websocket_server_http_url=https://abook188-1.abook.bz/v1
@@ -130,4 +126,4 @@ BLJAR_NAME=ABVJE_BL.jar
 
 #store用の場合、armv7,x86両方ビルド
 #storeではない場合、armv7のみビルド
-isStoreProduct=true
\ No newline at end of file
+isStoreProduct=false
\ No newline at end of file