diff --git a/WebRoot/Excel/1c993f38-ca8c-4c87-b370-ffa8f04973bb.xlsx b/WebRoot/Excel/1c993f38-ca8c-4c87-b370-ffa8f04973bb.xlsx new file mode 100644 index 00000000..bc408419 Binary files /dev/null and b/WebRoot/Excel/1c993f38-ca8c-4c87-b370-ffa8f04973bb.xlsx differ diff --git a/WebRoot/Excel/4a8edf59-4395-4536-9d32-30b996bfc5bb.xlsx b/WebRoot/Excel/4a8edf59-4395-4536-9d32-30b996bfc5bb.xlsx new file mode 100644 index 00000000..bc408419 Binary files /dev/null and b/WebRoot/Excel/4a8edf59-4395-4536-9d32-30b996bfc5bb.xlsx differ diff --git a/WebRoot/Excel/aae8ed7f-8452-470a-9874-73bad24e55d4.xlsx b/WebRoot/Excel/aae8ed7f-8452-470a-9874-73bad24e55d4.xlsx new file mode 100644 index 00000000..92c85e7e Binary files /dev/null and b/WebRoot/Excel/aae8ed7f-8452-470a-9874-73bad24e55d4.xlsx differ diff --git a/WebRoot/Excel/ad9f4282-3094-4dcc-bc79-ec1d3ec9148c.xlsx b/WebRoot/Excel/ad9f4282-3094-4dcc-bc79-ec1d3ec9148c.xlsx new file mode 100644 index 00000000..bc408419 Binary files /dev/null and b/WebRoot/Excel/ad9f4282-3094-4dcc-bc79-ec1d3ec9148c.xlsx differ diff --git a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java index 09dfe0bb..43f613a2 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java @@ -64,6 +64,7 @@ public class CollectModel { record.set("publish_state", 0); record.set("publish_role_id", publish_role_id); record.set("job_type", 2); + record.set("is_save", 0); Db.save("t_collect_job", "job_id", record); //任务编号 int job_id = record.getInt("job_id"); @@ -204,6 +205,9 @@ public class CollectModel { //确认job_id+sheet_index完成 sql = "update t_collect_job_sheet set table_name=?,is_check=1,check_time=? where job_id=? and sheet_index=?"; Db.update(sql, table_name, DateTime.now(), job_id, sheet_index); + //修改整体为未保存状态 + sql = "update t_collect_job set is_save=0 where job_id=?"; + Db.update(sql, job_id); } /** @@ -235,7 +239,7 @@ public class CollectModel { * @param job_id */ public void saveJob(int job_id, String job_name, String upload_excel_filename_finish) { - String sql = "update t_collect_job set job_name=?,upload_excel_filename_finish=? where job_id=?"; + String sql = "update t_collect_job set job_name=?,upload_excel_filename_finish=?,is_save=1 where job_id=?"; Db.update(sql, job_name, upload_excel_filename_finish, job_id); } @@ -665,9 +669,15 @@ public class CollectModel { int total_count = record.getInt("total_count"); record.set("fill_progress", finish_count + "/" + total_count); record.set("publish_state_name", "已发布"); - } else if (record.getInt("publish_state") == 0) { - record.set("publish_state_name", "待发布"); + record.set("is_save", 1); + } else if (record.getInt("is_save") == 0) { + record.set("is_save", 0); + record.set("fill_progress", "-"); + record.set("publish_state_name", "未保存"); + } else { + record.set("is_save", 1); record.set("fill_progress", "-"); + record.set("publish_state_name", "已保存"); } // 获取当前时间的毫秒数 long currentTime = System.currentTimeMillis();