|
|
|
@ -859,6 +859,30 @@ public class CollectModel {
|
|
|
|
|
SqlPara sqlPara = Db.getSqlPara("Collect.getJobList", kv);
|
|
|
|
|
String sql = sqlPara.getSql();
|
|
|
|
|
Page<Record> pageRecord = Db.paginateByFullSql(page, limit, CommonUtil.getTotalSql(sql), sql);
|
|
|
|
|
|
|
|
|
|
for (Record record : pageRecord.getList()) {
|
|
|
|
|
if (record.getInt("job_type") == 1) record.set("job_type_name", "表单");
|
|
|
|
|
else if (record.getInt("job_type") == 2) record.set("job_type_name", "EXCEL模板");
|
|
|
|
|
|
|
|
|
|
if (record.getInt("publish_state") == 1) record.set("publish_state_name", "已发布");
|
|
|
|
|
else if (record.getInt("publish_state") == 0) {
|
|
|
|
|
record.set("publish_state_name", "待发布");
|
|
|
|
|
record.set("fill_progress", "-");
|
|
|
|
|
}
|
|
|
|
|
// 获取当前时间的毫秒数
|
|
|
|
|
long currentTime = System.currentTimeMillis();
|
|
|
|
|
|
|
|
|
|
Calendar calendar = Calendar.getInstance();
|
|
|
|
|
calendar.setTime(record.getDate("deadline_time"));
|
|
|
|
|
calendar.add(Calendar.DAY_OF_MONTH, 1);
|
|
|
|
|
// 比较 yourDate 和当前时间
|
|
|
|
|
if (calendar.getTime().getTime() > currentTime) {
|
|
|
|
|
record.set("jiezhi", true);
|
|
|
|
|
} else {
|
|
|
|
|
record.set("jiezhi", false);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return pageRecord;
|
|
|
|
|
}
|
|
|
|
|
}
|