1.替换只能替换相同岗位的。√

2.替换人选要排除本月现有参保人员，还要排除新增参保人员。√
3.企业用户导入时可以导出错误人员数据。√

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/CompanyController.java

@@ -264,7 +264,6 @@ public class CompanyController {
 
             List<JpCloudUser> jpCloudUserList = jpCloudUserService.findUserByNames(list);
 
-
             msgResult.setResult(true);
             msgResult.setData(jpCloudUserList);
         }
@@ -297,23 +296,8 @@ public class CompanyController {
         MessageResult<Map> msgResult = new MessageResult<>();
 
         try {
-            List<Company> companyList = companyService.list();
-
-            List<String> list = new ArrayList<>();
-
-            for (Company company: companyList) {
-                if(StringUtils.isNotEmpty(company.getPromoter())){
-                    list.add(company.getPromoter());
-                }
-            }
-
-            List<JpCloudUser> jpCloudUserList;
-            if(StringUtils.isEmpty(name)&&StringUtils.isEmpty(phone)&&StringUtils.isEmpty(userName)){
-                jpCloudUserList = jpCloudUserService.findUserByNames(list);
-            }
-            else{
-                jpCloudUserList = jpCloudUserService.findUser(userName,name,phone);
-            }
+            //todo 先根据用户名、真实姓名、电话查询云平台
+            List<JpCloudUser> jpCloudUserList = jpCloudUserService.findUser(userName,name,phone);
 
             List<String> promotionList = new ArrayList<>();
 
@@ -328,20 +312,37 @@ public class CompanyController {
 
             Page<Company> page = new Page<>();
 
-            if(promotionList.size()>0){
-                searchParams.put("promotionList",promotionList);
+            if(promotionList.size()>0) {
+                searchParams.put("promotionList", promotionList);
+            }
 
-                if(StringUtils.isNotEmpty(companyName)){
-                    searchParams.put("name","%" + companyName + "%");
-                }
+            if(StringUtils.isNotEmpty(companyName)){
+                searchParams.put("name","%" + companyName + "%");
+            }
+
+            //todo 只读取有推广人的记录
+            searchParams.put("hasPromotion",true);
+
+            page = companyService.pageSearch(searchParams,pageIndex,pageSize,sortList);
 
-                page = companyService.pageSearch(searchParams,pageIndex,pageSize,sortList);
+            List<String> userNames = page.stream()
+                                    .map((company)->company.getPromoter())
+                                    .filter((promoter)->StringUtils.isNotEmpty(promoter))
+                                    .distinct()
+                                    .collect(Collectors.toList());
+
+            //todo 一次性读取本页推广人信息
+            List<JpCloudUser> jpCloudUsers = jpCloudUserService.findUserByNames(userNames);
+
+            Map<String,JpCloudUser> userMap = new HashMap<>();
+
+            for (JpCloudUser jpCloudUser : jpCloudUsers) {
+                userMap.put(jpCloudUser.getName(),jpCloudUser);
+            }
 
-                for (Company company: page) {
-                    List<JpCloudUser> jpCloudUserList1 = jpCloudUserService.findUser(company.getPromoter(),"","");
-                    if(jpCloudUserList1.size()>0){
-                        company.setJpCloudUser(jpCloudUserList1.get(0));
-                    }
+            for (Company company: page) {
+                if (StringUtils.isNotEmpty(company.getPromoter())) {
+                    company.setJpCloudUser(userMap.get(company.getPromoter()));
                 }
             }
 

picc-common/src/main/java/com/jpsoft/picc/modules/base/dao/CompanyMemberDAO.java

@@ -15,5 +15,5 @@ public interface CompanyMemberDAO {
 	int delete(String id);
 	List<CompanyMember> list();
 	List<CompanyMember> search(Map<String, Object> searchParams, List<Sort> sortList);
-    List<CompanyMember> findByNotInPolicyMember(String companyId, List<String> excludePolicyIds);
+    List<CompanyMember> findByNotInPolicyMember(String companyId, List<String> excludePolicyList);
 }

picc-common/src/main/java/com/jpsoft/picc/modules/base/service/CompanyMemberService.java

@@ -14,5 +14,5 @@ public interface CompanyMemberService {
 	int delete(String id);
 	List<CompanyMember> list();
 	Page<CompanyMember> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, List<Sort> sortList);
-    List<CompanyMember> findByNotInPolicyMember(String companyId, List<String> excludePolicyIds);
+    List<CompanyMember> findByNotInPolicyMember(String companyId, List<String> excludePolicyList);
 }

picc-common/src/main/java/com/jpsoft/picc/modules/base/service/impl/CompanyMemberServiceImpl.java

@@ -69,7 +69,7 @@ public class CompanyMemberServiceImpl implements CompanyMemberService {
 	}
 
 	@Override
-	public List<CompanyMember> findByNotInPolicyMember(String companyId, List<String> excludePolicyIds) {
-		return companyMemberDAO.findByNotInPolicyMember(companyId,excludePolicyIds);
+	public List<CompanyMember> findByNotInPolicyMember(String companyId, List<String> excludePolicyList) {
+		return companyMemberDAO.findByNotInPolicyMember(companyId,excludePolicyList);
 	}
 }

picc-common/src/main/java/com/jpsoft/picc/modules/common/utils/POIUtils.java

@@ -1,8 +1,10 @@
 package com.jpsoft.picc.modules.common.utils;
 
 import org.apache.poi.hssf.converter.ExcelToHtmlConverter;
+import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
 import org.w3c.dom.Document;
 
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -15,6 +17,7 @@ import java.io.*;
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -122,6 +125,14 @@ public class POIUtils {
         }
     }
 
+    public Sheet getSheetAt(int sheetIndex){
+        return wb.getSheetAt(sheetIndex);
+    }
+
+    public Workbook getWorkbook(){
+        return wb;
+    }
+
     /**
      * 通过文件读取
      *
@@ -221,6 +232,12 @@ public class POIUtils {
         return dataList;
     }
 
+    public Object getCellValue(int sheetIndex,int rowIndex,int colIndex){
+        Row row = wb.getSheetAt(sheetIndex).getRow(rowIndex);
+        Cell cell = row.getCell(colIndex, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
+
+        return getCellValue(cell);
+    }
 
     /**
      * 获取列的数据信息
@@ -232,11 +249,6 @@ public class POIUtils {
         Object cellValue = null;
         FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
 
-
-        switch (cell.getCellType()) {
-
-        }
-
         switch (cell.getCellType()) {
             case BLANK:
                 cellValue = "";

picc-common/src/main/resources/mapper/base/Company.xml

@@ -204,6 +204,11 @@ id_,name_,legal_name,legal_card,legal_card_file,uscc_code,uscc_files,type_,busin
 		<foreach item="item" collection="searchParams.promotionList"  open="and promoter_ in(" separator="," close=")">
 			${item}
 		</foreach>
+		<if test="searchParams.hasPromotion != null">
+			<![CDATA[
+				and ifnull(promoter_,'')<>''
+			]]>
+		</if>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 	        ${sort.name} ${sort.order}
 	 	</foreach>

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

@@ -157,6 +157,12 @@
                 and del_flag=0
                 )
             </if>
+            <if test="searchParams.excludePolicyNo != null">
+                and id_ not in(
+                    select t1.member_id from business_insurance_policy_member t1,business_insurance_policy t2
+                    where t1.del_flag=0 and t1.policy_id = t2.id_ and t2.policy_no=#{searchParams.excludePolicyNo}
+                )
+            </if>
         </where>
         <foreach item="sort" collection="sortList" open="order by" separator=",">
             ${sort.name} ${sort.order}
@@ -167,10 +173,10 @@
         from base_company_member t1
         where t1.del_flag=0 and t1.company_id=#{companyId}
         and t1.id_ not in(
-        select member_id from business_insurance_policy_member
-        where del_flag=0
-        <foreach item="policyId" collection="excludePolicyIds" open=" and policy_id in(" separator="," close=")">
-            #{policyId}
+        select t1.member_id from business_insurance_policy_member t1,business_insurance_policy t2
+        where t1.del_flag=0 and t1.policy_id = t2.id_
+        <foreach item="policyNo" collection="excludePolicyList" open=" and t2.policy_no in(" separator="," close=")">
+            #{policyNo}
         </foreach>
         )
     </select>

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

@@ -8,9 +8,13 @@ import com.jpsoft.picc.modules.base.entity.Jobs;
 import com.jpsoft.picc.modules.base.service.CompanyMemberService;
 import com.jpsoft.picc.modules.base.service.CompanyService;
 import com.jpsoft.picc.modules.base.service.JobsService;
+import com.jpsoft.picc.modules.business.entity.InsurancePolicy;
+import com.jpsoft.picc.modules.business.service.InsurancePolicyService;
+import com.jpsoft.picc.modules.common.config.OSSConfig;
 import com.jpsoft.picc.modules.common.dto.MessageResult;
 import com.jpsoft.picc.modules.common.dto.Sort;
 import com.jpsoft.picc.modules.common.utils.CheckIdCard;
+import com.jpsoft.picc.modules.common.utils.OSSUtil;
 import com.jpsoft.picc.modules.common.utils.POIUtils;
 import com.jpsoft.picc.modules.common.utils.PojoUtils;
 import com.jpsoft.picc.modules.sys.entity.DataDictionary;
@@ -20,6 +24,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.*;
 import org.jasig.cas.client.authentication.AttributePrincipal;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,6 +33,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -48,9 +55,15 @@ public class CompanyMemberController {
     @Autowired
     private JobsService jobsService;
 
+    @Autowired
+    private InsurancePolicyService insurancePolicyService;
+
     @Autowired
     private DataDictionaryService dataDictionaryService;
 
+    @Autowired
+    private OSSConfig ossConfig;
+
     @ApiOperation(value="读取企业人员列表")
     @RequestMapping(value = "list",method = RequestMethod.POST)
     public MessageResult<List<CompanyMember>> list(
@@ -92,7 +105,7 @@ public class CompanyMemberController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "memberName",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"),
+            @ApiImplicitParam(name = "excludePolicyId",value = "要排除投保单", required = false, paramType = "form",dataType = "String"),
     })
     public MessageResult<Map> pageList(
             @RequestParam(value="memberName",defaultValue="") String memberName,
@@ -124,7 +137,9 @@ public class CompanyMemberController {
             }
 
             if(StringUtils.isNotEmpty(excludePolicyId)) {
-                searchParams.put("excludePolicyId", excludePolicyId);
+                //todo 新增和被替换的投保单编号一致
+                InsurancePolicy insurancePolicy = insurancePolicyService.get(excludePolicyId);
+                searchParams.put("excludePolicyNo", insurancePolicy.getPolicyNo());
             }
 
             if(StringUtils.isNotEmpty(memberName)){
@@ -369,27 +384,27 @@ public class CompanyMemberController {
 
         try {
             POIUtils poiUtils = new POIUtils(uploadFile.getInputStream());
-            List<Object[]> list = poiUtils.getAllData(0);
-            list.remove(0);
+            int sheetIndex = 0;
+            Sheet sheet1 = poiUtils.getSheetAt(sheetIndex);
 
             int affectCount = 0;
-            int existCount = 0;
-            List<String> existName = new ArrayList<>();
+            int failCount = 0;
+            int validateColIndex = 7;
 
             List<DataDictionary> ddList = dataDictionaryService.findByCatalogName("证件类型");
 
-            for(Object[] array : list){
+            for(int rowIndex=1 ; rowIndex<sheet1.getLastRowNum(); rowIndex++){
                 try {
-                    String name = array[1].toString();
-                    String cardType = array[2].toString();
-                    String cardNo = array[3].toString();
-                    String sex = array[4].toString();
+                    String name = (String)poiUtils.getCellValue(sheetIndex,rowIndex,1);
+                    String cardType = (String)poiUtils.getCellValue(sheetIndex,rowIndex,2);
+                    String cardNo = (String)poiUtils.getCellValue(sheetIndex,rowIndex,3);
+                    String sex = (String)poiUtils.getCellValue(sheetIndex,rowIndex,4);
 //                  String age = array[5].toString();
-                    String jobName = array[5].toString();
-                    String healthStatus = array[6].toString();
+                    String jobName = (String)poiUtils.getCellValue(sheetIndex,rowIndex,5);
+                    String healthStatus = (String)poiUtils.getCellValue(sheetIndex,rowIndex,6);
 
                     if(StringUtils.isEmpty(name)){
-                        continue;
+                        break;
                     }
 
                     Map<String, Object> searchParams = new HashMap<>();
@@ -401,8 +416,9 @@ public class CompanyMemberController {
                     Page<CompanyMember> page = companyMemberService.pageSearch(searchParams, 1, 100, sortList);
 
                     if (page.size() > 0) {
-                        existCount++;
-                        existName.add(page.get(0).getName());
+                        sheet1.getRow(rowIndex).createCell(validateColIndex).setCellValue("身份证已导入!");
+                        failCount++;
+                        continue;
                     } else {
                         companyMember.setId(UUID.randomUUID().toString());
                         if (StringUtils.isNotEmpty(company.getId())) companyMember.setCompanyId(company.getId());
@@ -410,8 +426,13 @@ public class CompanyMemberController {
 
                         CheckIdCard cic = null;
 
-                        if (cardType.contains("身份证")) {
-                            cic = new CheckIdCard(cardNo);
+                        if(StringUtils.isEmpty(cardNo)){
+                            sheet1.getRow(rowIndex).createCell(validateColIndex).setCellValue("身份证不能为空!");
+                            failCount++;
+                            continue;
+                        }
+                        else{
+                            cardNo = cardNo.trim().toUpperCase();
                         }
 
                         for(DataDictionary dd : ddList){
@@ -421,6 +442,23 @@ public class CompanyMemberController {
                             }
                         }
 
+                        if (StringUtils.isEmpty(companyMember.getCardType())){
+                            sheet1.getRow(rowIndex).createCell(validateColIndex).setCellValue("证件类型未选择!");
+                            failCount++;
+                            continue;
+                        }
+
+                        if (cardType.contains("身份证")) {
+                            cic = new CheckIdCard(cardNo);
+
+                            if (!cic.validate()){
+                                sheet1.getRow(rowIndex).createCell(validateColIndex).setCellValue("身份证验证失败!");
+                                failCount++;
+
+                                continue;
+                            }
+                        }
+
                         companyMember.setCardNo(cardNo);
 
                         if (StringUtils.isNotEmpty(sex)) {
@@ -433,9 +471,6 @@ public class CompanyMemberController {
                             companyMember.setSex(cic.isFemal());
                         }
 
-//                        if (StringUtils.isNotEmpty(age)) {
-//                            companyMember.setAge(Integer.valueOf(age));
-//                        }
                         if (cic != null && cic.validate()) {
                             companyMember.setAge(cic.getAge());
                         }
@@ -449,6 +484,12 @@ public class CompanyMemberController {
                             jobsName = "三类职业";
                         }
 
+                        if (StringUtils.isEmpty(jobsName)){
+                            sheet1.getRow(rowIndex).createCell(validateColIndex).setCellValue("岗位/工种未选择!");
+                            failCount++;
+                            continue;
+                        }
+
                         List<Jobs> jobsList = jobsService.findByName(jobsName);
 
                         if (jobsList.size() > 0) {
@@ -472,23 +513,41 @@ public class CompanyMemberController {
                 }
             }
 
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                if(existCount > 0) {
-                    msgResult.setMessage("数据成功导入" + affectCount + "条,有<" + existCount + ">条数据未导入成功，错误数据姓名为<" + String.join(",", existName) + ">，失败原因为<数据重复>。");
-                }else{
-                    msgResult.setMessage("数据成功导入" + affectCount + "条");
-                }
-            } else {
+            if (failCount>0){
+                //有导入失败的记录
                 msgResult.setResult(false);
+                msgResult.setMessage("数据成功导入" + affectCount + "条,有" + failCount + "条数据未导入成功，错误原因请查看报表。");
 
-                if(existCount > 0) {
-                    msgResult.setMessage("您有<" + existCount + ">条数据未导入成功，错误数据姓名为<" + String.join(",", existName) + ">，失败原因为<数据重复>。");
-                }
-                else {
-                    msgResult.setMessage("数据导入失败。");
+                //todo 只保留错误数据的sheet
+                int rowIndex = 1;
+
+                while(rowIndex!= sheet1.getLastRowNum()){
+                    Cell cell = sheet1.getRow(rowIndex).getCell(validateColIndex);
+
+                    if (cell==null || StringUtils.isEmpty(cell.getStringCellValue())){
+                        sheet1.removeRow(sheet1.getRow(rowIndex));
+                        sheet1.shiftRows(rowIndex+1,sheet1.getLastRowNum(),-1); //删除后下面行上移，则不需要移动rowIndex
+                    }
+                    else {
+                        rowIndex++;
+                    }
                 }
+
+                //todo 将wb保存到oss
+                ByteArrayOutputStream output = new ByteArrayOutputStream();
+                poiUtils.getWorkbook().write(output);
+
+                byte[] buffer = output.toByteArray();
+                ByteArrayInputStream input = new ByteArrayInputStream(buffer);
+
+                String downloadUrl = OSSUtil.upload(ossConfig,"import","error.xls",input);
+
+                //todo 返回导入失败报表下载链接
+                msgResult.setData(downloadUrl);
+            }
+            else{
+                msgResult.setResult(true);
+                msgResult.setMessage("数据成功导入" + affectCount + "条");
             }
         }
         catch(Exception ex){

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/auth/controller/InsuranceApplicationController.java

@@ -380,6 +380,11 @@ public class InsuranceApplicationController {
             insuranceApplication.setUpdateBy(principal.getName());
             insuranceApplication.setUpdateTime(new Date());
 
+//            if(StringUtils.isEmpty(insuranceApplication.getPolicyNo())) {
+//                DateTime createTime = new DateTime(insuranceApplication.getCreateTime());
+//                insuranceApplication.setPolicyNo(createTime.toString("yyyyMMddHHmmssSSS") + "-01");
+//            }
+
             insuranceApplicationService.update(insuranceApplication);
 
             //更新每月投保单
@@ -462,6 +467,14 @@ public class InsuranceApplicationController {
                 insuranceApplication.setCreateTime(createTime.toDate());
                 insuranceApplication.setPolicyNo(createTime.toString("yyyyMMddHHmmssSSS") + "-01");
 
+                if ("null".equals(insuranceApplication.getPolicyNo())){
+                    insuranceApplication.setPolicyNo(null);
+                }
+
+                if ("null".equals(insuranceApplication.getCombinePolicyId())){
+                    insuranceApplication.setCombinePolicyId(null);
+                }
+
                 affectCount = insuranceApplicationService.insert(insuranceApplication);
             }else {
                 PojoUtils.map(insuranceApplicationDTO, insuranceApplication);
@@ -470,6 +483,15 @@ public class InsuranceApplicationController {
                 insuranceApplication.setUpdateBy(principal.getName());
                 insuranceApplication.setUpdateTime(new Date());
 
+                //insuranceApplicationDTO中增加了policyNo，导致第一次新增后不刷新页面点击保存为"null"，同时影响了合并投保单
+                if ("null".equals(insuranceApplication.getPolicyNo())){
+                    insuranceApplication.setPolicyNo(null);
+                }
+
+                if ("null".equals(insuranceApplication.getCombinePolicyId())){
+                    insuranceApplication.setCombinePolicyId(null);
+                }
+
                 affectCount = insuranceApplicationService.update(insuranceApplication);
             }
 

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/auth/controller/InsurancePolicyUserController.java

@@ -123,48 +123,39 @@ public class InsurancePolicyUserController {
         return msgResult;
     }
 
-    @ApiOperation(value="读取可参保人员列表")
+    @ApiOperation(value="读取可参保人员列表-新增投保用")
     @PostMapping("loadCompanyMemberList")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "policyId",value = "每月投保单ID", required = true, paramType = "form",dataType = "String"),
+            @ApiImplicitParam(name = "policyId",value = "每月投保单ID", required = true, paramType = "form",dataType = "String")
      })
     public MessageResult<List<CompanyMember>> loadCompanyMemberList(HttpServletRequest request,String policyId){
         MessageResult<List<CompanyMember>> msgResult = new MessageResult<>();
 
-        AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
-        Company company = companyService.findByCreateBy(principal.getName());
-
         try {
+            AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
+            Company company = companyService.findByCreateBy(principal.getName());
+
             InsurancePolicy insurancePolicy = insurancePolicyService.get(policyId);
-            String applicationId = insurancePolicy.getLatestApplicationId();
 
-            List<String> excludePolicyIds = new ArrayList<>();
+            List<String> excludePolicyList = new ArrayList<>();
 
-            if (StringUtils.isNotEmpty(applicationId)) {
-                InsuranceApplication insuranceApplication = insuranceApplicationService.get(applicationId);
+            //todo 排除投保单号相同 (下月新增投保与原投保单号相同)
+            excludePolicyList.add(insurancePolicy.getPolicyNo());
 
-                excludePolicyIds.add(policyId);
+//            String applicationId = insurancePolicy.getLatestApplicationId();
 
-                if (StringUtils.isNotEmpty(insuranceApplication.getCombinePolicyId())){
-                    excludePolicyIds.add(insuranceApplication.getCombinePolicyId());
-                }
-//                DateTime startTime = new DateTime(insuranceApplication.getStartTime());
-
-                //todo 相同企业、相同险种、相同生效时间段 是否已经有每月投保单
-//                List<InsurancePolicy> policyList = insurancePolicyService.findNextMonthPolicy(
-//                        insuranceApplication.getCompanyId(),
-//                        insuranceApplication.getDefinitionId(),
-//                        startTime.toDate(),
-//                        startTime.plusMonths(1).toDate(),
-//                        new String[]{PolicyStatus.Draft.getValue() + "", PolicyStatus.Back.getText() + ""});
-
-//                for (InsurancePolicy policy : policyList) {
-                    //todo 排除现有投保单中的人员
-//                    excludePolicyIds.add(policy.getId());
+//            if (StringUtils.isNotEmpty(applicationId)) {
+//                InsuranceApplication insuranceApplication = insuranceApplicationService.get(applicationId);
+//
+//                excludePolicyIds.add(policyId);
+//
+//                if (StringUtils.isNotEmpty(insuranceApplication.getCombinePolicyId())){
+//                    excludePolicyIds.add(insuranceApplication.getCombinePolicyId());
 //                }
-            }
+//            }
 
-            List<CompanyMember> memberList = companyMemberService.findByNotInPolicyMember(company.getId(),excludePolicyIds);
+            //新增投保用
+            List<CompanyMember> memberList = companyMemberService.findByNotInPolicyMember(company.getId(),excludePolicyList);
 
             msgResult.setData(memberList);
             msgResult.setResult(true);