数据报告导出

src/main/java/edu/nju/controller/HistoryController.java

@@ -15,9 +15,7 @@ import org.json.JSONArray;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import edu.nju.service.AnalyzeService;
 import edu.nju.service.HistoryService;
@@ -342,7 +340,7 @@ public class HistoryController {
 
 	@RequestMapping(value = "/test")
 	@ResponseBody
-	public void getBugByPage(String case_take_id, String start, String count, String page, HttpSession session, HttpServletResponse response){
+	public void getBugByPage(String case_take_id,String start, String count, String page, HttpSession session, HttpServletResponse response){
 		List<String> bugList=hisservice.getBugIdListByPage(case_take_id,page,start,count);
 		try {
 			PrintWriter out = response.getWriter();

src/main/java/edu/nju/controller/ReviewAnalyzeController.java

@@ -37,7 +37,7 @@ public class ReviewAnalyzeController {
 
     @RequestMapping(value = "/getJobExcel")
     @ResponseBody
-    public String getExcel (@RequestParam("jobId")String jobId){
+    public String getExcel (String jobId){
         return reviewAnalyzeService.getExcel(jobId)?"1111":"tmd";
     }
 }

src/main/java/edu/nju/service/ReviewAnalyzeService.java

@@ -132,29 +132,52 @@ public class ReviewAnalyzeService {
                             }
 
                         case "Description" :
-                        case "File":
                             for(ReviewAnswer answer : answers){
                                 sb.append(answer.getAnswers().toString()+"\n");
                             }
                             rTemp = sheet1.createRow(oIndex++);
                             cTemp = rTemp.createCell(2);
-                            cTemp.setCellValue(i.getOptions().get(0)+":"+sb.toString());
+                            cTemp.setCellValue(sb.toString());
+                        case "File":
+                            for(ReviewAnswer answer : answers){
+                                sb.append(answer.getFile_url()+"\n");
+                            }
+                            rTemp = sheet1.createRow(oIndex++);
+                            cTemp = rTemp.createCell(2);
+                            cTemp.setCellValue(sb.toString());
                         default:
                             break;
                     }
-                    temp = iIndex + i.getOptions().size()-1;
-                    sheet1.addMergedRegion(new CellRangeAddress(iIndex,temp,1,1));
+                    if(i.getOptions().size()<=1){
+                        temp = iIndex ;
+                    }else{
+                        temp = iIndex + i.getOptions().size()-1;
+                        sheet1.addMergedRegion(new CellRangeAddress(iIndex,temp,1,1));
+                    }
+                    rTemp = sheet1.createRow(iIndex);
+                    cTemp = rTemp.createCell(1);
+                    cTemp.setCellValue(i.getDescription());
                     iIndex = temp+1;
-                    tempRI += i.getOptions().size();
+                    if(i.getOptions().size()<=1){
+                        tempRI += 1;
+                    }else{
+                        tempRI+=i.getOptions().size();
+                    }
                 }
                 temp = rIndex + tempRI-1;
-                sheet1.addMergedRegion(new CellRangeAddress(rIndex,temp,0,0));
+                if(temp!=rIndex){
+                    sheet1.addMergedRegion(new CellRangeAddress(rIndex,temp,0,0));
+                }
+                rTemp = sheet1.createRow(rIndex);
+                cTemp = rTemp.createCell(0);
+                cTemp.setCellValue(r.getName()+"-"+r.getDescription());
                 rIndex = temp+1;
             }
-            fileOut = new FileOutputStream("/Users/insomnialee/Desktop/temp/1.xls");
+            fileOut = new FileOutputStream("/Users/xujiawei/Desktop/temp/1.xls");
             wb.write(fileOut);
             return true;
         }catch (Exception e){
+            e.printStackTrace();
             return false;
         }
     }