zouxuan před 3 roky
rodič
revize
6f534d465c

+ 2 - 27
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Student.java

@@ -1,18 +1,15 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.auth.api.entity.SysUser;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
-import com.ym.mec.auth.api.entity.SysUser;
+import java.util.Date;
 
 /**
  * 对应数据库表(student):
  */
 public class Student extends SysUser {
-
 	/**
 	 * 
 	 */
@@ -83,12 +80,6 @@ public class Student extends SysUser {
 	@ApiModelProperty(value = "家长姓名")
 	private String parentName;
 
-	@ApiModelProperty(value = "备注")
-	private String remark;
-
-	@ApiModelProperty(value = "单位名称")
-	private String unitName;
-
 
 	public Student(Integer userId, String subjectIdList) {
 		this.userId = userId;
@@ -325,20 +316,4 @@ public class Student extends SysUser {
 	public void setParentName(String parentName) {
 		this.parentName = parentName;
 	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public String getUnitName() {
-		return unitName;
-	}
-
-	public void setUnitName(String unitName) {
-		this.unitName = unitName;
-	}
 }

+ 0 - 22
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentPreRegistration.java

@@ -42,12 +42,6 @@ public class StudentPreRegistration extends BaseStudentDto {
 	/** 家长姓名 **/
 	private String parentName;
 
-	/** 备注 */
-	private String remark;
-
-	/** 单位名称 */
-	private String unitName;
-
 	public void setId(Long id){
 		this.id = id;
 	}
@@ -156,20 +150,4 @@ public class StudentPreRegistration extends BaseStudentDto {
 	public void setParentName(String parentName) {
 		this.parentName = parentName;
 	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public String getUnitName() {
-		return unitName;
-	}
-
-	public void setUnitName(String unitName) {
-		this.unitName = unitName;
-	}
 }

+ 0 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentServiceImpl.java

@@ -184,8 +184,6 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         student.setCurrentGradeNum(studentPreRegistration.getCurrentGradeNum());
         student.setSubjectIdList(studentPreRegistration.getSelectionSubjectId().toString());
         student.setCurrentClass(studentPreRegistration.getCurrentClass());
-        student.setRemark(studentPreRegistration.getRemark());
-        student.setUnitName(studentPreRegistration.getUnitName());
         studentDao.insert(student);
         TenantContextHolder.clearTenantId();
         return true;

+ 4 - 2
mec-biz/src/main/resources/config/mybatis/StudentMapper.xml

@@ -87,7 +87,8 @@
             operating_tag_,
         </if>
         teacher_id_,create_time_,update_time_,service_tag_update_time_,cooperation_organ_id_,
-        care_package_,come_on_package_,member_rank_setting_id_,membership_start_time_,membership_end_time_,current_grade_num_,current_class_,tenant_id_,remark_,unit_name_)
+        care_package_,come_on_package_,member_rank_setting_id_,membership_start_time_,
+        membership_end_time_,current_grade_num_,current_class_,tenant_id_)
         VALUES
         (#{userId},#{schoolName},#{subjectIdList},
         <if test="serviceTag != null">
@@ -97,7 +98,8 @@
             #{operatingTag},
         </if>
         #{teacherId},NOW(),NOW(),NOW(),#{cooperationOrganId},
-         #{carePackage},#{comeOnPackage},#{memberRankSettingId},#{membershipStartTime},#{membershipEndTime},#{currentGradeNum},#{currentClass},#{tenantId},#{remark}, #{unitName})
+         #{carePackage},#{comeOnPackage},#{memberRankSettingId},#{membershipStartTime},
+         #{membershipEndTime},#{currentGradeNum},#{currentClass},#{tenantId})
     </insert>
 
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.Student">