导入

src/main/java/com/ssj/bean/sys/imlibuser/TbClassStudentTemp.java

@@ -31,10 +31,16 @@ public class TbClassStudentTemp  extends BaseEntity {
     private String studentName;
     
     private String parentName;
+
+    private String parentPhone;
     
     private String parentRole;
     
-    private String parentPhone;
+    private String viceParentName;
+
+    private String viceParentPhone;
+    
+    private String viceParentRole;
     
     private String derver;
     
@@ -205,6 +211,30 @@ public class TbClassStudentTemp  extends BaseEntity {
 		this.className = className;
 	}
 
+	public String getViceParentName() {
+		return viceParentName;
+	}
+
+	public void setViceParentName(String viceParentName) {
+		this.viceParentName = viceParentName;
+	}
+
+	public String getViceParentPhone() {
+		return viceParentPhone;
+	}
+
+	public void setViceParentPhone(String viceParentPhone) {
+		this.viceParentPhone = viceParentPhone;
+	}
+
+	public String getViceParentRole() {
+		return viceParentRole;
+	}
+
+	public void setViceParentRole(String viceParentRole) {
+		this.viceParentRole = viceParentRole;
+	}
+
 
   
 }

src/main/java/com/ssj/service/sys/imlibuser/service/impl/TbClassStudentTempServiceImpl.java

@@ -17,6 +17,7 @@ import com.ssj.bean.conch.conch.domain.ConchDerver;
 import com.ssj.bean.sys.imlibuser.TbClass;
 import com.ssj.bean.sys.imlibuser.TbClassStudent;
 import com.ssj.bean.sys.imlibuser.TbClassStudentTemp;
+import com.ssj.bean.sys.parentrole.domain.SSJParentRole;
 import com.ssj.bean.weixin.libmy.domain.LibVip;
 import com.ssj.bean.weixin.libmy.domain.TbLibJoin;
 import com.ssj.bean.weixin.sales.domain.LibVipService;
@@ -37,6 +38,7 @@ import com.ssj.service.sys.easemob.service.EasemobService;
 import com.ssj.service.sys.imlibuser.service.TbClassService;
 import com.ssj.service.sys.imlibuser.service.TbClassStudentService;
 import com.ssj.service.sys.imlibuser.service.TbClassStudentTempService;
+import com.ssj.service.sys.parentrole.service.SSJParentRoleService;
 import com.ssj.service.weixin.library.service.ILibJoinService;
 import com.ssj.service.weixin.library.service.ILibVipService;
 import com.ssj.service.weixin.sales.service.LibVipServiceService;
@@ -92,6 +94,10 @@ public class TbClassStudentTempServiceImpl extends BaseServiceImpl<TbClassStuden
 	@Autowired
 	private TbClassStudentService tbClassStudentService;
 	
+	@Autowired
+	private SSJParentRoleService sSJParentRoleService;
+	
+	
 	
 	@Override
 	public PagingAndSortingRepository<TbClassStudentTemp, String> getDao() {
@@ -152,8 +158,9 @@ public class TbClassStudentTempServiceImpl extends BaseServiceImpl<TbClassStuden
 					}
 				}
 
+				//无主家长，生成主家长
 				User user=userService.findByMobile(tbLibImStudentTemp.getParentPhone());
-				if(user==null){//无家长，生成家长
+				if(user==null){
 					user=new User();
 					user.setId(IdWorker.generateId());
 					user.setUserName(tbLibImStudentTemp.getParentName());
@@ -163,14 +170,25 @@ public class TbClassStudentTempServiceImpl extends BaseServiceImpl<TbClassStuden
 					user.setPwdSalt(PasswordUtil.generateSalt());
 					user.setPassword(PasswordUtil.initPassword(user.getPassword(), user.getPwdSalt()));
 					user=userService.save(user);
-				}else {
-//					if(StringUtils.isEmpty(user.getPassword())) {
-//						user.setPassword("123456");
-//						user.setPwdSalt(PasswordUtil.generateSalt());
-//						user.setPassword(PasswordUtil.initPassword(user.getPassword(), user.getPwdSalt()));
-//						user=userService.save(user);
-//					}
 				}
+				
+				//无副家长，生成副家长
+				User viceUser=null;
+				if(StringUtils.isNotEmpty(tbLibImStudentTemp.getViceParentPhone())) {
+					viceUser=userService.findByMobile(tbLibImStudentTemp.getViceParentPhone());
+					if(viceUser==null){
+						viceUser=new User();
+						viceUser.setId(IdWorker.generateId());
+						viceUser.setUserName(tbLibImStudentTemp.getViceParentName());
+						viceUser.setMobile(tbLibImStudentTemp.getViceParentPhone());
+						viceUser.setCreateTime(new Date());
+						viceUser.setPassword("123456");
+						viceUser.setPwdSalt(PasswordUtil.generateSalt());
+						viceUser.setPassword(PasswordUtil.initPassword(viceUser.getPassword(), viceUser.getPwdSalt()));
+						viceUser=userService.save(viceUser);
+					}	
+				}
+				
 				LibVip libVip=null;
 				List<LibVip> libVips=vipService.findByUserIdAndChildNames(user.getId(), tbLibImStudentTemp.getStudentName());
 				if(libVips!=null && libVips.size()>=2) {
@@ -183,7 +201,6 @@ public class TbClassStudentTempServiceImpl extends BaseServiceImpl<TbClassStuden
 					libVip=libVips.get(0);
 				}
 				if(libVip==null){//无学生，生成学生
-					
 					if(StringUtils.isNotEmpty(tbLibImStudentTemp.getDerver())) {
 						ConchDerver conchDerver = conchDerverService.findByDerver(tbLibImStudentTemp.getDerver().trim());
 						if(conchDerver!=null) {
@@ -196,7 +213,6 @@ public class TbClassStudentTempServiceImpl extends BaseServiceImpl<TbClassStuden
 							}
 						}
 					}
-					
 					User studentUser=new User();
 					studentUser.setId(IdWorker.generateId());
 					studentUser.setUserName(tbLibImStudentTemp.getStudentName());
@@ -221,9 +237,39 @@ public class TbClassStudentTempServiceImpl extends BaseServiceImpl<TbClassStuden
 					libVip.setCreateTime(new Date());
 					libVip=vipService.save(libVip);
 					tbLibImStudentTemp.setVipId(libVip.getId());
+					
+					//关联副家长
+					if(user!=null && viceUser!=null && libVip!=null) {
+						SSJParentRole sSJParentRole=sSJParentRoleService.findByVipIdAndRoleUserId(libVip.getId(), viceUser.getId());
+						if(sSJParentRole==null) {
+							sSJParentRole=new SSJParentRole();
+							sSJParentRole.setName(viceUser.getUserName());
+							sSJParentRole.setRoleName(tbLibImStudentTemp.getViceParentRole());
+							sSJParentRole.setRoleUserId(viceUser.getId());
+							sSJParentRole.setUserId(user.getId());
+							sSJParentRole.setVipId(libVip.getId());
+							sSJParentRole=sSJParentRoleService.save(sSJParentRole);
+						}
+					}
+					
 				}else {
 					tbLibImStudentTemp.setVipId(libVip.getId());
 					
+					//关联副家长
+					if(user!=null && viceUser!=null && libVip!=null) {
+						SSJParentRole sSJParentRole=sSJParentRoleService.findByVipIdAndRoleUserId(libVip.getId(), viceUser.getId());
+						if(sSJParentRole==null) {
+							sSJParentRole=new SSJParentRole();
+							sSJParentRole.setName(viceUser.getUserName());
+							sSJParentRole.setRoleName(tbLibImStudentTemp.getViceParentRole());
+							sSJParentRole.setRoleUserId(viceUser.getId());
+							sSJParentRole.setUserId(user.getId());
+							sSJParentRole.setVipId(libVip.getId());
+							sSJParentRole=sSJParentRoleService.save(sSJParentRole);
+						}
+					}
+					
+					
 					if(StringUtils.isNotEmpty(tbLibImStudentTemp.getDerver())) {
 						if(StringUtils.isNotEmpty(libVip.getDerver())) {
 							if(!libVip.getDerver().equals(tbLibImStudentTemp.getDerver())) {
@@ -234,9 +280,6 @@ public class TbClassStudentTempServiceImpl extends BaseServiceImpl<TbClassStuden
 								return reqNum;
 							}
 						}
-					}
-					
-					if(StringUtils.isNotEmpty(tbLibImStudentTemp.getDerver())) {
 						ConchDerver conchDerver = conchDerverService.findByDerver(tbLibImStudentTemp.getDerver().trim());
 						if(conchDerver!=null) {
 							if (StringUtils.isNotEmpty(conchDerver.getVipId()) && !libVip.getDerver().equals(tbLibImStudentTemp.getDerver())) {
@@ -248,7 +291,7 @@ public class TbClassStudentTempServiceImpl extends BaseServiceImpl<TbClassStuden
 							}
 						}
 					}
-
+					
 					//有学生，判断机构是为空，绑定机构
 					if(StringUtils.isEmpty(libVip.getLibId())) {
 						libVip.setLibId(libJoin.getId());
@@ -269,23 +312,8 @@ public class TbClassStudentTempServiceImpl extends BaseServiceImpl<TbClassStuden
 							return reqNum;
 						}
 					}
-					
-					
 				}
-				
-				
-//				boolean isError=insertTbClassStudentByService(tbLibImStudentTemp);
-//				if(!isError) {
-//					tbLibImStudentTemp.setStatus(0);
-//					tbLibImStudentTemp.setErrorReason("导入的服务时间与用户现有服务时间冲突");
-//					this.save(tbLibImStudentTemp);
-//					//还原绑定机构
-//					libVip.setLibId(null);
-//					libVip=vipService.save(libVip);
-//					reqNum=0;
-//					return reqNum;
-//				}
-				
+
 				//绑定derver
 				if(StringUtils.isNotEmpty(tbLibImStudentTemp.getDerver()) && StringUtils.isEmpty(libVip.getDerver())){
 					if (StringUtils.isBlank(user.getEasemobName())) {

src/main/java/com/ssj/sys/controller/ImLibUserController.java

@@ -225,13 +225,27 @@ public class ImLibUserController extends BaseController {
 					tbLibImStudentTemp.setLeagueName(map.get("data_0"));
 					tbLibImStudentTemp.setSchool(map.get("data_1"));
 					tbLibImStudentTemp.setGrade(map.get("data_2"));
-					tbLibImStudentTemp.setStudentName(map.get("data_3"));
-					tbLibImStudentTemp.setParentName(map.get("data_4"));
-					tbLibImStudentTemp.setParentRole(map.get("data_5"));
+					tbLibImStudentTemp.setClassName(map.get("data_3"));
+					
+					tbLibImStudentTemp.setStudentName(map.get("data_4"));
+					
+					tbLibImStudentTemp.setParentName(map.get("data_5"));
 					tbLibImStudentTemp.setParentPhone(map.get("data_6"));
-					tbLibImStudentTemp.setClassName(map.get("data_7"));
+					tbLibImStudentTemp.setParentRole(map.get("data_7"));
+					
 					if(map.containsKey("data_8")){
-						tbLibImStudentTemp.setDerver(map.get("data_8"));
+						tbLibImStudentTemp.setViceParentName(map.get("data_8"));
+					}
+					if(map.containsKey("data_9")){
+						tbLibImStudentTemp.setViceParentPhone(map.get("data_9"));
+					}
+					if(map.containsKey("data_10")){
+						tbLibImStudentTemp.setViceParentRole(map.get("data_10"));
+					}
+					
+					
+					if(map.containsKey("data_11")){
+						tbLibImStudentTemp.setDerver(map.get("data_11"));
 					}
 					
 					tbLibImStudentTemps.add(tbLibImStudentTemp);
@@ -257,20 +271,53 @@ public class ImLibUserController extends BaseController {
 						break;
 					}
 					if(StringUtils.isEmpty(tbLibImStudentTemp.getParentName())){
-						response.failure("家长姓名不能为空");
+						response.failure("主家长姓名不能为空");
 						iserror=true;
 						break;
 					}
 					if(StringUtils.isEmpty(tbLibImStudentTemp.getParentRole())){
-						response.failure("家长角色不能为空");
+						response.failure("主家长角色不能为空");
 						iserror=true;
 						break;
 					}
 					if(StringUtils.isEmpty(tbLibImStudentTemp.getParentPhone()) || tbLibImStudentTemp.getParentPhone().length()!=11){
-						response.failure("家长电话不正确");
+						response.failure("主家长电话不正确");
 						iserror=true;
 						break;
 					}
+					if(StringUtils.isNotEmpty(tbLibImStudentTemp.getViceParentName())) {
+						if(StringUtils.isEmpty(tbLibImStudentTemp.getViceParentPhone())){
+							response.failure("副家长电话不正确");
+							iserror=true;
+							break;
+						}else if(StringUtils.isEmpty(tbLibImStudentTemp.getViceParentRole())){
+							response.failure("副家长角色不正确");
+							iserror=true;
+							break;
+						}
+					}
+					if(StringUtils.isNotEmpty(tbLibImStudentTemp.getViceParentPhone())) {
+						if(StringUtils.isEmpty(tbLibImStudentTemp.getViceParentName())){
+							response.failure("副家长姓名不正确");
+							iserror=true;
+							break;
+						}else if(StringUtils.isEmpty(tbLibImStudentTemp.getViceParentRole())){
+							response.failure("副家长角色不正确");
+							iserror=true;
+							break;
+						}
+					}
+					if(StringUtils.isNotEmpty(tbLibImStudentTemp.getViceParentRole())) {
+						if(StringUtils.isEmpty(tbLibImStudentTemp.getViceParentName())){
+							response.failure("副家长姓名不正确");
+							iserror=true;
+							break;
+						}else if(StringUtils.isEmpty(tbLibImStudentTemp.getViceParentPhone())){
+							response.failure("副家长电话不正确");
+							iserror=true;
+							break;
+						}
+					}
 				}
 				if(!iserror){
 					int successNum=tbLibImStudentTempService.insertBatchTbClassStudent(tbLibImStudentTemps);