1

web/src/main/java/com/jpsoft/excellent/modules/base/controller/FeedbackOpinionController.java

@@ -503,7 +503,6 @@ public class FeedbackOpinionController {
         }
 
         Page<FeedbackOpinion> page = feedbackOpinionService.pageSearch(searchParams,1,10000,false,sortList);
-
         //写入数据
         for(int i=0; i<page.getResult().size(); i++){
             FeedbackOpinion feedbackOpinion = page.getResult().get(i);
@@ -525,7 +524,7 @@ public class FeedbackOpinionController {
             row.getCell(0).setCellValue(feedbackOpinion.getSort());
             row.getCell(1).setCellValue(feedbackOpinion.getConnect());
             row.getCell(2).setCellValue(feedbackOpinion.getConnectPhone());
-            row.getCell(3).setCellValue(areaService.get(feedbackOpinion.getAreaId()).getName());
+            row.getCell(3).setCellValue(parentFullName(feedbackOpinion.getAreaId()));
             row.getCell(4).setCellValue(feedbackOpinion.getStationName());
             row.getCell(5).setCellValue(feedbackOpinion.getWindow());
             if(feedbackOpinion.getIsSatisfied()){
@@ -538,17 +537,6 @@ public class FeedbackOpinionController {
             row.getCell(8).setCellValue(feedbackOpinion.getContent());
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             row.getCell(9).setCellValue(sdf.format(feedbackOpinion.getCreateTime()));
-
-            row.getCell(0).setCellStyle(cellStyleContent);
-            row.getCell(1).setCellStyle(cellStyleContent);
-            row.getCell(2).setCellStyle(cellStyleContent);
-            row.getCell(3).setCellStyle(cellStyleContent);
-            row.getCell(4).setCellStyle(cellStyleContent);
-            row.getCell(5).setCellStyle(cellStyleContent);
-            row.getCell(6).setCellStyle(cellStyleContent);
-            row.getCell(7).setCellStyle(cellStyleContent);
-            row.getCell(8).setCellStyle(cellStyleContent);
-            row.getCell(9).setCellStyle(cellStyleContent);
             if(feedbackOpinion.getOpinionStatus()){
                 row.getCell(10).setCellValue("已处理");
             }
@@ -561,6 +549,19 @@ public class FeedbackOpinionController {
             else{
                 row.getCell(11).setCellValue("待确认");
             }
+
+            row.getCell(0).setCellStyle(cellStyleContent);
+            row.getCell(1).setCellStyle(cellStyleContent);
+            row.getCell(2).setCellStyle(cellStyleContent);
+            row.getCell(3).setCellStyle(cellStyleContent);
+            row.getCell(4).setCellStyle(cellStyleContent);
+            row.getCell(5).setCellStyle(cellStyleContent);
+            row.getCell(6).setCellStyle(cellStyleContent);
+            row.getCell(7).setCellStyle(cellStyleContent);
+            row.getCell(8).setCellStyle(cellStyleContent);
+            row.getCell(9).setCellStyle(cellStyleContent);
+            row.getCell(10).setCellStyle(cellStyleContent);
+            row.getCell(11).setCellStyle(cellStyleContent);
         }
 
         ByteArrayOutputStream output = new ByteArrayOutputStream();