|
|
@@ -74,20 +74,11 @@ public class JobController {
|
|
|
@GetMapping(value = "/jobs")
|
|
|
public String jobs (Model model){
|
|
|
JSONArray jsonArray = jobService.getJobs(); // 所有的数据
|
|
|
- List<JSONObject> list = new ArrayList<>();
|
|
|
+ List<Object> list = new ArrayList<>();
|
|
|
for (Object single : jsonArray){
|
|
|
- JSONObject temp = (JSONObject) single;
|
|
|
- temp.put("create_time",new Timestamp(Long.parseLong(temp.get("create_time").toString()))); // 修改创建时间的格式 以便前段展示
|
|
|
- list.add(temp);
|
|
|
+ changeTime2Long(single); // 修改创建时间的格式 以便前段展示
|
|
|
+ list.add(single);
|
|
|
}
|
|
|
-// Collections.sort(jsonArray, new Comparator<Object>() {
|
|
|
-// @Override
|
|
|
-// public int compare(Object o1, Object o2) {
|
|
|
-// JSONObject jso1 = (JSONObject) o1;
|
|
|
-// JSONObject jso2 = (JSONObject) o2;
|
|
|
-// return ((Timestamp)jso1.get("create_time")).compareTo((Timestamp)jso2.get("create_time"));
|
|
|
-// }
|
|
|
-// });
|
|
|
model.addAttribute("tasks",list);
|
|
|
model.addAttribute("reportHost",reportHost);
|
|
|
return "jobList";
|
|
|
@@ -96,7 +87,11 @@ public class JobController {
|
|
|
@GetMapping(value = "jobDetail")
|
|
|
public String detail ( Model model , @RequestParam("id") String id){
|
|
|
JSONObject res = jobService.getSinglePaper(id); // 获取job的详细信息
|
|
|
+ changeTime2Long(res);
|
|
|
+ JSONObject paper = paperService.getSinglePaper((String)res.get("paper_id"));
|
|
|
+ model.addAttribute("paper",paper);
|
|
|
model.addAttribute("data",res);
|
|
|
+ // TODO: 2019/12/24 在jobdetail页面添跳转到 xjw 统计页面的按钮。
|
|
|
return "jobDetail";
|
|
|
}
|
|
|
|
|
|
@@ -146,10 +141,15 @@ public class JobController {
|
|
|
private boolean isEdu(JSONObject job ){
|
|
|
// is the job form edu
|
|
|
try {
|
|
|
-return true;
|
|
|
+ return true;
|
|
|
}catch (Exception x){
|
|
|
return false;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ private void changeTime2Long ( Object input){
|
|
|
+ JSONObject temp = (JSONObject) input;
|
|
|
+ temp.put("create_time",new Timestamp(Long.parseLong(temp.get("create_time").toString()))); // 修改创建时间的格式 以便前段展示
|
|
|
+ }
|
|
|
+
|
|
|
}
|
insomniaLee