|
@@ -184,6 +184,7 @@ public class ApmacController extends SimpleController {
|
|
|
public String relationship(Model model, @RequestParam HashMap<String, Object> paramMap,
|
|
|
@RequestParam(defaultValue = "1") int page) {
|
|
|
String operatorName = null;
|
|
|
+ String operatorName1 = null;
|
|
|
|
|
|
/**
|
|
|
* 对传入的搜索参数做处理,如果传递的是空值或者空字符串的话就设为空
|
|
@@ -192,6 +193,7 @@ public class ApmacController extends SimpleController {
|
|
|
operatorName = null;
|
|
|
} else {
|
|
|
operatorName = String.valueOf(paramMap.get("operatorName"));
|
|
|
+ operatorName1 = operatorName;
|
|
|
}
|
|
|
|
|
|
paramMap.put("operatorName", SqlHelper.doLike(operatorName));
|
|
@@ -203,9 +205,17 @@ public class ApmacController extends SimpleController {
|
|
|
pager.setPage(page);
|
|
|
pager.setTotalRow(totalRow);
|
|
|
List<PlaceOperator> placeOperatorList = placeOperatorService.findByParamsBack(paramMap, pager);
|
|
|
+
|
|
|
+ //回传给前端
|
|
|
+ if(null != operatorName) {
|
|
|
+ model.addAttribute("operatorName", operatorName1);
|
|
|
+ } else {
|
|
|
+ model.addAttribute("operatorName", operatorName);
|
|
|
+ }
|
|
|
+
|
|
|
model.addAttribute("placeOperatorList", placeOperatorList);
|
|
|
model.addAttribute("pager",pager);
|
|
|
- model.addAttribute("operatorName", operatorName);
|
|
|
+
|
|
|
return page("relationship");
|
|
|
}
|
|
|
|
|
@@ -646,8 +656,8 @@ public class ApmacController extends SimpleController {
|
|
|
response.setHeader("Content-Disposition", "attachment;filename="
|
|
|
+ fileName + ".xls");
|
|
|
// 需要对excel的列的总数进行指定
|
|
|
- int column = 5;
|
|
|
- paramMap.put("dataSize", logList.size());
|
|
|
+ int column = 6;
|
|
|
+ paramMap.put("dataSize", (logList.size() + 100));
|
|
|
paramMap.put("column", column);
|
|
|
|
|
|
String excelTemplate = templateProcessor.processTemplate(
|
|
@@ -696,12 +706,12 @@ public class ApmacController extends SimpleController {
|
|
|
response.setHeader("Content-Disposition", "attachment;filename="
|
|
|
+ fileName + ".xls");
|
|
|
// 需要对excel的列的总数进行指定
|
|
|
- int column = 2;
|
|
|
- paramMap.put("dataSize", placeOperatorList.size());
|
|
|
+ int column = 6;
|
|
|
+ paramMap.put("dataSize", (placeOperatorList.size() + 100));
|
|
|
paramMap.put("column", column);
|
|
|
|
|
|
String excelTemplate = templateProcessor.processTemplate(
|
|
|
- "excel/relationship.ftl", paramMap);
|
|
|
+ "excel/relationshipBack.ftl", paramMap);
|
|
|
try {
|
|
|
PrintWriter out = response.getWriter();
|
|
|
out.write(excelTemplate);
|
|
@@ -809,7 +819,7 @@ public class ApmacController extends SimpleController {
|
|
|
+ fileName + ".xls");
|
|
|
// 需要对excel的列的总数进行指定
|
|
|
int column = 14;
|
|
|
- paramMap.put("dataSize", wifiList.size());
|
|
|
+ paramMap.put("dataSize", (wifiList.size() + 100));
|
|
|
paramMap.put("column", column);
|
|
|
|
|
|
String excelTemplate = templateProcessor.processTemplate(
|