add:老师新增所在地，证书编号

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/dto/ExamTeacherSalaryDto.java

@@ -9,6 +9,10 @@ import com.keao.edu.user.entity.ExamTeacherSalary;
 public class ExamTeacherSalaryDto extends ExamTeacherSalary {
 
     private ExaminationBasicDto examinationBasic;
+    
+    private String city;
+    
+    private String certificateNo;
 
     public ExaminationBasicDto getExaminationBasic() {
         return examinationBasic;
@@ -17,4 +21,20 @@ public class ExamTeacherSalaryDto extends ExamTeacherSalary {
     public void setExaminationBasic(ExaminationBasicDto examinationBasic) {
         this.examinationBasic = examinationBasic;
     }
+
+	public String getCity() {
+		return city;
+	}
+
+	public void setCity(String city) {
+		this.city = city;
+	}
+
+	public String getCertificateNo() {
+		return certificateNo;
+	}
+
+	public void setCertificateNo(String certificateNo) {
+		this.certificateNo = certificateNo;
+	}
 }

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/entity/Teacher.java

@@ -53,6 +53,10 @@ public class Teacher {
 	private String subjectName;
 
 	private Integer organId;
+	
+	private String city;
+	
+	private String certificateNo;
 
 	public Integer getOrganId() {
 		return organId;
@@ -174,6 +178,22 @@ public class Teacher {
 		return this.updateTime;
 	}
 			
+	public String getCity() {
+		return city;
+	}
+
+	public void setCity(String city) {
+		this.city = city;
+	}
+
+	public String getCertificateNo() {
+		return certificateNo;
+	}
+
+	public void setCertificateNo(String certificateNo) {
+		this.certificateNo = certificateNo;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

edu-user/edu-user-biz/src/main/resources/config/mybatis/ExamTeacherSalaryMapper.xml

@@ -23,7 +23,8 @@
  	</resultMap>
 
 	<resultMap id="ExamTeacherSalaryDto" type="com.keao.edu.user.dto.ExamTeacherSalaryDto" extends="ExamTeacherSalary">
-
+		<result column="city_" property="city" />
+		<result column="certificate_no_" property="certificateNo" />
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -169,9 +170,10 @@
 	</sql>
 
 	<select id="queryExamTeacherSalary" resultMap="ExamTeacherSalaryDto" parameterType="map">
-		SELECT ets.*,su.real_name_ teacher_real_name_,su.phone_ teacher_phone_
+		SELECT ets.*,su.real_name_ teacher_real_name_,su.phone_ teacher_phone_,t.city_,t.certificate_no_
 		FROM exam_teacher_salary ets
 		LEFT JOIN sys_user su ON ets.teacher_id_=su.id_
+		left join teacher t on t.user_id_ = ets.teacher_id_
 		<include refid="queryExamTeacherSalaryCondition"/>
 		ORDER BY id_ <include refid="global.limit"/>
 	</select>

edu-user/edu-user-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -20,6 +20,8 @@
 		<result column="update_time_" property="updateTime" />
 		<result column="tenant_id_" property="tenantId" />
 		<result column="organ_id_" property="organId" />
+		<result column="city_" property="city" />
+		<result column="certificate_no_" property="certificateNo" />
 		<association property="sysUser" columnPrefix="sys_user_" resultMap="com.keao.edu.user.dao.SysUserDao.SysUser"/>
 	</resultMap>
 
@@ -73,6 +75,12 @@
 			<if test="totalSettlementCost != null">
 				total_settlement_fee_ = #{totalSettlementCost},
 			</if>
+			<if test="city != null">
+				city_ = #{city},
+			</if>
+			<if test="certificateNo != null">
+				certificate_no_ = #{certificateNo},
+			</if>
 			update_time_ = NOW()
 		</set>
 		WHERE user_id_ = #{userId}
@@ -104,8 +112,8 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.entity.Teacher" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO teacher (user_id_,title_,subject_id_list_,salary_settlement_type_,salary_,create_time_,update_time_,tenant_id_,organ_id_)
-		VALUES(#{userId},#{title},#{subjectIdList},#{salarySettlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{salary},NOW(),NOW(),#{tenantId},#{organId})
+		INSERT INTO teacher (user_id_,title_,subject_id_list_,salary_settlement_type_,salary_,create_time_,update_time_,tenant_id_,organ_id_,city_,certificate_no_)
+		VALUES(#{userId},#{title},#{subjectIdList},#{salarySettlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{salary},NOW(),NOW(),#{tenantId},#{organId},#{city},#{certificateNo})
 	</insert>
 
 	<update id="delete">