|
@@ -79,11 +79,13 @@ public class CompanyMemberController {
|
|
|
@RequestMapping(value = "pageList",method = RequestMethod.POST)
|
|
|
@ApiImplicitParams({
|
|
|
@ApiImplicitParam(name = "memberName",value = "人员姓名", required = false, paramType = "form",dataType = "String"),
|
|
|
- @ApiImplicitParam(name = "jobsId",value = "岗位编号", required = false, paramType = "form",dataType = "String")
|
|
|
+ @ApiImplicitParam(name = "jobsId",value = "岗位编号", required = false, paramType = "form",dataType = "String"),
|
|
|
+ @ApiImplicitParam(name = "excludePolicyId",value = "排除投保单中人员", required = false, paramType = "form",dataType = "String"),
|
|
|
})
|
|
|
public MessageResult<Map> pageList(
|
|
|
@RequestParam(value="memberName",defaultValue="") String memberName,
|
|
|
@RequestParam(value="jobsId",defaultValue="") String jobsId,
|
|
|
+ @RequestParam(value="excludePolicyId",defaultValue="") String excludePolicyId,
|
|
|
@RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
|
|
|
@RequestParam(value="pageSize",defaultValue="20") int pageSize,
|
|
|
HttpServletRequest request){
|
|
@@ -109,14 +111,16 @@ public class CompanyMemberController {
|
|
|
searchParams.put("jobsId", jobsId);
|
|
|
}
|
|
|
|
|
|
+ if(StringUtils.isNotEmpty(excludePolicyId)) {
|
|
|
+ searchParams.put("excludePolicyId", excludePolicyId);
|
|
|
+ }
|
|
|
+
|
|
|
if(StringUtils.isNotEmpty(memberName)){
|
|
|
searchParams.put("memberName", "%" + memberName + "%");
|
|
|
}
|
|
|
|
|
|
Page<CompanyMember> page = companyMemberService.pageSearch(searchParams, pageIndex, pageSize, sortList);
|
|
|
|
|
|
-
|
|
|
-
|
|
|
msgResult.setResult(true);
|
|
|
msgResult.setData(PojoUtils.pageWrapper(page));
|
|
|
}
|
|
@@ -381,9 +385,9 @@ public class CompanyMemberController {
|
|
|
if (StringUtils.isNotEmpty(cardType)) companyMember.setCardType(cardType);
|
|
|
if (StringUtils.isNotEmpty(cardNo)) companyMember.setCardNo(cardNo);
|
|
|
if (sex.contains("男")) {
|
|
|
- companyMember.setSex(false);
|
|
|
- } else {
|
|
|
companyMember.setSex(true);
|
|
|
+ } else {
|
|
|
+ companyMember.setSex(false);
|
|
|
}
|
|
|
if (age != 0) companyMember.setAge(age);
|
|
|
if (StringUtils.isNotEmpty(jobsId)) companyMember.setJobsId(jobsId);
|