学校修改

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/SchoolTeacher.java

@@ -426,6 +426,81 @@ public class SchoolTeacher implements Serializable {
 	 */
 	@ApiModelProperty(value = "是否享受公待遇")
 	private String enjoyOfficeTreatment;
+	/**
+	 * 工资拨付标准
+	 */
+	@ApiModelProperty(value = "工资拨付标准")
+	private String salaryWithdrawalStandardName;
+	/**
+	 * 职级拨付标准
+	 */
+	@ApiModelProperty(value = "职级拨付标准")
+	private String rankWithdrawalStandardName;
+	/**
+	 * 履约奖
+	 */
+	@ApiModelProperty(value = "履约奖")
+	private String performanceAwardName;
+	/**
+	 * 校龄工资
+	 */
+	@ApiModelProperty(value = "校龄工资")
+	private String schoolAgeSalaryName;
+	/**
+	 * 增资
+	 */
+	@ApiModelProperty(value = "增资")
+	private String capitalIncreaseName;
+	/**
+	 * 学历工资
+	 */
+	@ApiModelProperty(value = "学历工资")
+	private String educationSalaryName;
+	/**
+	 * 职级工资
+	 */
+	@ApiModelProperty(value = "职级工资")
+	private String rankSalaryName;
+	/**
+	 * 工资基数
+	 */
+	@ApiModelProperty(value = "工资基数")
+	private String salaryBaseName;
+	/**
+	 * 工作量工资
+	 */
+	@ApiModelProperty(value = "工作量工资")
+	private String workloadSalaryName;
+	/**
+	 * 日常考核标准
+	 */
+	@ApiModelProperty(value = "日常考核标准")
+	private String dailyAssessmentCriteriaName;
+	/**
+	 * 日常考核工资
+	 */
+	@ApiModelProperty(value = "日常考核工资")
+	private String dailyAssessmentSalaryName;
+	/**
+	 * 学期绩效工资
+	 */
+	@ApiModelProperty(value = "学期绩效工资")
+	private String termPerformanceSalaryName;
+	/**
+	 * 领导干部补贴
+	 */
+	@ApiModelProperty(value = "领导干部补贴")
+	private String leadingCadreSubsidyName;
+	/**
+	 * 备课组长
+	 */
+	@ApiModelProperty(value = "备课组长")
+	private String prepareLessonsName;
+	/**
+	 * 教研组长
+	 */
+	@ApiModelProperty(value = "教研组长")
+	private String teachingResearchName;
 
 
 

blade-service/blade-client/src/main/java/org/springblade/client/school/mapper/SchoolTeacherMapper.xml

@@ -70,6 +70,22 @@
         <result column="leading_cadre_subsidy" property="leadingCadreSubsidy"/>
         <result column="prepare_lessons" property="prepareLessons"/>
         <result column="teaching_research" property="teachingResearch"/>
+        <result column="enjoy_office_treatment" property="enjoyOfficeTreatment"/>
+        <result column="salary_withdrawal_standard_name" property="salaryWithdrawalStandardName"/>
+        <result column="rank_withdrawal_standard_name" property="rankWithdrawalStandardName"/>
+        <result column="performance_award_name" property="performanceAwardName"/>
+        <result column="school_age_salary_name" property="schoolAgeSalaryName"/>
+        <result column="capital_increase_name" property="capitalIncreaseName"/>
+        <result column="education_salary_name" property="educationSalaryName"/>
+        <result column="rank_salary_name" property="rankSalaryName"/>
+        <result column="salary_base_name" property="salaryBaseName"/>
+        <result column="workload_salary_name" property="workloadSalaryName"/>
+        <result column="daily_assessment_criteria_name" property="dailyAssessmentCriteriaName"/>
+        <result column="daily_assessment_salary_name" property="dailyAssessmentSalaryName"/>
+        <result column="term_performance_salary_name" property="termPerformanceSalaryName"/>
+        <result column="leading_cadre_subsidy_name" property="leadingCadreSubsidyName"/>
+        <result column="prepare_lessons_name" property="prepareLessonsName"/>
+        <result column="teaching_research_name" property="teachingResearchName"/>
     </resultMap>