学校修改

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

@@ -61,6 +61,11 @@ public class SchoolConfig implements Serializable {
 		@ApiModelProperty(value = "标准类别(字典表 工资标准 职称工资拨付标准 必填)")
 		private String normType;
 	/**
+	 * 备注
+	 */
+		@ApiModelProperty(value = "备注")
+		private String remarks;
+	/**
 	* 版本
 	*/
 		@ApiModelProperty(value = "版本")
@@ -109,14 +114,20 @@ public class SchoolConfig implements Serializable {
 	/**
 	 * 租户id
 	 */
-	@ApiModelProperty(value = "租户id")
-	private String tenantId;
-	@ApiModelProperty(value = "配置明细")
-	@TableField(exist = false)
-	private List<SchoolConfigItem> schoolConfigItems;
-	@ApiModelProperty(value = "创建人中文名")
-	@TableField(exist = false)
-	private String createUserName;
+		@ApiModelProperty(value = "租户id")
+		private String tenantId;
+	/**
+	 * 配置明细
+	 */
+		@ApiModelProperty(value = "配置明细")
+		@TableField(exist = false)
+		private List<SchoolConfigItem> schoolConfigItems;
+	/**
+	 * 创建人中文名
+	 */
+		@ApiModelProperty(value = "创建人中文名")
+		@TableField(exist = false)
+		private String createUserName;
 
 
 }

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

@@ -108,7 +108,7 @@ public class SchoolTeacher implements Serializable {
 	 * 校龄开始日期
 	 */
 		@ApiModelProperty(value = "校龄开始日期")
-		@JsonFormat(pattern = "yyyy-MM")
+		@JsonFormat(pattern = "yyyy-MM-dd")
 		private Date schoolAgeSalaryDate;
 	/**
 	 * 校龄
@@ -455,7 +455,7 @@ public class SchoolTeacher implements Serializable {
 	 * 学历工资
 	 */
 	@ApiModelProperty(value = "学历工资")
-	private String educationSalaryName;
+	private BigDecimal educationSalaryName;
 	/**
 	 * 职级工资
 	 */
@@ -516,7 +516,56 @@ public class SchoolTeacher implements Serializable {
 	 */
 	@ApiModelProperty(value = "虚拟工作量工资标准")
 	private BigDecimal virtualWorkloadSalary;
-
+	/**
+	 * 双休日工作量工资标准
+	 */
+	@ApiModelProperty(value = "双休日工作量工资标准")
+	private BigDecimal doubleCease;
+	/**
+	 * 虚拟日常考核标准
+	 */
+	@ApiModelProperty(value = "虚拟日常考核标准")
+	private BigDecimal virtualDailyAssessmentCriteria;
+	/**
+	 * 领导干部考核补贴标准
+	 */
+	@ApiModelProperty(value = "领导干部补贴标准")
+	private BigDecimal assessLeadingCadreSubsidyName;
+	/**
+	 * 领导干部考核补贴工资
+	 */
+	@ApiModelProperty(value = "领导干部考核补贴工资")
+	private BigDecimal assessLeadingCadreSubsidy;
+	/**
+	 * 班主任补贴标准
+	 */
+	@ApiModelProperty(value = "班主任补贴标准")
+	private BigDecimal teacherSubsidy;
+	/**
+	 * 班主任考核补贴标准
+	 */
+	@ApiModelProperty(value = "班主任考核补贴标准")
+	private BigDecimal teacherAssessSubsidy;
+	/**
+	 * 备课组长考核补贴标准
+	 */
+	@ApiModelProperty(value = "备课组长补贴标准")
+	private BigDecimal assessPrepareLessonsName;
+	/**
+	 * 备课组长考核补贴
+	 */
+	@ApiModelProperty(value = "备课组长考核补贴标准")
+	private BigDecimal assessPrepareLessons;
+	/**
+	 * 教研组长
+	 */
+	@ApiModelProperty(value = "教研组长考核补贴标准")
+	private BigDecimal assessTeachingResearchName;
+	/**
+	 * 教研组长
+	 */
+	@ApiModelProperty(value = "教研组长补贴")
+	private BigDecimal assessTeachingResearch;
 
 
 

blade-service/blade-client/src/main/java/org/springblade/client/school/excel/SchoolTeacherExcel.java

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -38,11 +39,6 @@ public class SchoolTeacherExcel implements Serializable {
 	@ExcelProperty(value = "联系电话")
 	private String phone;
 	/**
-	 * 学历
-	 */
-	@ExcelProperty(value = "学历")
-	private String code;
-	/**
 	 * 入职日期
 	 */
 	@ExcelProperty(value = "入职日期")
@@ -56,21 +52,26 @@ public class SchoolTeacherExcel implements Serializable {
 	 * 校龄开始日期
 	 */
 	@ExcelProperty(value = "校龄开始日期")
-	private BigDecimal schoolAgeSalaryDate;
-	/**
-	 * 校龄
-	 */
-	@ExcelProperty(value = "校龄")
-	private BigDecimal schoolAge;
+	private Date schoolAgeSalaryDate;
 	/**
 	 * 所在部门
 	 */
-	@ExcelProperty(value = "所在部门")
+	@ExcelProperty(value = "所在部门(必填)")
 	private String inSection;
 	/**
+	 * 级部
+	 */
+	@ExcelProperty(value = "级部")
+	private String department;
+	/**
+	 * 班级
+	 */
+	@ExcelProperty(value = "班级")
+	private String inStaffRoom;
+	/**
 	 * 是否班主任
 	 */
-	@ExcelProperty(value = "是否班主任")
+	@ExcelProperty(value = "正版/副班")
 	private String doubleTeachers;
 	/**
 	 * 职务
@@ -80,7 +81,7 @@ public class SchoolTeacherExcel implements Serializable {
 	/**
 	 * 工资拨付标准
 	 */
-	@ExcelProperty(value = "教师类别")
+	@ExcelProperty(value = "教师类别(必填)")
 	private String salaryWithdrawalStandardName;
 	/**
 	 * 工资拨付标准
@@ -100,18 +101,13 @@ public class SchoolTeacherExcel implements Serializable {
 	/**
 	 * 履约奖
 	 */
-	@ExcelProperty(value = "履约奖标准")
-	private String performanceAwardName;
-	/**
-	 * 履约奖
-	 */
 	@ExcelProperty(value = "履约奖")
 	private BigDecimal performanceAward;
 	/**
-	 * 校龄工资
+	 * 校龄
 	 */
-	@ExcelProperty(value = "校龄工资标准")
-	private String schoolAgeSalaryName;
+	@ExcelProperty(value = "校龄")
+	private BigDecimal schoolAge;
 	/**
 	 * 校龄工资
 	 */
@@ -125,13 +121,13 @@ public class SchoolTeacherExcel implements Serializable {
 	/**
 	 * 增资
 	 */
-	@ExcelProperty(value = "增资工资")
+	@ExcelProperty(value = "增资")
 	private BigDecimal capitalIncrease;
 	/**
-	 * 学历工资
+	 * 学历
 	 */
-	@ExcelProperty(value = "学历标准")
-	private String educationSalaryName;
+	@ExcelProperty(value = "学历")
+	private String code;
 	/**
 	 * 学历工资
 	 */
@@ -140,7 +136,7 @@ public class SchoolTeacherExcel implements Serializable {
 	/**
 	 * 职级工资
 	 */
-	@ExcelProperty(value = "职级等级标准")
+	@ExcelProperty(value = "职级等级")
 	private String rankSalaryName;
 	/**
 	 * 职级工资
@@ -163,6 +159,16 @@ public class SchoolTeacherExcel implements Serializable {
 	@ExcelProperty(value = "工作量工资标准")
 	private String workloadSalaryName;
 	/**
+	 * 虚拟工作量工资标准
+	 */
+	@ExcelProperty(value = "虚拟工作量工资标准")
+	private BigDecimal virtualWorkloadSalary;
+	/**
+	 * 双休日工作量工资标准
+	 */
+	@ExcelProperty(value = "双休日工作量工资标准")
+	private BigDecimal doubleCease;
+	/**
 	 * 工作量工资
 	 */
 	@ExcelProperty(value = "工作量工资")
@@ -173,21 +179,16 @@ public class SchoolTeacherExcel implements Serializable {
 	@ExcelProperty(value = "日常考核标准")
 	private String dailyAssessmentCriteriaName;
 	/**
+	 * 虚拟日常考核标准
+	 */
+	@ExcelProperty(value = "虚拟日常考核标准")
+	private BigDecimal virtualDailyAssessmentCriteria;
+	/**
 	 * 日常考核标准
 	 */
 	@ExcelProperty(value = "日常考核工资")
 	private BigDecimal dailyAssessmentCriteria;
 	/**
-	 * 日常考核工资
-	 */
-	@ExcelProperty(value = "日常考核等级")
-	private String dailyAssessmentSalaryName;
-	/**
-	 * 日常考核工资
-	 */
-	@ExcelProperty(value = "日常考核等级工资")
-	private BigDecimal dailyAssessmentSalary;
-	/**
 	 * 学期绩效工资
 	 */
 	@ExcelProperty(value = "学期绩效标准")
@@ -201,32 +202,72 @@ public class SchoolTeacherExcel implements Serializable {
 	 * 领导干部补贴
 	 */
 	@ExcelProperty(value = "领导干部补贴标准")
-	private String leadingCadreSubsidyName;
+	private BigDecimal leadingCadreSubsidyName;
+	/**
+	 * 领导干部考核补贴标准
+	 */
+	@ExcelProperty(value = "领导干部考核补贴标准")
+	private BigDecimal assessLeadingCadreSubsidyName;
 	/**
 	 * 领导干部补贴
 	 */
 	@ExcelProperty(value = "领导干部补贴工资")
 	private BigDecimal leadingCadreSubsidy;
 	/**
+	 * 领导干部考核补贴工资
+	 */
+	@ExcelProperty(value = "领导干部考核补贴工资")
+	private BigDecimal assessLeadingCadreSubsidy;
+	/**
+	 * 班主任补贴标准
+	 */
+	@ExcelProperty(value = "班主任补贴标准")
+	private BigDecimal teacherSubsidy;
+	/**
+	 * 班主任考核补贴标准
+	 */
+	@ExcelProperty(value = "班主任考核补贴标准")
+	private BigDecimal teacherAssessSubsidy;
+	/**
 	 * 备课组长
 	 */
 	@ExcelProperty(value = "备课组长补贴标准")
-	private String prepareLessonsName;
+	private BigDecimal prepareLessonsName;
+	/**
+	 * 备课组长考核补贴标准
+	 */
+	@ExcelProperty(value = "备课组长考核补贴标准")
+	private BigDecimal assessPrepareLessonsName;
 	/**
 	 * 备课组长
 	 */
 	@ExcelProperty(value = "备课组长补贴")
 	private BigDecimal prepareLessons;
 	/**
+	 * 备课组长考核补贴
+	 */
+	@ExcelProperty(value = "备课组长考核补贴")
+	private BigDecimal assessPrepareLessons;
+	/**
 	 * 教研组长
 	 */
 	@ExcelProperty(value = "教研组长补贴标准")
-	private String teachingResearchName;
+	private BigDecimal teachingResearchName;
+	/**
+	 * 教研组长
+	 */
+	@ExcelProperty(value = "教研组长考核补贴标准")
+	private BigDecimal assessTeachingResearchName;
 	/**
 	 * 教研组长
 	 */
 	@ExcelProperty(value = "教研组长补贴")
 	private BigDecimal teachingResearch;
+	/**
+	 * 教研组长
+	 */
+	@ExcelProperty(value = "教研组长考核补贴")
+	private BigDecimal assessTeachingResearch;
 
 	/**
 	 * 是否享受公待遇
@@ -234,11 +275,6 @@ public class SchoolTeacherExcel implements Serializable {
 	@ExcelProperty(value = "是否享受公待遇(是/否)")
 	private String enjoyOfficeTreatment;
 	/**
-	 * 备注
-	 */
-	@ExcelProperty(value = "备注")
-	private String remarks;
-	/**
 	 * 职工类别
 	 */
 	@ExcelProperty(value = "职工类别(教师/非教师)")
@@ -248,4 +284,11 @@ public class SchoolTeacherExcel implements Serializable {
 	 */
 	@ExcelProperty(value = "授课类别(文化课/非文化课)")
 	private String classType;
+	/**
+	 * 备注
+	 */
+	@ExcelProperty(value = "备注")
+	private String remarks;
+
+
 }

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

@@ -16,6 +16,7 @@
  */
 package org.springblade.client.school.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.springblade.client.entity.SchoolConfigItem;
 import org.springblade.client.vo.SchoolConfigItemVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -39,4 +40,19 @@ public interface SchoolConfigItemMapper extends BaseMapper<SchoolConfigItem> {
 	 */
 	List<SchoolConfigItemVO> selectSchoolConfigItemPage(IPage page, SchoolConfigItemVO schoolConfigItem);
 
+	/**
+	 * 获取标准配置信息
+	 * @param tenantId 租户 必填
+	 * @param inSection 部门 必填
+	 * @param salaryWithdrawalStandardName 教师类别 必填
+	 * @param normType 标准类别 必填
+	 * @param parameter 类别参数
+	 * @return
+	 */
+	SchoolConfigItem getConfigMessage(@Param("tenantId") String tenantId,
+									  @Param("inSection") String inSection,
+									  @Param("salaryWithdrawalStandardName") String salaryWithdrawalStandardName,
+									  @Param("normType") String normType,
+									  @Param("parameter") String parameter);
+
 }

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

@@ -23,5 +23,28 @@
     <select id="selectSchoolConfigItemPage" resultMap="schoolConfigItemResultMap">
         select * from basic_school_config_item where is_deleted = 0
     </select>
+    <select id="getConfigMessage" resultMap="schoolConfigItemResultMap">
+        SELECT
+	    ci.*
+        FROM
+	    basic_school_config_item ci
+	    LEFT JOIN basic_school_config cf
+	    ON ci.pid = cf.id
+	    WHERE ci.is_deleted = 0
+	    AND cf.is_deleted = 0
+	    #租户
+	    AND ci.tenant_id = #{tenantId}
+	    #部门
+	    AND cf.in_section = #{inSection}
+	    #教师类别
+	    AND cf.salary_withdrawal_standard_name = #{salaryWithdrawalStandardName}
+	    #标准类别
+	    AND cf.norm_type = #{normType}
+	    #类别参数
+        <if test="parameter!=null and parameter != ''">
+            AND ci.parameter = #{parameter}
+        </if>
+	    ORDER BY ci.salary DESC LIMIT 1
+    </select>
 
 </mapper>

blade-service/blade-client/src/main/java/org/springblade/client/school/service/impl/SchoolTeacherServiceImpl.java

@@ -23,9 +23,11 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import org.springblade.client.entity.GoodsType;
+import org.springblade.client.entity.SchoolConfigItem;
 import org.springblade.client.entity.SchoolTeacher;
 import org.springblade.client.goods.excel.GoodsExcel;
 import org.springblade.client.school.excel.SchoolTeacherExcel;
+import org.springblade.client.school.mapper.SchoolConfigItemMapper;
 import org.springblade.client.school.mapper.SchoolTeacherCauseMapper;
 import org.springblade.client.school.mapper.SchoolTeacherMapper;
 import org.springblade.client.school.service.ISchoolTeacherService;
@@ -58,6 +60,7 @@ import java.util.List;
 public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, SchoolTeacher> implements ISchoolTeacherService {
 
 	private final SchoolTeacherCauseMapper schoolTeacherCauseMapper;
+	private final SchoolConfigItemMapper schoolConfigItemMapper;
 	@Override
 	public IPage<SchoolTeacherVO> selectSchoolTeacherPage(IPage<SchoolTeacherVO> page, SchoolTeacherVO schoolTeacher) {
 		return page.setRecords(baseMapper.selectSchoolTeacherPage(page, schoolTeacher));
@@ -76,6 +79,11 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 			int month = end.get(Calendar.YEAR)-start.get(Calendar.YEAR);
 			schoolTeacher.setSchoolAge(new BigDecimal(month));
 		}
+		if (schoolTeacher.getSchoolAge() != null && schoolTeacher.getSchoolAge().compareTo(new BigDecimal(10)) < 0){
+			schoolTeacher.setSchoolAgeSalary(schoolTeacher.getSchoolAge().multiply(new BigDecimal(100)));
+		}else if (schoolTeacher.getSchoolAge() != null && schoolTeacher.getSchoolAge().compareTo(new BigDecimal(10)) >= 0){
+			schoolTeacher.setSchoolAgeSalary(new BigDecimal(1000));
+		}
 		if (teacher == null	){
 			schoolTeacher.setId(null);
 			schoolTeacher.setCreateTime(new Date());
@@ -137,6 +145,19 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 			}
 			SchoolTeacher schoolTeacher = new SchoolTeacher();
 			BeanUtil.copy(schoolTeacherExcel,schoolTeacher);
+			if (schoolTeacher.getSchoolAgeSalaryDate() != null){
+				Calendar start = Calendar.getInstance();
+				Calendar end = Calendar.getInstance();
+				start.setTime(schoolTeacher.getSchoolAgeSalaryDate());
+				end.setTime(new Date());
+				int month = end.get(Calendar.YEAR)-start.get(Calendar.YEAR);
+				schoolTeacher.setSchoolAge(new BigDecimal(month));
+			}
+			if (schoolTeacher.getSchoolAge() != null && schoolTeacher.getSchoolAge().compareTo(new BigDecimal(10)) < 0){
+				schoolTeacher.setSchoolAgeSalary(schoolTeacher.getSchoolAge().multiply(new BigDecimal(100)));
+			}else if (schoolTeacher.getSchoolAge() != null && schoolTeacher.getSchoolAge().compareTo(new BigDecimal(10)) >= 0){
+				schoolTeacher.setSchoolAgeSalary(new BigDecimal(1000));
+			}
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
 			SchoolTeacher teacher = baseMapper.selectOne(new QueryWrapper<SchoolTeacher>().eq("id_number", schoolTeacher.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0));
@@ -180,5 +201,71 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 		}
 		return R.success("操作成功");
 	}
+	//获取工资标准配置信息
+	public SchoolTeacher getConfigMessage(SchoolTeacher schoolTeacher){
+		//获取工资拨付标准 公办用职称查询 其他用校龄查询
+		if (!schoolTeacher.getSalaryWithdrawalStandardName().equals("公办")){
+			SchoolConfigItem configMessage = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), schoolTeacher.getSalaryWithdrawalStandardName(), "工资拨付标准", schoolTeacher.getSchoolAge().toString());
+			if (configMessage == null){
+				SchoolConfigItem configItem = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), schoolTeacher.getSalaryWithdrawalStandardName(), "工资拨付标准", null);
+				if (configItem != null){
+					schoolTeacher.setSalaryWithdrawalStandard(configItem.getSalary());
+				}
+			}else {
+				schoolTeacher.setSalaryWithdrawalStandard(configMessage.getSalary());
+			}
+		}else {
+			SchoolConfigItem configMessage = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), schoolTeacher.getSalaryWithdrawalStandardName(), "工资拨付标准", schoolTeacher.getRankWithdrawalStandardName());
+			if (configMessage != null){
+				schoolTeacher.setSalaryWithdrawalStandard(configMessage.getSalary());
+			}
+		}
+		//获取职级拨付标准
+		SchoolConfigItem teacherSubsidy = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), schoolTeacher.getSalaryWithdrawalStandardName(), "职级拨付标准", schoolTeacher.getRankWithdrawalStandardName());
+		if (teacherSubsidy != null){
+			schoolTeacher.setTeacherSubsidy(teacherSubsidy.getSalary());
+		}
+		//班主任补贴标准
+		SchoolConfigItem message = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), schoolTeacher.getSalaryWithdrawalStandardName(), "班主任补贴标准", schoolTeacher.getInStaffRoom()+schoolTeacher.getDoubleTeachers());
+		if (message != null){
+			schoolTeacher.setTeacherSubsidy(message.getSalary());
+		}
+		//班主任考核补贴标准
+		SchoolConfigItem teacherAssessSubsidy = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), schoolTeacher.getSalaryWithdrawalStandardName(), "班主任考核补贴标准", schoolTeacher.getInStaffRoom()+schoolTeacher.getDoubleTeachers());
+		if (teacherAssessSubsidy != null){
+			schoolTeacher.setTeacherAssessSubsidy(teacherAssessSubsidy.getSalary());
+		}
+		//教研组长补贴标准
+		SchoolConfigItem assessTeachingResearch = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), schoolTeacher.getSalaryWithdrawalStandardName(), "教研组长补贴标准", null);
+		if (assessTeachingResearch != null){
+			schoolTeacher.setAssessTeachingResearch(assessTeachingResearch.getSalary());
+		}
+		//教研组长考核补贴标准
+		SchoolConfigItem assessTeachingResearchName = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), schoolTeacher.getSalaryWithdrawalStandardName(), "教研组长考核补贴标准", null);
+		if (assessTeachingResearchName != null){
+			schoolTeacher.setAssessTeachingResearchName(assessTeachingResearchName.getSalary());
+		}
+		//备课组长补贴标准
+		SchoolConfigItem assessPrepareLessonsName = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), schoolTeacher.getSalaryWithdrawalStandardName(), "备课组长补贴标准", null);
+		if (assessPrepareLessonsName != null){
+			schoolTeacher.setAssessPrepareLessonsName(assessPrepareLessonsName.getSalary());
+		}
+		//备课组长考核补贴标准
+		SchoolConfigItem assessPrepareLessons = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), schoolTeacher.getSalaryWithdrawalStandardName(), "备课组长考核补贴标准", null);
+		if (assessPrepareLessons != null){
+			schoolTeacher.setAssessPrepareLessons(assessPrepareLessons.getSalary());
+		}
+		//领导干部补贴标准
+		SchoolConfigItem assessLeadingCadreSubsidyName = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), schoolTeacher.getSalaryWithdrawalStandardName(), "领导干部补贴标准", schoolTeacher.getRankWithdrawalStandardName());
+		if (assessLeadingCadreSubsidyName != null){
+			schoolTeacher.setAssessLeadingCadreSubsidyName(assessLeadingCadreSubsidyName.getSalary());
+		}
+		//领导干部考核补贴标准
+		SchoolConfigItem assessLeadingCadreSubsidy = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), schoolTeacher.getSalaryWithdrawalStandardName(), "领导干部考核补贴标准", schoolTeacher.getRankWithdrawalStandardName());
+		if (assessLeadingCadreSubsidy != null){
+			schoolTeacher.setAssessLeadingCadreSubsidy(assessLeadingCadreSubsidy.getSalary());
+		}
+		return schoolTeacher;
+	}
 
 }

blade-service/blade-school/src/main/java/org/springblade/school/service/impl/SalaryItemServiceImpl.java

@@ -145,51 +145,22 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 
 		if (message.isSuccess() && message.getData() != null){
 			SchoolTeacher teacherMessage = message.getData();
-			if (teacherMessage.getSalaryWithdrawalStandard().compareTo(BigDecimal.ZERO) >0){
-				salaryItem.setSalaryWithdrawalStandard(teacherMessage.getSalaryWithdrawalStandard());
-			}
-			if (teacherMessage.getRankWithdrawalStandard().compareTo(BigDecimal.ZERO) >0){
-				salaryItem.setRankWithdrawalStandard(teacherMessage.getRankWithdrawalStandard());
-			}
-			if (teacherMessage.getPerformanceAward().compareTo(BigDecimal.ZERO) >0){
-				salaryItem.setPerformanceAward(teacherMessage.getPerformanceAward());
-			}
-			if (teacherMessage.getSchoolAgeSalary().compareTo(BigDecimal.ZERO) >0){
-				salaryItem.setSchoolAgeSalary(teacherMessage.getSchoolAgeSalary());
-			}
-			if (teacherMessage.getCapitalIncrease().compareTo(BigDecimal.ZERO) >0){
-				salaryItem.setCapitalIncrease(teacherMessage.getCapitalIncrease());
-			}
-			if (teacherMessage.getEducationSalary().compareTo(BigDecimal.ZERO) >0){
-				salaryItem.setEducationSalary(teacherMessage.getEducationSalary());
-			}
-			if (teacherMessage.getRankSalary().compareTo(BigDecimal.ZERO) >0){
-				salaryItem.setRankSalary(teacherMessage.getRankSalary());
-			}
-			if (teacherMessage.getSalaryBase().compareTo(BigDecimal.ZERO) >0){
-				salaryItem.setSalaryBase(teacherMessage.getSalaryBase());
-			}
-			if (teacherMessage.getWorkloadSalary().compareTo(BigDecimal.ZERO) >0){
-				salaryItem.setWorkloadSalary(teacherMessage.getWorkloadSalary());
-			}
-			if (teacherMessage.getDailyAssessmentCriteria().compareTo(BigDecimal.ZERO) >0){
-				salaryItem.setDailyAssessmentCriteria(teacherMessage.getDailyAssessmentCriteria());
-			}
-			if (teacherMessage.getDailyAssessmentSalary().compareTo(BigDecimal.ZERO) >0){
-				salaryItem.setDailyAssessmentSalary(teacherMessage.getDailyAssessmentSalary());
-			}
-			if (teacherMessage.getTermPerformanceSalary().compareTo(BigDecimal.ZERO) >0){
-				salaryItem.setTermPerformanceSalary(teacherMessage.getTermPerformanceSalary());
-			}
-			if (teacherMessage.getLeadingCadreSubsidy().compareTo(BigDecimal.ZERO) >0){
-				salaryItem.setLeadingCadreSubsidy(teacherMessage.getLeadingCadreSubsidy());
-			}
-			if (teacherMessage.getPrepareLessons().compareTo(BigDecimal.ZERO) >0){
-				salaryItem.setPrepareLessons(teacherMessage.getPrepareLessons());
-			}
-			if (teacherMessage.getTeachingResearch().compareTo(BigDecimal.ZERO) >0){
-				salaryItem.setTeachingResearch(teacherMessage.getTeachingResearch());
-			}
+			salaryItem.setSalaryWithdrawalStandard(teacherMessage.getSalaryWithdrawalStandard());//工资拨付标准
+			salaryItem.setRankWithdrawalStandard(teacherMessage.getRankWithdrawalStandard());//职级拨付标准
+			salaryItem.setPerformanceAward(teacherMessage.getPerformanceAward());//履约奖
+			salaryItem.setSchoolAgeSalary(teacherMessage.getSchoolAgeSalary());//校龄工资
+			salaryItem.setCapitalIncrease(teacherMessage.getCapitalIncrease());//增资
+			salaryItem.setEducationSalary(teacherMessage.getEducationSalary());//学历工资
+			salaryItem.setRankSalary(teacherMessage.getRankSalary());//职级工资
+			salaryItem.setSalaryBase(teacherMessage.getSalaryBase());//工资基数
+			salaryItem.setWorkloadSalary(teacherMessage.getWorkloadSalary());//工作量工资
+			salaryItem.setDailyAssessmentCriteria(teacherMessage.getDailyAssessmentCriteria());//日常考核标准
+			salaryItem.setDailyAssessmentSalary(teacherMessage.getDailyAssessmentSalary());//日常考核工资
+			salaryItem.setTermPerformanceSalary(teacherMessage.getTermPerformanceSalary());//学期绩效工资
+			salaryItem.setLeadingCadreSubsidy(teacherMessage.getLeadingCadreSubsidy());//领导干部补贴
+			salaryItem.setPrepareLessons(teacherMessage.getPrepareLessons());//备课组长
+			salaryItem.setTeachingResearch(teacherMessage.getTeachingResearch());//教研组长
+
 		}
 		return salaryItem;
 	}