学校修改

blade-service-api/blade-school-api/src/main/java/org/springblade/school/entity/Salary.java

@@ -56,9 +56,9 @@ public class Salary implements Serializable {
 		@ApiModelProperty(value = "月")
 		private String moon;
 	/**
-	* 工作类别(小学部、后勤部)
+	* 工资类别(小学部、初中部、高中部、后勤部)
 	*/
-		@ApiModelProperty(value = "工作类别(小学部、后勤部)")
+		@ApiModelProperty(value = "工资类别(小学部、初中部、高中部、后勤部)")
 		private String salaryType;
 	/**
 	* 备注

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

@@ -203,7 +203,9 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 				DateTime end = new DateTime(new Date().getTime());
 				int result = Months.monthsBetween(start,end).getMonths();
 				item.setSchoolAge(new BigDecimal(Math.floorDiv(result, 12)));
-				baseMapper.updateById(item);
+				//更新完校龄重新计算标准
+				SchoolTeacher configMessage = this.getConfigMessage(item);
+				baseMapper.updateById(configMessage);
 			});
 		}
 		return R.success("操作成功");

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

@@ -840,7 +840,7 @@ public class SalaryItemController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "重新计算工资", notes = "传入salaryItem pid")
 	public R calculate(@Valid @RequestBody SalaryItem salaryItem) {
-		return R.status(salaryItemService.saveOrUpdate(salaryItem));
+		return salaryItemService.calculate(salaryItem);
 	}
 
 }