|
@@ -293,7 +293,7 @@ public class FeedbackOpinionController {
|
|
@RequestMapping(value = "pageList",method = RequestMethod.POST)
|
|
@RequestMapping(value = "pageList",method = RequestMethod.POST)
|
|
public MessageResult<Map> pageList(
|
|
public MessageResult<Map> pageList(
|
|
String sort, String connect, String connectPhone, String areaId, String workStation, String window,
|
|
String sort, String connect, String connectPhone, String areaId, String workStation, String window,
|
|
- String isSatisfied, String opinionStatus, String confirmStatus, String[] cause, Date[] reportDate,
|
|
|
|
|
|
+ String isSatisfied, String opinionStatus, String confirmStatus, Date[] reportDate,
|
|
Boolean areaSubordinate,
|
|
Boolean areaSubordinate,
|
|
@RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
|
|
@RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
|
|
@RequestParam(value="pageSize",defaultValue="20") int pageSize,
|
|
@RequestParam(value="pageSize",defaultValue="20") int pageSize,
|
|
@@ -354,12 +354,6 @@ public class FeedbackOpinionController {
|
|
searchParams.put("confirmStatus", false);
|
|
searchParams.put("confirmStatus", false);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if (cause.length > 0) {
|
|
|
|
- for(int i=0; i<cause.length; i++){
|
|
|
|
- cause[i] = "%"+cause[i]+"%";
|
|
|
|
- }
|
|
|
|
- searchParams.put("cause",cause);
|
|
|
|
- }
|
|
|
|
if (reportDate.length > 0) {
|
|
if (reportDate.length > 0) {
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
Calendar calendar = new GregorianCalendar();
|
|
Calendar calendar = new GregorianCalendar();
|
|
@@ -386,7 +380,7 @@ public class FeedbackOpinionController {
|
|
@ApiOperation(value="导出报表")
|
|
@ApiOperation(value="导出报表")
|
|
@RequestMapping(value = "reportListXls",method = RequestMethod.POST)
|
|
@RequestMapping(value = "reportListXls",method = RequestMethod.POST)
|
|
public String reportListXls(String sort, String connect, String connectPhone, String areaId, String workStation, String window,
|
|
public String reportListXls(String sort, String connect, String connectPhone, String areaId, String workStation, String window,
|
|
- String isSatisfied, String opinionStatus, String confirmStatus, String[] cause, Date[] reportDate,
|
|
|
|
|
|
+ String isSatisfied, String opinionStatus, String confirmStatus, Date[] reportDate,
|
|
Boolean areaSubordinate, @RequestAttribute String subject){
|
|
Boolean areaSubordinate, @RequestAttribute String subject){
|
|
String downloadUrl = "";
|
|
String downloadUrl = "";
|
|
|
|
|
|
@@ -427,7 +421,7 @@ public class FeedbackOpinionController {
|
|
|
|
|
|
//表头
|
|
//表头
|
|
Row rowTitle = sheet.createRow(0);
|
|
Row rowTitle = sheet.createRow(0);
|
|
- String[] titles = new String[]{"序号","联系人","联系电话","区域","站点","窗口","是否满意","原因","内容","上报时间","处理进度","确认状态"};
|
|
|
|
|
|
+ String[] titles = new String[]{"序号","联系人","联系电话","区域","站点","窗口","是否满意","内容","上报时间","处理进度","确认状态"};
|
|
for (int i=0;i<titles.length;i++) {
|
|
for (int i=0;i<titles.length;i++) {
|
|
Cell cell = rowTitle.createCell(i);
|
|
Cell cell = rowTitle.createCell(i);
|
|
cell.setCellValue(titles[i]);
|
|
cell.setCellValue(titles[i]);
|
|
@@ -488,12 +482,6 @@ public class FeedbackOpinionController {
|
|
searchParams.put("confirmStatus", false);
|
|
searchParams.put("confirmStatus", false);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if (cause.length > 0) {
|
|
|
|
- for(int i=0; i<cause.length; i++){
|
|
|
|
- cause[i] = "%"+cause[i]+"%";
|
|
|
|
- }
|
|
|
|
- searchParams.put("cause",cause);
|
|
|
|
- }
|
|
|
|
if (reportDate.length > 0) {
|
|
if (reportDate.length > 0) {
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
Calendar calendar = new GregorianCalendar();
|
|
Calendar calendar = new GregorianCalendar();
|
|
@@ -521,7 +509,6 @@ public class FeedbackOpinionController {
|
|
row.createCell(8);
|
|
row.createCell(8);
|
|
row.createCell(9);
|
|
row.createCell(9);
|
|
row.createCell(10);
|
|
row.createCell(10);
|
|
- row.createCell(11);
|
|
|
|
|
|
|
|
row.getCell(0).setCellValue(feedbackOpinion.getSort());
|
|
row.getCell(0).setCellValue(feedbackOpinion.getSort());
|
|
row.getCell(1).setCellValue(feedbackOpinion.getConnect());
|
|
row.getCell(1).setCellValue(feedbackOpinion.getConnect());
|
|
@@ -535,21 +522,20 @@ public class FeedbackOpinionController {
|
|
else{
|
|
else{
|
|
row.getCell(6).setCellValue("不满意");
|
|
row.getCell(6).setCellValue("不满意");
|
|
}
|
|
}
|
|
- row.getCell(7).setCellValue(feedbackOpinion.getCause());
|
|
|
|
- row.getCell(8).setCellValue(feedbackOpinion.getContent());
|
|
|
|
|
|
+ row.getCell(7).setCellValue(feedbackOpinion.getContent());
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
- row.getCell(9).setCellValue(sdf.format(feedbackOpinion.getCreateTime()));
|
|
|
|
|
|
+ row.getCell(8).setCellValue(sdf.format(feedbackOpinion.getCreateTime()));
|
|
if(feedbackOpinion.getOpinionStatus()){
|
|
if(feedbackOpinion.getOpinionStatus()){
|
|
- row.getCell(10).setCellValue("已处理");
|
|
|
|
|
|
+ row.getCell(9).setCellValue("已处理");
|
|
}
|
|
}
|
|
else{
|
|
else{
|
|
- row.getCell(10).setCellValue("未处理");
|
|
|
|
|
|
+ row.getCell(9).setCellValue("未处理");
|
|
}
|
|
}
|
|
if(feedbackOpinion.getConfirmStatus()){
|
|
if(feedbackOpinion.getConfirmStatus()){
|
|
- row.getCell(11).setCellValue("已确认");
|
|
|
|
|
|
+ row.getCell(10).setCellValue("已确认");
|
|
}
|
|
}
|
|
else{
|
|
else{
|
|
- row.getCell(11).setCellValue("待确认");
|
|
|
|
|
|
+ row.getCell(10).setCellValue("待确认");
|
|
}
|
|
}
|
|
|
|
|
|
row.getCell(0).setCellStyle(cellStyleContent);
|
|
row.getCell(0).setCellStyle(cellStyleContent);
|
|
@@ -563,7 +549,6 @@ public class FeedbackOpinionController {
|
|
row.getCell(8).setCellStyle(cellStyleContent);
|
|
row.getCell(8).setCellStyle(cellStyleContent);
|
|
row.getCell(9).setCellStyle(cellStyleContent);
|
|
row.getCell(9).setCellStyle(cellStyleContent);
|
|
row.getCell(10).setCellStyle(cellStyleContent);
|
|
row.getCell(10).setCellStyle(cellStyleContent);
|
|
- row.getCell(11).setCellStyle(cellStyleContent);
|
|
|
|
}
|
|
}
|
|
|
|
|
|
ByteArrayOutputStream output = new ByteArrayOutputStream();
|
|
ByteArrayOutputStream output = new ByteArrayOutputStream();
|