Merge branch 'feature/contract/sato/1.0.300_fix_lock' into 'contract/sato/1.0.300_dev'

ロック周りの不具合修正

See merge request !265

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

@@ -5,6 +5,7 @@ import org.json.adf.JSONObject;
 import java.util.Date;
 import java.util.Date;
 
 
 import jp.agentec.abook.abv.bl.common.exception.AcmsException;
 import jp.agentec.abook.abv.bl.common.exception.AcmsException;
+import jp.agentec.abook.abv.bl.common.exception.JSONValidationException;
 
 
 /**
 /**
  * checkapi/lockReport/のレスポンスを変換するクラス
  * checkapi/lockReport/のレスポンスを変換するクラス
@@ -23,7 +24,8 @@ public class LockReportJSON extends AcmsCommonJSON {
     }
     }
 
 
     @Override
     @Override
-    protected void parse(JSONObject json) {
+    protected void parse(JSONObject json) throws JSONValidationException {
+        super.parse(json);
         presentTimeUTC = getDateOrNull(json, "presentTimeUTC");
         presentTimeUTC = getDateOrNull(json, "presentTimeUTC");
         reportStatus = getIntOrDef(json, "reportStatus", BAD_STATE);
         reportStatus = getIntOrDef(json, "reportStatus", BAD_STATE);
         reportLockUserId = getStringOrNull(json, "reportLockUserId");
         reportLockUserId = getStringOrNull(json, "reportLockUserId");

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

@@ -5,6 +5,7 @@ import org.json.adf.JSONObject;
 import java.util.Date;
 import java.util.Date;
 
 
 import jp.agentec.abook.abv.bl.common.exception.AcmsException;
 import jp.agentec.abook.abv.bl.common.exception.AcmsException;
+import jp.agentec.abook.abv.bl.common.exception.JSONValidationException;
 
 
 
 
 public class UnlockReportJSON extends AcmsCommonJSON {
 public class UnlockReportJSON extends AcmsCommonJSON {
@@ -17,7 +18,8 @@ public class UnlockReportJSON extends AcmsCommonJSON {
     }
     }
 
 
     @Override
     @Override
-    protected void parse(JSONObject json) {
+    protected void parse(JSONObject json) throws JSONValidationException {
+        super.parse(json);
         presentTimeUTC = getDateOrNull(json, "presentTimeUTC");
         presentTimeUTC = getDateOrNull(json, "presentTimeUTC");
         reportStatus = getIntOrDef(json, "", BAD_STATE);
         reportStatus = getIntOrDef(json, "", BAD_STATE);
     }
     }

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

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