|
@@ -180,6 +180,8 @@ public class PersonInfoController {
|
|
@RequestMapping(value = "pageList",method = RequestMethod.POST)
|
|
@RequestMapping(value = "pageList",method = RequestMethod.POST)
|
|
@ApiImplicitParams({
|
|
@ApiImplicitParams({
|
|
@ApiImplicitParam(name = "name",value = "姓名", required = false, paramType = "form",dataType = "String"),
|
|
@ApiImplicitParam(name = "name",value = "姓名", required = false, paramType = "form",dataType = "String"),
|
|
|
|
+ @ApiImplicitParam(name = "idCard",value = "身份证", required = false, paramType = "form",dataType = "String"),
|
|
|
|
+ @ApiImplicitParam(name = "phone",value = "手机号", required = false, paramType = "form",dataType = "String"),
|
|
@ApiImplicitParam(name = "position1",value = "一级位置", required = false, paramType = "form",dataType = "String"),
|
|
@ApiImplicitParam(name = "position1",value = "一级位置", required = false, paramType = "form",dataType = "String"),
|
|
@ApiImplicitParam(name = "position2",value = "二级位置", required = false, paramType = "form",dataType = "String"),
|
|
@ApiImplicitParam(name = "position2",value = "二级位置", required = false, paramType = "form",dataType = "String"),
|
|
@ApiImplicitParam(name = "position3",value = "三级位置", required = false, paramType = "form",dataType = "String"),
|
|
@ApiImplicitParam(name = "position3",value = "三级位置", required = false, paramType = "form",dataType = "String"),
|
|
@@ -188,6 +190,8 @@ public class PersonInfoController {
|
|
})
|
|
})
|
|
public MessageResult<Map> pageList(
|
|
public MessageResult<Map> pageList(
|
|
@RequestParam(value="name",defaultValue="") String name,
|
|
@RequestParam(value="name",defaultValue="") String name,
|
|
|
|
+ @RequestParam(value="idCard",defaultValue="") String idCard,
|
|
|
|
+ @RequestParam(value="phone",defaultValue="") String phone,
|
|
@RequestParam(value="position1",defaultValue="") String position1,
|
|
@RequestParam(value="position1",defaultValue="") String position1,
|
|
@RequestParam(value="position2",defaultValue="") String position2,
|
|
@RequestParam(value="position2",defaultValue="") String position2,
|
|
@RequestParam(value="position3",defaultValue="") String position3,
|
|
@RequestParam(value="position3",defaultValue="") String position3,
|
|
@@ -210,6 +214,12 @@ public class PersonInfoController {
|
|
if (StringUtils.isNotEmpty(name)) {
|
|
if (StringUtils.isNotEmpty(name)) {
|
|
searchParams.put("name","%" + name + "%");
|
|
searchParams.put("name","%" + name + "%");
|
|
}
|
|
}
|
|
|
|
+ if (StringUtils.isNotEmpty(idCard)) {
|
|
|
|
+ searchParams.put("name","%" + idCard + "%");
|
|
|
|
+ }
|
|
|
|
+ if (StringUtils.isNotEmpty(phone)) {
|
|
|
|
+ searchParams.put("name","%" + phone + "%");
|
|
|
|
+ }
|
|
if (StringUtils.isNotEmpty(position1)) {
|
|
if (StringUtils.isNotEmpty(position1)) {
|
|
searchParams.put("position1",position1);
|
|
searchParams.put("position1",position1);
|
|
}
|
|
}
|