学校基础资料添加重新计算功能

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

@@ -245,6 +245,14 @@ public class SchoolTeacherController extends BladeController {
 	@GetMapping("/updateTeacherMessage")
 	R updateTeacherMessage(){
 		return schoolTeacherService.updateTeacherMessage();
+	}	/**
+	 * 重新计算工资
+	 */
+	@PostMapping("/calculate")
+	@ApiOperationSupport(order = 11)
+	@ApiOperation(value = "重新计算工资", notes = "传入salaryItem pid")
+	public R calculate(@Valid @RequestBody SchoolTeacher schoolTeacher) {
+		return schoolTeacherService.calculate(schoolTeacher);
 	}
 
 

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

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

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

@@ -210,6 +210,18 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 		}
 		return R.success("操作成功");
 	}
+
+	@Override
+	public R calculate(SchoolTeacher schoolTeacher) {
+		SchoolTeacher teacher = baseMapper.selectById(schoolTeacher.getId());
+		if (teacher == null){
+			throw new RuntimeException("未找到职工信息");
+		}
+		SchoolTeacher configMessage = this.getConfigMessage(teacher);
+		baseMapper.updateById(configMessage);
+		return R.data(configMessage);
+	}
+
 	//获取工资标准配置信息
 	public SchoolTeacher getConfigMessage(SchoolTeacher schoolTeacher){
 		//获取工资拨付标准 公办用职称查询 其他用校龄查询