|
@@ -99,42 +99,12 @@ public class ReviewController {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
-// @RequestMapping(value = "/getItemsByWorker")
|
|
|
|
-// @ResponseBody
|
|
|
|
-// public void getItemListByWorkerJob(String job_id, String worker_id, HttpServletResponse response){
|
|
|
|
-// try {
|
|
|
|
-// PrintWriter out = response.getWriter();
|
|
|
|
-// List<ReviewItem> items = iservice.getItemsByWorkerJob(worker_id, job_id);
|
|
|
|
-// out.print(new JSONArray(items));
|
|
|
|
-// out.flush();
|
|
|
|
-// out.close();
|
|
|
|
-// }catch (IOException e) {
|
|
|
|
-// // TODO Auto-generated catch block
|
|
|
|
-// e.printStackTrace();
|
|
|
|
-// }
|
|
|
|
-//
|
|
|
|
-// }
|
|
|
|
-
|
|
|
|
- @RequestMapping(value = "/getAnswersByWorkerReport")
|
|
|
|
- @ResponseBody
|
|
|
|
- public void getAnswersByWorkerReport(String report_id,String worker_id, HttpServletResponse response){
|
|
|
|
- try {
|
|
|
|
- PrintWriter out = response.getWriter();
|
|
|
|
- List<ReviewAnswer> answers = iservice.getAnswersByReportWorker(report_id, worker_id);
|
|
|
|
- out.print(new JSONArray(answers));
|
|
|
|
- out.flush();
|
|
|
|
- out.close();
|
|
|
|
- }catch (IOException e) {
|
|
|
|
- // TODO Auto-generated catch block
|
|
|
|
- e.printStackTrace();
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- @RequestMapping(value = "/getAnswerByWorkerItem")
|
|
|
|
|
|
+ @RequestMapping(value = "/getAnswerByWorkerReportItem")
|
|
@ResponseBody
|
|
@ResponseBody
|
|
- public void getAnswerByWorkerReportItem(String item_id,String worker_id, HttpServletResponse response){
|
|
|
|
|
|
+ public void getAnswerByWorkerReportItem(String reportId,String itemId,String workerId, HttpServletResponse response){
|
|
try {
|
|
try {
|
|
PrintWriter out = response.getWriter();
|
|
PrintWriter out = response.getWriter();
|
|
- ReviewAnswer answers = iservice.getAnswerByWorkerItem(worker_id,item_id);
|
|
|
|
|
|
+ ReviewAnswer answers = iservice.getAnswerByWorkerReportItem(reportId,workerId,itemId);
|
|
out.print(new JSONObject(answers));
|
|
out.print(new JSONObject(answers));
|
|
out.flush();
|
|
out.flush();
|
|
out.close();
|
|
out.close();
|
|
@@ -144,13 +114,18 @@ public class ReviewController {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- @RequestMapping(value = "/getAnswersByReport")
|
|
|
|
|
|
+ @RequestMapping(value = "/saveAnswer", method = RequestMethod.POST)
|
|
@ResponseBody
|
|
@ResponseBody
|
|
- public void getAnswersByReport(String report_id, HttpServletResponse response){
|
|
|
|
|
|
+ public void saveAnswer(String itemId, String reportId, String workerId,String paperId,String jobId, @RequestParam("answers")List<String>answers, @RequestParam("attachmentLocation") List<String> attachmentLocation, HttpServletResponse response){
|
|
|
|
+ JSONObject result = new JSONObject();
|
|
|
|
+ if(iservice.saveAnswer(itemId,reportId,workerId,paperId,jobId,answers,attachmentLocation)){
|
|
|
|
+ result.put("status", "200");
|
|
|
|
+ } else {
|
|
|
|
+ result.put("status", "500");
|
|
|
|
+ }
|
|
try {
|
|
try {
|
|
PrintWriter out = response.getWriter();
|
|
PrintWriter out = response.getWriter();
|
|
- List<ReviewAnswer>answers=iservice.getAnswersByReport(report_id);
|
|
|
|
- out.print(new JSONArray(answers));
|
|
|
|
|
|
+ out.print(result);
|
|
out.flush();
|
|
out.flush();
|
|
out.close();
|
|
out.close();
|
|
}catch (IOException e) {
|
|
}catch (IOException e) {
|
|
@@ -159,29 +134,6 @@ public class ReviewController {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-// @RequestMapping(value = "/saveAnswer", method = RequestMethod.POST)
|
|
|
|
-// @ResponseBody
|
|
|
|
-// public void saveAnswer(String item_id, String worker_id,String job_id, @RequestParam("answers")List<String>answers, @RequestParam("attachment_location") List<String> attachment_location, HttpServletResponse response){
|
|
|
|
-// JSONObject result = new JSONObject();
|
|
|
|
-// String id = iservice.saveAnswer(item_id, worker_id, job_id, answers, attachment_location);
|
|
|
|
-// if(id.equals("")) {
|
|
|
|
-// result.put("status", "200");
|
|
|
|
-// result.put("id", id);
|
|
|
|
-// }
|
|
|
|
-// else {
|
|
|
|
-// result.put("status", "500");
|
|
|
|
-// }
|
|
|
|
-// try {
|
|
|
|
-// PrintWriter out = response.getWriter();
|
|
|
|
-// out.print(result);
|
|
|
|
-// out.flush();
|
|
|
|
-// out.close();
|
|
|
|
-// }catch (IOException e) {
|
|
|
|
-// // TODO Auto-generated catch block
|
|
|
|
-// e.printStackTrace();
|
|
|
|
-// }
|
|
|
|
-// }
|
|
|
|
-
|
|
|
|
@RequestMapping(value = "/updateAnswer", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/updateAnswer", method = RequestMethod.POST)
|
|
@ResponseBody
|
|
@ResponseBody
|
|
public void updateAnswer(String id, @RequestParam("answers")List<String>answers,@RequestParam("attachment_location") List<String> file_url, HttpServletResponse response){
|
|
public void updateAnswer(String id, @RequestParam("answers")List<String>answers,@RequestParam("attachment_location") List<String> file_url, HttpServletResponse response){
|
|
@@ -202,7 +154,7 @@ public class ReviewController {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- @RequestMapping(value = "/getWorkersByJob", method = RequestMethod.POST)
|
|
|
|
|
|
+ @RequestMapping(value = "/getWorkersByJob")
|
|
@ResponseBody
|
|
@ResponseBody
|
|
public void getWorkers(String jobId, HttpServletResponse response){
|
|
public void getWorkers(String jobId, HttpServletResponse response){
|
|
try {
|
|
try {
|