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

ロック取得後に報告書が開かない不具合を修正

See merge request !270

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

@@ -202,13 +202,13 @@ public class LockReportLogic extends AbstractLogic {
             extParam.put(ReportStatus, String.valueOf(reportStatus));
             extParam.put(ReportLockUserId, reportLockUserId);
             extParam.put(ReportLockUserName, reportLockUserName);
-            extParam.put(ReportLockTime, DateTimeUtil.toStringInTimeZone(reportLockTime, DateTimeFormat.yyyyMMddHHmmssSSS_hyphen, "UTC"));
+            extParam.put(ReportLockTime, DateTimeUtil.toStringInTimeZone(reportLockTime, DateTimeFormat.yyyyMMddHHmmss_hyphen, "UTC"));
 
             if (taskReportId != null && taskReportId != 0) {
                 extParam.put(TaskReportId, taskReportId);
             }
             if (reportStartDate != null) {
-                extParam.put(ReportStartDate, DateTimeUtil.toStringInTimeZone(reportStartDate, DateTimeFormat.yyyyMMddHHmmssSSS_hyphen, "UTC"));
+                extParam.put(ReportStartDate, DateTimeUtil.toStringInTimeZone(reportStartDate, DateTimeFormat.yyyyMMddHHmmss_hyphen, "UTC"));
             }
             return extParam.toString();
         }

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

@@ -150,7 +150,7 @@ public class UnlockReportLogic extends AbstractLogic {
                 extParam.put(TaskReportId, taskReportId);
             }
             if (reportStartDate != null) {
-                extParam.put(ReportStartDate, DateTimeUtil.toStringInTimeZone(reportStartDate, DateTimeFormat.yyyyMMddHHmmssSSS_hyphen, "UTC"));
+                extParam.put(ReportStartDate, DateTimeUtil.toStringInTimeZone(reportStartDate, DateTimeFormat.yyyyMMddHHmmss_hyphen, "UTC"));
             }
             return extParam.toString();
         }

gradle.properties

@@ -132,4 +132,5 @@ BLJAR_NAME=ABVJE_BL.jar
 
 #store用の場合、armv7,x86両方ビルド
 #storeではない場合、armv7のみビルド
-isStoreProduct=true
\ No newline at end of file
+#isStoreProduct=true
+isStoreProduct=false
\ No newline at end of file