7489

picc-common/src/main/resources/mapper/business/InsurancePolicyMember.xml

@@ -99,6 +99,9 @@
 			<if test="searchParams.policyId != null">
 				and policy_id=#{searchParams.policyId}
 			</if>
+			<if test="searchParams.memberId != null">
+				and member_id=#{searchParams.memberId}
+			</if>
 			<if test="searchParams.jobsId != null">
 				and jobs_id=#{searchParams.jobsId}
 			</if>

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

@@ -264,7 +264,12 @@ public class InsurancePolicyUserController {
             list.remove(0);
 
             int affectCount = 0;
+            int existCount = 0;
             for(Object[] array : list){
+                if(StringUtils.isEmpty(array[1].toString())){
+                    continue;
+                }
+
                 String name = array[1].toString();
                 String cardType = array[2].toString();
                 String cardNo = array[3].toString();
@@ -274,6 +279,7 @@ public class InsurancePolicyUserController {
                 String healthStatus = array[7].toString();
 
                 Map<String,Object> searchParams = new HashMap<>();
+                searchParams.put("delFlag",false);
                 searchParams.put("companyId",company.getId());
                 searchParams.put("cardNo",cardNo);
                 List<Sort> sortList = new ArrayList<>();
@@ -301,25 +307,33 @@ public class InsurancePolicyUserController {
                     companyMember.setCreateBy(principal.getName());
                     companyMember.setCreateTime(new Date());
                     companyMemberService.insert(companyMember);
+                    existCount++;
                 }
 
-                InsurancePolicyMember insurancePolicyMember = new InsurancePolicyMember();
-                insurancePolicyMember.setId(UUID.randomUUID().toString());
-                if(StringUtils.isNotEmpty(policyId)) insurancePolicyMember.setPolicyId(policyId);
-                insurancePolicyMember.setMemberId(companyMember.getId());
-                insurancePolicyMember.setStatus("0");
-                insurancePolicyMember.setDelFlag(false);
-                insurancePolicyMember.setCreateBy(principal.getName());
-                insurancePolicyMember.setCreateTime(new Date());
-
-                if(insurancePolicyMemberService.insert(insurancePolicyMember) > 0){
-                    affectCount++;
+                Map<String,Object> searchParams1 = new HashMap<>();
+                searchParams1.put("companyId",company.getId());
+                searchParams1.put("cardNo",cardNo);
+                List<Sort> sortList1 = new ArrayList<>();
+                Page<InsurancePolicyMember> page1 = insurancePolicyMemberService.pageSearch(searchParams1,1,100,sortList1);
+                if(page1.size() <= 0) {
+                    InsurancePolicyMember insurancePolicyMember = new InsurancePolicyMember();
+                    insurancePolicyMember.setId(UUID.randomUUID().toString());
+                    if (StringUtils.isNotEmpty(policyId)) insurancePolicyMember.setPolicyId(policyId);
+                    insurancePolicyMember.setMemberId(companyMember.getId());
+                    insurancePolicyMember.setStatus("0");
+                    insurancePolicyMember.setDelFlag(false);
+                    insurancePolicyMember.setCreateBy(principal.getName());
+                    insurancePolicyMember.setCreateTime(new Date());
+
+                    if (insurancePolicyMemberService.insert(insurancePolicyMember) > 0) {
+                        affectCount++;
+                    }
                 }
             }
 
             if (affectCount > 0) {
                 msgResult.setResult(true);
-                msgResult.setData("成功导入" + affectCount + "条记录。");
+                msgResult.setData("成功导入" + affectCount + "人，其中" + existCount + "人是新人，需在企业人员中完善信息。");
             } else {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库添加失败");