学校、福达修改

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

@@ -571,6 +571,11 @@ public class SchoolTeacher implements Serializable {
 	 */
 	@ApiModelProperty(value = "职称")
 	private String rankType;
+	/**
+	 * 虚拟双休日工作量工资标准
+	 */
+	@ApiModelProperty(value = "虚拟双休日工作量工资标准")
+	private BigDecimal virtualDoubleCease;
 
 
 

blade-service-api/blade-client-api/src/main/java/org/springblade/client/vo/CorpsDescVO.java

@@ -57,5 +57,10 @@ public class CorpsDescVO extends CorpsDesc {
 	private String adminProfilesName;
 
 	private String belongCompany;
+	/**
+	 *客户类别中文
+	 */
+	@ApiModelProperty(value = "客户类别中文")
+	private String corpsTypeName;
 
 }

blade-service-api/blade-client-api/src/main/java/org/springblade/client/vo/SchoolTeacherVO.java

@@ -16,10 +16,14 @@
  */
 package org.springblade.client.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.springblade.client.entity.SchoolTeacher;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
+import org.yaml.snakeyaml.events.Event;
+
+import java.util.List;
 
 /**
  * 通济学校-教职工管理表视图实体类
@@ -33,4 +37,7 @@ import io.swagger.annotations.ApiModel;
 public class SchoolTeacherVO extends SchoolTeacher {
 	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty(value = "重新计算的id集合")
+	private List<Long> idList;
+
 }

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsDescController.java

@@ -13,7 +13,11 @@ import org.springblade.client.corps.excel.CorpsCompanyExcel;
 import org.springblade.client.corps.excel.CorpsExcel;
 import org.springblade.client.corps.excel.CorpsSupplierExcel;
 import org.springblade.client.corps.service.ICorpsDescService;
+import org.springblade.client.corps.service.ICorpsTypeDescService;
+import org.springblade.client.corps.service.ICorpsTypeService;
 import org.springblade.client.entity.CorpsDesc;
+import org.springblade.client.entity.CorpsType;
+import org.springblade.client.entity.CorpsTypeDesc;
 import org.springblade.client.entity.GoodsDesc;
 import org.springblade.client.vo.CorpListVo;
 import org.springblade.client.vo.CorpsDescVO;
@@ -41,6 +45,7 @@ import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 客户详情 控制器
@@ -55,10 +60,11 @@ import java.util.List;
 public class CorpsDescController extends BladeController {
 
 	private final ICorpsDescService corpsDescService;
+	private final ICorpsTypeService corpsTypeService;
 	private final IUserClient userClient;
 	private final IOrderDescClient orderDescClient;
 	private final IFinanceClient financeClient;
-
+	private final ICorpsTypeDescService corpsTypeDescService;
 
 	/**
 	 * 详情
@@ -286,9 +292,35 @@ public class CorpsDescController extends BladeController {
 		if (StringUtils.isBlank(corpsDesc.getCorpType())) {
 			throw new SecurityException("缺少必要的参数，客户类型");
 		}
+		//获取客户类别及其子类别
+		List<Long> corpsTypeIdList = new ArrayList<>();
+		if (StringUtils.isNotBlank(corpsDesc.getCorpsTypeName())){
+			LambdaQueryWrapper<CorpsType> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+			lambdaQueryWrapper.eq(CorpsType::getCname,corpsDesc.getCorpsTypeName());
+			lambdaQueryWrapper.eq(CorpsType::getIsDeleted,0);
+			lambdaQueryWrapper.eq(CorpsType::getTenantId,SecureUtil.getTenantId());
+			List<CorpsType> corpsTypeList = corpsTypeService.list(lambdaQueryWrapper);
+			if (CollectionUtils.isNotEmpty(corpsTypeList)){
+				corpsTypeList.stream().forEach(item ->{
+					corpsTypeService.selectChildById(item.getId(), corpsTypeIdList);
+					corpsTypeIdList.add(item.getId());
+				});
+			}
+		}
+		//获取客户类别对应的id
+		if (CollectionUtils.isNotEmpty(corpsTypeIdList)){
+			LambdaQueryWrapper<CorpsTypeDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+			lambdaQueryWrapper.eq(CorpsTypeDesc::getTenantId,SecureUtil.getTenantId());
+			lambdaQueryWrapper.in(CorpsTypeDesc::getCorpTypeId,corpsTypeIdList);
+			List<CorpsTypeDesc> list = corpsTypeDescService.list(lambdaQueryWrapper);
+			if (CollectionUtils.isNotEmpty(list)){
+				corpsDesc.setTypeList(list.stream().filter(e ->e.getCorpId() != null).map(CorpsTypeDesc::getCorpId).collect(Collectors.toList()));
+			}
+		}
 		LambdaQueryWrapper<CorpsDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.like(Func.isNotEmpty(corpsDesc.getCname()), CorpsDesc::getCname, corpsDesc.getCname());
 		lambdaQueryWrapper.like(Func.isNotEmpty(corpsDesc.getCode()), CorpsDesc::getCode, corpsDesc.getCode());
+		lambdaQueryWrapper.in(CollectionUtils.isNotEmpty(corpsDesc.getTypeList()),CorpsDesc::getId,corpsDesc.getTypeList());
 		lambdaQueryWrapper.eq(CorpsDesc::getIsDeleted, 0);
 		lambdaQueryWrapper.eq(CorpsDesc::getTenantId, SecureUtil.getTenantId());
 		if ("KG".equals(corpsDesc.getCorpType())) {

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsTypeController.java

@@ -164,8 +164,8 @@ public class CorpsTypeController extends BladeController {
 	@GetMapping("/lazy-tree")
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "懒加载树形结构", notes = "树形结构")
-	public R<List<CorpsTypeVO>> lazyTree(String tenantId, Long parentId, BladeUser bladeUser,String corpType) {
-		List<CorpsTypeVO> tree = corpsTypeService.lazyTree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), parentId,corpType);
+	public R<List<CorpsTypeVO>> lazyTree(String tenantId, Long parentId, BladeUser bladeUser,String corpType,String cname) {
+		List<CorpsTypeVO> tree = corpsTypeService.lazyTree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), parentId,corpType,cname);
 		return R.data(tree);
 	}
 

blade-service/blade-client/src/main/java/org/springblade/client/corps/mapper/CorpsTypeMapper.java

@@ -54,7 +54,7 @@ public interface CorpsTypeMapper extends BaseMapper<CorpsType> {
 	 * @param parentId
 	 * @return
 	 */
-	List<CorpsTypeVO> lazyTree(String tenantId, Long parentId,String corpType);
+	List<CorpsTypeVO> lazyTree(String tenantId, Long parentId,String corpType,String cname);
 
 	/**
 	 * 获取客户类别的名称

blade-service/blade-client/src/main/java/org/springblade/client/corps/mapper/CorpsTypeMapper.xml

@@ -158,6 +158,9 @@
         <if test="param3 !=null and param3 != '' and param3 != 'KG'">
             and dept.corp_type = #{param3}
         </if>
+        <if test="param4!=null and param4!=''">
+            and dept.cname = #{param4}
+        </if>
         ORDER BY dept.sort
     </select>
     <select id="selectCorpsTypeCname" resultMap="corpsTypeResultMap">

blade-service/blade-client/src/main/java/org/springblade/client/corps/service/ICorpsTypeService.java

@@ -62,7 +62,7 @@ public interface ICorpsTypeService extends IService<CorpsType> {
 	 * @param parentId
 	 * @return
 	 */
-	List<CorpsTypeVO> lazyTree(String tenantId, Long parentId,String corpType);
+	List<CorpsTypeVO> lazyTree(String tenantId, Long parentId,String corpType,String cname);
 
 	/**
 	 * 验证类别名称唯一新
@@ -70,5 +70,9 @@ public interface ICorpsTypeService extends IService<CorpsType> {
 	 * @return
 	 */
 	String selectCorpsTypeCname(CorpsType corpsType);
+	/**
+	 * 递归查询ID
+	 */
+	void selectChildById(Long id, List<Long> idList);
 
 }

blade-service/blade-client/src/main/java/org/springblade/client/corps/service/impl/CorpsDescServiceImpl.java

@@ -66,6 +66,20 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, CorpsDesc
 			corpsTypeService.selectChildById(corpsTypeId, corpsTypeIdList);
 			corpsTypeIdList.add(corpsTypeId);
 			corpsDesc.setTypeList(corpsTypeIdList);
+		}else if (StringUtils.isNotBlank(corpsDesc.getCorpsTypeName())){
+			LambdaQueryWrapper<CorpsType> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+			lambdaQueryWrapper.eq(CorpsType::getCname,corpsDesc.getCorpsTypeName());
+			lambdaQueryWrapper.eq(CorpsType::getIsDeleted,0);
+			lambdaQueryWrapper.eq(CorpsType::getTenantId,SecureUtil.getTenantId());
+			List<CorpsType> corpsTypeList = corpsTypeMapper.selectList(lambdaQueryWrapper);
+			if (CollectionUtils.isNotEmpty(corpsTypeList)){
+				List<Long> corpsTypeIdList = new ArrayList<>();
+				corpsTypeList.stream().forEach(item ->{
+					corpsTypeService.selectChildById(item.getId(), corpsTypeIdList);
+					corpsTypeIdList.add(item.getId());
+				});
+				corpsDesc.setTypeList(corpsTypeIdList);
+			}
 		}
 		return page.setRecords(baseMapper.selectCorpsDescPage(page, corpsDesc));
 	}

blade-service/blade-client/src/main/java/org/springblade/client/corps/service/impl/CorpsTypeServiceImpl.java

@@ -129,11 +129,11 @@ public class CorpsTypeServiceImpl extends ServiceImpl<CorpsTypeMapper, CorpsType
 	}
 
 	@Override
-	public List<CorpsTypeVO> lazyTree(String tenantId, Long parentId, String corpType) {
+	public List<CorpsTypeVO> lazyTree(String tenantId, Long parentId, String corpType,String cname) {
 		if (StringUtils.isBlank(tenantId)) {
 			tenantId = SecureUtil.getTenantId();
 		}
-		return baseMapper.lazyTree(tenantId, parentId, corpType);
+		return baseMapper.lazyTree(tenantId, parentId, corpType,cname);
 	}
 
 	@Override

blade-service/blade-client/src/main/java/org/springblade/client/school/controller/SchoolTeacherController.java

@@ -245,7 +245,8 @@ public class SchoolTeacherController extends BladeController {
 	@GetMapping("/updateTeacherMessage")
 	R updateTeacherMessage(){
 		return schoolTeacherService.updateTeacherMessage();
-	}	/**
+	}
+	/**
 	 * 重新计算工资
 	 */
 	@PostMapping("/calculate")
@@ -254,6 +255,18 @@ public class SchoolTeacherController extends BladeController {
 	public R calculate(@Valid @RequestBody SchoolTeacher schoolTeacher) {
 		return schoolTeacherService.calculate(schoolTeacher);
 	}
+	/**
+		 * 重新计算工资
+	 */
+	@PostMapping("/calculateList")
+	@ApiOperationSupport(order = 11)
+	@ApiOperation(value = "重新计算工资", notes = "传入salaryItem pid")
+	public R calculateList(@Valid @RequestBody SchoolTeacherVO schoolTeacher) {
+		if (CollectionUtils.isEmpty(schoolTeacher.getIdList())){
+			throw new SecurityException("请选择要重新计算的职工信息");
+		}
+		return schoolTeacherService.calculateList(schoolTeacher);
+	}
 
 
 }

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

@@ -175,6 +175,11 @@ public class SchoolTeacherExcel implements Serializable {
 	@ExcelProperty(value = "双休日工作量工资标准")
 	private BigDecimal doubleCease;
 	/**
+	 * 虚拟双休日工作量工资标准
+	 */
+	@ExcelProperty(value = "虚拟双休日工作量工资标准")
+	private BigDecimal virtualDoubleCease;
+	/**
 	 * 工作量工资
 	 */
 	@ExcelProperty(value = "工作量工资")

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

@@ -68,5 +68,11 @@ public interface ISchoolTeacherService extends IService<SchoolTeacher> {
 	 * @return
 	 */
 	R calculate(SchoolTeacher schoolTeacher);
+	/**
+	 * 重新计算工资
+	 * @param schoolTeacher
+	 * @return
+	 */
+	R calculateList(SchoolTeacherVO schoolTeacher);
 
 }

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

@@ -105,6 +105,11 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 			configMessage.setUpdateUser(SecureUtil.getUserId());
 			baseMapper.updateById(configMessage);
 		}
+		//计算工资基数标准 工资基数标准=工资拨付标准-工作量工资标准+虚拟工作量工资标准-日常考核标准-双休日工作量工资标准+虚拟双休日工作量工资标准-绩效工资标准
+		configMessage.setSalaryBase(configMessage.getSalaryWithdrawalStandard().subtract(configMessage.getWorkloadSalaryName()).add(configMessage.getVirtualWorkloadSalary())
+			.subtract(configMessage.getDailyAssessmentCriteriaName()).subtract(configMessage.getDoubleCease()).add(configMessage.getVirtualDoubleCease()).subtract(configMessage.getTermPerformanceSalaryName()));
+		configMessage.setSalaryBaseName(configMessage.getSalaryBase());
+		baseMapper.updateById(configMessage);
 		if (CollectionUtils.isNotEmpty(configMessage.getCauseList())){
 			configMessage.getCauseList().stream().forEach(item ->{
 				if (item.getId() == null){
@@ -181,7 +186,11 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 				configMessage.setUpdateTime(new Date());
 				baseMapper.updateById(configMessage);
 			}
-
+			//计算工资基数标准 工资基数标准=工资拨付标准-工作量工资标准+虚拟工作量工资标准-日常考核标准-双休日工作量工资标准+虚拟双休日工作量工资标准-绩效工资标准
+			configMessage.setSalaryBase(configMessage.getSalaryWithdrawalStandard().subtract(configMessage.getWorkloadSalaryName()).add(configMessage.getVirtualWorkloadSalary())
+			.subtract(configMessage.getDailyAssessmentCriteriaName()).subtract(configMessage.getDoubleCease()).add(configMessage.getVirtualDoubleCease()).subtract(configMessage.getTermPerformanceSalaryName()));
+			configMessage.setSalaryBaseName(configMessage.getSalaryBase());
+			baseMapper.updateById(configMessage);
 		}
 		if (StringUtils.isNotBlank(errMsg)){
 			return R.success("导入部分成功,未导入成功的有"+errMsg.toString());
@@ -205,6 +214,10 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 				item.setSchoolAge(new BigDecimal(Math.floorDiv(result, 12)));
 				//更新完校龄重新计算标准
 				SchoolTeacher configMessage = this.getConfigMessage(item);
+				//计算工资基数标准 工资基数标准=工资拨付标准-工作量工资标准+虚拟工作量工资标准-日常考核标准-双休日工作量工资标准+虚拟双休日工作量工资标准-绩效工资标准
+				configMessage.setSalaryBase(configMessage.getSalaryWithdrawalStandard().subtract(configMessage.getWorkloadSalaryName()).add(configMessage.getVirtualWorkloadSalary())
+					.subtract(configMessage.getDailyAssessmentCriteriaName()).subtract(configMessage.getDoubleCease()).add(configMessage.getVirtualDoubleCease()).subtract(configMessage.getTermPerformanceSalaryName()));
+				configMessage.setSalaryBaseName(configMessage.getSalaryBase());
 				baseMapper.updateById(configMessage);
 			});
 		}
@@ -212,16 +225,38 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 	}
 
 	@Override
+	@Transactional
 	public R calculate(SchoolTeacher schoolTeacher) {
 		SchoolTeacher teacher = baseMapper.selectById(schoolTeacher.getId());
 		if (teacher == null){
 			throw new RuntimeException("未找到职工信息");
 		}
 		SchoolTeacher configMessage = this.getConfigMessage(teacher);
+		//计算工资基数标准 工资基数标准=工资拨付标准-工作量工资标准+虚拟工作量工资标准-日常考核标准-双休日工作量工资标准+虚拟双休日工作量工资标准-绩效工资标准
+		configMessage.setSalaryBase(configMessage.getSalaryWithdrawalStandard().subtract(configMessage.getWorkloadSalaryName()).add(configMessage.getVirtualWorkloadSalary())
+			.subtract(configMessage.getDailyAssessmentCriteriaName()).subtract(configMessage.getDoubleCease()).add(configMessage.getVirtualDoubleCease()).subtract(configMessage.getTermPerformanceSalaryName()));
+		configMessage.setSalaryBaseName(configMessage.getSalaryBase());
 		baseMapper.updateById(configMessage);
 		return R.data(configMessage);
 	}
 
+	@Override
+	public R calculateList(SchoolTeacherVO schoolTeacher) {
+		schoolTeacher.getIdList().stream().forEach(item ->{
+			SchoolTeacher teacher = baseMapper.selectById(schoolTeacher.getId());
+			if (teacher == null){
+				throw new RuntimeException("未找到职工信息");
+			}
+			SchoolTeacher configMessage = this.getConfigMessage(teacher);
+			//计算工资基数标准 工资基数标准=工资拨付标准-工作量工资标准+虚拟工作量工资标准-日常考核标准-双休日工作量工资标准+虚拟双休日工作量工资标准-绩效工资标准
+			configMessage.setSalaryBase(configMessage.getSalaryWithdrawalStandard().subtract(configMessage.getWorkloadSalaryName()).add(configMessage.getVirtualWorkloadSalary())
+				.subtract(configMessage.getDailyAssessmentCriteriaName()).subtract(configMessage.getDoubleCease()).add(configMessage.getVirtualDoubleCease()).subtract(configMessage.getTermPerformanceSalaryName()));
+			configMessage.setSalaryBaseName(configMessage.getSalaryBase());
+			baseMapper.updateById(configMessage);
+		});
+		return R.data("计算完成");
+	}
+
 	//获取工资标准配置信息
 	public SchoolTeacher getConfigMessage(SchoolTeacher schoolTeacher){
 		//获取工资拨付标准 公办用职称查询 其他用校龄查询
@@ -236,22 +271,27 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 					schoolTeacher.getSalaryWithdrawalStandardName(), "工资拨付标准", null,null);
 				if (configItem != null){
 					schoolTeacher.setSalaryWithdrawalStandard(configItem.getSalary());
+					schoolTeacher.setSalaryWithdrawalStandardName(configItem.getSalary().toString());
 				}
 			}else {
 				schoolTeacher.setSalaryWithdrawalStandard(configMessage.getSalary());
+				schoolTeacher.setSalaryWithdrawalStandardName(configMessage.getSalary().toString());
 			}
 		}else {
 			SchoolConfigItem configMessage = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), schoolTeacher.getSalaryWithdrawalStandardName(), "工资拨付标准", schoolTeacher.getRankType(),null);
 			if (configMessage != null){
 				if (schoolTeacher.getClassType().equals("非文化课")){
 					schoolTeacher.setSalaryWithdrawalStandard(configMessage.getSalary());
+					schoolTeacher.setSalaryWithdrawalStandardName(configMessage.getSalary().toString());
 				}else if (schoolTeacher.getClassType().equals("文化课")){
 					schoolTeacher.setSalaryWithdrawalStandard(configMessage.getSalary().add(new BigDecimal(700)));
+					schoolTeacher.setSalaryWithdrawalStandardName(configMessage.getSalary().add(new BigDecimal(700)).toString());
 				}
 			}
 		}
 		if (schoolTeacher.getSalaryWithdrawalStandard() != null && schoolTeacher.getStaffType().equals("非教师")){
 			schoolTeacher.setSalaryWithdrawalStandard(schoolTeacher.getSalaryWithdrawalStandard().multiply(new BigDecimal(0.8)));
+			schoolTeacher.setSalaryWithdrawalStandardName(schoolTeacher.getSalaryWithdrawalStandard().multiply(new BigDecimal(0.8)).toString());
 		}
 		//获取职级拨付标准 按校龄取值 查询不到不赋值
 		SchoolConfigItem teacherSubsidy = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(),
@@ -259,12 +299,14 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 			schoolTeacher.getSchoolAge().toString(),null);
 		if (teacherSubsidy != null){
 			schoolTeacher.setRankWithdrawalStandardName(teacherSubsidy.getSalary());
+			schoolTeacher.setRankWithdrawalStandard(teacherSubsidy.getSalary());
 		}else {
 			SchoolConfigItem message = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(),
 				schoolTeacher.getInSection(), schoolTeacher.getSalaryWithdrawalStandardName(), "职级拨付标准",
 				null, null);
 			if (message != null){
 				schoolTeacher.setRankWithdrawalStandardName(message.getSalary());
+				schoolTeacher.setRankWithdrawalStandard(message.getSalary());
 			}
 		}
 		//班主任补贴标准
@@ -283,31 +325,37 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 		SchoolConfigItem assessTeachingResearch = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "教研组长补贴标准", null,schoolTeacher.getCompileCategory());
 		if (assessTeachingResearch != null){
 			schoolTeacher.setAssessTeachingResearch(assessTeachingResearch.getSalary());
+			schoolTeacher.setAssessTeachingResearchName(assessTeachingResearch.getSalary());
 		}
 		//教研组长考核补贴标准
 		SchoolConfigItem assessTeachingResearchName = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "教研组长考核补贴标准", null,schoolTeacher.getCompileCategory());
 		if (assessTeachingResearchName != null){
 			schoolTeacher.setAssessTeachingResearchName(assessTeachingResearchName.getSalary());
+			schoolTeacher.setAssessTeachingResearch(assessTeachingResearchName.getSalary());
 		}
 		//备课组长补贴标准
 		SchoolConfigItem assessPrepareLessonsName = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "备课组长补贴标准", null,schoolTeacher.getCompileCategory());
 		if (assessPrepareLessonsName != null){
 			schoolTeacher.setAssessPrepareLessonsName(assessPrepareLessonsName.getSalary());
+			schoolTeacher.setAssessPrepareLessons(assessPrepareLessonsName.getSalary());
 		}
 		//备课组长考核补贴标准
 		SchoolConfigItem assessPrepareLessons = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "备课组长考核补贴标准", null,schoolTeacher.getCompileCategory());
 		if (assessPrepareLessons != null){
 			schoolTeacher.setAssessPrepareLessons(assessPrepareLessons.getSalary());
+			schoolTeacher.setAssessPrepareLessonsName(assessPrepareLessons.getSalary());
 		}
 		//领导干部补贴标准
 		SchoolConfigItem assessLeadingCadreSubsidyName = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "领导干部补贴标准", null,schoolTeacher.getCompileCategory());
 		if (assessLeadingCadreSubsidyName != null){
 			schoolTeacher.setAssessLeadingCadreSubsidyName(assessLeadingCadreSubsidyName.getSalary());
+			schoolTeacher.setAssessLeadingCadreSubsidy(assessLeadingCadreSubsidyName.getSalary());
 		}
 		//领导干部考核补贴标准
 		SchoolConfigItem assessLeadingCadreSubsidy = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "领导干部考核补贴标准", null,schoolTeacher.getCompileCategory());
 		if (assessLeadingCadreSubsidy != null){
 			schoolTeacher.setAssessLeadingCadreSubsidy(assessLeadingCadreSubsidy.getSalary());
+			schoolTeacher.setAssessLeadingCadreSubsidyName(assessLeadingCadreSubsidy.getSalary());
 		}
 		//学历工资
 		SchoolConfigItem code = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "学历标准", schoolTeacher.getCode(), null);
@@ -318,6 +366,7 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 		SchoolConfigItem rankSalaryName = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "职级等级标准", schoolTeacher.getRankSalaryName(), null);
 		if (rankSalaryName != null){
 			schoolTeacher.setRankSalary(rankSalaryName.getSalary());
+			schoolTeacher.setRankSalaryName(rankSalaryName.getSalary().toString());
 		}
 		//增资标准
 		SchoolConfigItem capitalIncreaseName = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "增资标准", schoolTeacher.getSchoolAge().toString(), null);
@@ -331,6 +380,18 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 			schoolTeacher.setCapitalIncreaseName(capitalIncreaseName.getSalary());
 			schoolTeacher.setCapitalIncrease(capitalIncreaseName.getSalary());
 		}
+		//履约奖标准
+		SchoolConfigItem performanceAward = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "履约奖标准", schoolTeacher.getSchoolAge().toString(), null);
+		if (performanceAward == null){
+			SchoolConfigItem performanceAwardName = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "履约奖标准", null, null);
+			if (performanceAwardName != null){
+				schoolTeacher.setPerformanceAward(performanceAwardName.getSalary());
+				schoolTeacher.setPerformanceAwardName(performanceAwardName.getSalary());
+			}
+		}else {
+			schoolTeacher.setPerformanceAward(performanceAward.getSalary());
+			schoolTeacher.setPerformanceAwardName(performanceAward.getSalary());
+		}
 		return schoolTeacher;
 	}