Преглед на файлове

企业端企业人员增加根据每月投保单号过滤。

tomatozq преди 5 години
родител
ревизия
eeebc2757e

+ 7 - 0
picc-common/src/main/resources/mapper/base/CompanyMember.xml

@@ -143,6 +143,13 @@
 			<if test="searchParams.cardNo != null">
 				and card_no = #{searchParams.cardNo}
 			</if>
+			<if test="searchParams.excludePolicyId != null">
+				and id_ not in(
+					select member_id from business_insurance_policy_member
+					where policy_id = #{searchParams.excludePolicyId}
+					and del_flag=0
+				)
+			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 	        ${sort.name} ${sort.order}

+ 9 - 5
picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/auth/controller/CompanyMemberController.java

@@ -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);