ダッシュボードの一時保存を実装

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

 package jp.agentec.abook.abv.bl.data.dao;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -38,7 +37,7 @@ public class ReportStatusDao extends AbstractDao {
         execSql("DELETE FROM " + TTaskReportStatus.tableName);
     }
 
-    private StringBuilder commonSql() {
+    private StringBuilder reportStatusSql() {
         StringBuilder sql = new StringBuilder();
 
         sql.append("SELECT");
@@ -72,50 +71,72 @@ public class ReportStatusDao extends AbstractDao {
     }
 
     public List<ReportStatusDto> getUntouchedReport() {
-        StringBuilder sql = commonSql();
+        StringBuilder sql = reportStatusSql();
         sql.append("WHERE t_task_report_status.untouched_flg <> 0");
         return rawQueryGetDtoList(sql.toString(), new String[] {}, ReportStatusDto.class);
     }
 
     public List<ReportStatusDto> getWorkingReport() {
-        StringBuilder sql = commonSql();
+        StringBuilder sql = reportStatusSql();
         sql.append("WHERE t_task_report_status.working_flg <> 0");
         return rawQueryGetDtoList(sql.toString(), new String[] {}, ReportStatusDto.class);
     }
 
     public List<ReportStatusDto> getcompleteOkReport() {
-        StringBuilder sql = commonSql();
+        StringBuilder sql = reportStatusSql();
         sql.append("WHERE t_task_report_status.complete_ok_flg <> 0");
         return rawQueryGetDtoList(sql.toString(), new String[] {}, ReportStatusDto.class);
     }
 
     public List<ReportStatusDto> getCompleteNgReport() {
-        StringBuilder sql = commonSql();
+        StringBuilder sql = reportStatusSql();
         sql.append("WHERE t_task_report_status.complete_ng_flg <> 0");
         return rawQueryGetDtoList(sql.toString(), new String[] {}, ReportStatusDto.class);
     }
 
     public List<ReportStatusDto> getIncompleteReport() {
-        StringBuilder sql = commonSql();
+        StringBuilder sql = reportStatusSql();
         sql.append("WHERE t_task_report_status.incomplete_flg <> 0");
         return rawQueryGetDtoList(sql.toString(), new String[] {}, ReportStatusDto.class);
     }
 
     public List<ReportStatusDto> getAlertReport() {
-        StringBuilder sql = commonSql();
+        StringBuilder sql = reportStatusSql();
         sql.append("WHERE t_task_report_status.alert_flg <> 0");
         return rawQueryGetDtoList(sql.toString(), new String[] {}, ReportStatusDto.class);
     }
 
     public List<ReportStatusDto> getSendBackedReport() {
-        StringBuilder sql = commonSql();
+        StringBuilder sql = reportStatusSql();
         sql.append("WHERE t_task_report_status.send_backed_flg <> 0");
         return rawQueryGetDtoList(sql.toString(), new String[] {}, ReportStatusDto.class);
     }
 
     public List<ReportStatusDto> getPendingReport() {
-        // 空のリストを返しておく todo
-        return new ArrayList<ReportStatusDto>();
+        StringBuilder sql = new StringBuilder();
+
+        sql.append("SELECT");
+        sql.append("    0 AS report_status,");
+        sql.append("    t_operation.operation_id AS operation_id,");
+        sql.append("    t_operation.operation_name AS operation_name,");
+        sql.append("    t_task_report.task_key AS task_key,");
+        sql.append("    t_task.task_code AS task_code,");
+        sql.append("    t_task_report.json_data AS json_data,");
+        sql.append("    t_task_report.task_report_id AS task_report_id,");
+        sql.append("    t_task_report.report_start_date AS report_start_date,");
+        sql.append("    t_task_report.report_lock_user_id AS report_lock_user_id,");
+        sql.append("    t_task_report.report_lock_user_name AS report_lock_user_name,");
+        sql.append("    t_task_report.report_lock_time AS report_lock_time,");
+        sql.append("    t_task_report.send_back_user_id AS send_back_user_id,");
+        sql.append("    t_task_report.send_back_user_name AS send_back_user_name,");
+        sql.append("    t_task_report.send_back_comment AS send_back_comment ");
+        sql.append("    FROM t_task_report ");
+        sql.append("    INNER JOIN t_task ");
+        sql.append("        ON t_task_report.task_key = t_task.task_key ");
+        sql.append("    INNER JOIN t_operation ");
+        sql.append("        ON t_task.operation_id = t_operation.operation_id ");
+        sql.append("    WHERE t_task_report.local_saved_flg <> 0");
+        return rawQueryGetDtoList(sql.toString(), new String[] {}, ReportStatusDto.class);
     }
 
     @Override

gradle.properties

@@ -39,10 +39,10 @@ app_versioncode=1
 #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://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
 
 #syncview server
 websocket_server_http_url=https://abook188-1.abook.bz/v1