导入

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

@@ -18,6 +18,8 @@ public class TbClassTeacherTemp  extends BaseEntity {
     
     private String classId;
     
+    private String className;
+    
     private String leagueName;	
     
     private String teacherId;	
@@ -144,6 +146,14 @@ public class TbClassTeacherTemp  extends BaseEntity {
 		this.classId = classId;
 	}
 
+	public String getClassName() {
+		return className;
+	}
+
+	public void setClassName(String className) {
+		this.className = className;
+	}
+
 
 
 }

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

@@ -14,6 +14,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 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.weixin.libmy.domain.LibVip;
 import com.ssj.bean.weixin.libmy.domain.TbLibJoin;
@@ -31,7 +33,7 @@ import com.ssj.framework.idworker.IdWorker;
 import com.ssj.service.conch.common.service.ConchCommonService;
 import com.ssj.service.conch.conch.service.ConchDerverService;
 import com.ssj.service.sys.easemob.service.EasemobService;
-import com.ssj.service.sys.fx.service.MerchantService;
+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.weixin.library.service.ILibJoinService;
@@ -83,6 +85,12 @@ public class TbClassStudentTempServiceImpl extends BaseServiceImpl<TbClassStuden
 	@Autowired
 	private ILibVipService libVipService;
 	
+	@Autowired
+	private TbClassService tbClassService;
+	
+	@Autowired
+	private TbClassStudentService tbClassStudentService;
+	
 	
 	@Override
 	public PagingAndSortingRepository<TbClassStudentTemp, String> getDao() {
@@ -282,18 +290,27 @@ public class TbClassStudentTempServiceImpl extends BaseServiceImpl<TbClassStuden
 				}
 				
 				
-//				TbClass tbClass=tbClassService.getDefaultTbClassByLibId(libJoin.getId());
+				TbClass tbClass=tbClassService.getTbClassGradeByLibId(tbLibImStudentTemp.getLibId(),tbLibImStudentTemp.getGrade(), tbLibImStudentTemp.getClassName());
+				if(tbClass==null) {
+					tbClass=new TbClass();
+					tbClass.setLibId(tbLibImStudentTemp.getLibId());
+					tbClass.setClassName(tbLibImStudentTemp.getClassName());
+					tbClass.setGrade(tbLibImStudentTemp.getGrade());
+					tbClass.setCreateTime(new Date());
+					tbClass.setStatus(1);
+					tbClass=tbClassService.save(tbClass);
+				}
 				
-//				TbClassStudent tbClassStudent=tbClassStudentService.getTbClassTeacherByVipId(tbClass.getId(), libVip.getId());
-//				if(tbClassStudent==null) {
-//					tbClassStudent=new TbClassStudent();
-//					tbClassStudent.setLibId(libJoin.getId());	
-//					tbClassStudent.setClassId(tbClass.getId());
-//					tbClassStudent.setVipId(libVip.getId());
-//					tbClassStudent.setStatus(1);
-//					tbClassStudent.setCreateTime(new Date());
-//					tbClassStudentService.save(tbClassStudent);
-//				}
+				TbClassStudent tbClassStudent=tbClassStudentService.getTbClassTeacherByVipId(tbClass.getId(), libVip.getId());
+				if(tbClassStudent==null) {
+					tbClassStudent=new TbClassStudent();
+					tbClassStudent.setLibId(libJoin.getId());	
+					tbClassStudent.setClassId(tbClass.getId());
+					tbClassStudent.setVipId(libVip.getId());
+					tbClassStudent.setStatus(1);
+					tbClassStudent.setCreateTime(new Date());
+					tbClassStudentService.save(tbClassStudent);
+				}
 
 				//给学生增加一个默认的永久校区批改服务
 	            libVipServiceService.insertLibServiceByType(libVip.getId(), libJoin.getId(), libJoin.getEndSignTime(), libJoin.getSignType());

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

@@ -242,13 +242,23 @@ public class TbClassTeacherTempServiceImpl extends BaseServiceImpl<TbClassTeache
 					managerService.save(platformTbLibManagers);	
 				}
 				
-				TbClass tbClass=tbClassService.getDefaultTbClassByLibId(libJoin.getId());
+				TbClass tbClass=tbClassService.getTbClassGradeByLibId(tbLibImTeacherTemp.getLibId(),tbLibImTeacherTemp.getGrade(), tbLibImTeacherTemp.getClassName());
+				if(tbClass==null) {
+					tbClass=new TbClass();
+					tbClass.setLibId(tbLibImTeacherTemp.getLibId());
+					tbClass.setClassName(tbLibImTeacherTemp.getClassName());
+					tbClass.setGrade(tbLibImTeacherTemp.getGrade());
+					tbClass.setCreateTime(new Date());
+					tbClass.setStatus(1);
+					tbClass=tbClassService.save(tbClass);
+				}
 				
 				TbClassTeacher tbClassTeacher=tbClassTeacherService.getTbLibImTeacherByClassId(tbClass.getId(), user.getId());
 				if(tbClassTeacher==null) {
 					tbClassTeacher=new TbClassTeacher();
 					tbClassTeacher.setClassId(tbClass.getId());
 					tbClassTeacher.setLibId(libJoin.getId());
+					tbClassTeacher.setType(1);
 					tbClassTeacher.setStatus(1);
 					tbClassTeacher.setCreateTime(new Date());
 					tbClassTeacher.setTeacherId(user.getId());
@@ -570,7 +580,7 @@ public class TbClassTeacherTempServiceImpl extends BaseServiceImpl<TbClassTeache
 					tbClass=tbClassService.save(tbClass);
 				}
 				TbClassTeacher tbClassType=tbClassTeacherService.getTbLibImTeacherByClassType(tbClass.getId());
-				if(tbClassType!=null) {
+				if(tbClassType==null) {
 					TbClassTeacher tbClassTeacher=tbClassTeacherService.getTbLibImTeacherByClassId(tbClass.getId(),user.getId());
 					if(tbClassTeacher==null) {
 						 tbClassTeacher=new TbClassTeacher();

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

@@ -230,10 +230,10 @@ public class ImLibUserController extends BaseController {
 					tbLibImStudentTemp.setParentName(map.get("data_4"));
 					tbLibImStudentTemp.setParentRole(map.get("data_5"));
 					tbLibImStudentTemp.setParentPhone(map.get("data_6"));
-					if(map.containsKey("data_7")){
-						tbLibImStudentTemp.setDerver(map.get("data_7"));
+					tbLibImStudentTemp.setClassName(map.get("data_7"));
+					if(map.containsKey("data_8")){
+						tbLibImStudentTemp.setDerver(map.get("data_8"));
 					}
-					
 //					tbLibImStudentTemp.setCorrectType(1);
 //					if(map.containsKey("data_8")){
 //						String correctType=map.getOrDefault("data_8","");
@@ -729,6 +729,9 @@ public class ImLibUserController extends BaseController {
 					tbLibImTeacherTemp.setTeacherName(map.get("data_1"));
 					tbLibImTeacherTemp.setSubject(map.get("data_2"));
 					tbLibImTeacherTemp.setTeacherPhone(map.get("data_3"));
+					tbLibImTeacherTemp.setGrade(map.get("data_4"));
+					tbLibImTeacherTemp.setClassName(map.get("data_5"));
+					tbLibImTeacherTemp.setSubject(map.get("data_6"));
 					tbLibImTeacherTemp.setIsCorrect(1);
 					
 					tbLibImTeacherTemps.add(tbLibImTeacherTemp);