|
@@ -35,6 +35,7 @@ import com.cloudcross.ssp.model.Location;
|
|
import com.cloudcross.ssp.model.Log;
|
|
import com.cloudcross.ssp.model.Log;
|
|
import com.cloudcross.ssp.model.PlaceOperator;
|
|
import com.cloudcross.ssp.model.PlaceOperator;
|
|
import com.cloudcross.ssp.model.Wifi;
|
|
import com.cloudcross.ssp.model.Wifi;
|
|
|
|
+import com.cloudcross.ssp.model.pojo.PlaceNamePojo;
|
|
import com.cloudcross.ssp.service.ILocationService;
|
|
import com.cloudcross.ssp.service.ILocationService;
|
|
import com.cloudcross.ssp.service.ILogService;
|
|
import com.cloudcross.ssp.service.ILogService;
|
|
import com.cloudcross.ssp.service.IOperatorService;
|
|
import com.cloudcross.ssp.service.IOperatorService;
|
|
@@ -195,10 +196,10 @@ public class ApmacController extends SimpleController {
|
|
Pager pager = null;
|
|
Pager pager = null;
|
|
pager = new Pager();
|
|
pager = new Pager();
|
|
//查询符合条件的总的条数
|
|
//查询符合条件的总的条数
|
|
- totalRow = placeOperatorService.countByParams(paramMap);
|
|
|
|
|
|
+ totalRow = placeOperatorService.queryPlaceNameCountByCondition(paramMap);
|
|
pager.setPage(page);
|
|
pager.setPage(page);
|
|
pager.setTotalRow(totalRow);
|
|
pager.setTotalRow(totalRow);
|
|
- List<PlaceOperator> placeOperatorList = placeOperatorService.findByParams(paramMap, pager);
|
|
|
|
|
|
+ List<PlaceNamePojo> placeOperatorList = placeOperatorService.queryPlaceNameByCondition(paramMap, pager);
|
|
model.addAttribute("placeOperatorList", placeOperatorList);
|
|
model.addAttribute("placeOperatorList", placeOperatorList);
|
|
model.addAttribute("pager",pager);
|
|
model.addAttribute("pager",pager);
|
|
model.addAttribute("searchValue",searchStr);
|
|
model.addAttribute("searchValue",searchStr);
|