学校修改

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

@@ -729,5 +729,54 @@ public class SalaryItem implements Serializable {
 	 */
 		@ApiModelProperty(value = "学期绩效标准")
 		private BigDecimal termPerformanceSalaryName;
-
+	/**
+	 * 班主任补贴标准
+	 */
+		@ApiModelProperty(value = "班主任补贴标准")
+		private BigDecimal teacherSubsidy;
+	/**
+	 * 班主任考核补贴标准
+	 */
+		@ApiModelProperty(value = "班主任考核补贴标准")
+		private BigDecimal teacherAssessSubsidy;
+	/**
+	 * 履约奖
+	 */
+		@ApiModelProperty(value = "履约奖标准")
+		private BigDecimal performanceAwardName;
+	/**
+	 * 增资
+	 */
+		@ApiModelProperty(value = "增资标准")
+		private BigDecimal capitalIncreaseName;
+	/**
+	 * 领导干部补贴
+	 */
+		@ApiModelProperty(value = "领导干部补贴标准")
+		private BigDecimal leadingCadreSubsidyName;
+	/**
+	 * 领导干部考核补贴标准
+	 */
+		@ApiModelProperty(value = "领导干部考核补贴标准")
+		private BigDecimal assessLeadingCadreSubsidyName;
+	/**
+	 * 备课组长考核补贴标准
+	 */
+		@ApiModelProperty(value = "备课组长补贴标准")
+		private BigDecimal prepareLessonsName;
+	/**
+	 * 备课组长考核补贴标准
+	 */
+		@ApiModelProperty(value = "备课组长考核补贴标准")
+		private BigDecimal assessPrepareLessonsName;
+	/**
+	 * 教研组长
+	 */
+		@ApiModelProperty(value = "教研组长补贴标准")
+		private BigDecimal teachingResearchName;
+	/**
+	 * 教研组长
+	 */
+		@ApiModelProperty(value = "教研组长考核补贴标准")
+		private BigDecimal assessTeachingResearchName;
 }

blade-service/blade-client/src/main/java/org/springblade/client/parities/controller/ParitiesController.java

@@ -18,6 +18,7 @@ package org.springblade.client.parities.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -156,6 +157,24 @@ public class ParitiesController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入parities")
 	public R submit(@Valid @RequestBody Parities parities) {
+		if (StringUtils.isBlank(parities.getCname())){
+			throw new SecurityException("货币名称不能为空");
+		}
+		if (StringUtils.isBlank(parities.getAnnual())){
+			throw new SecurityException("汇率年度不能为空");
+		}
+		LambdaQueryWrapper<Parities> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(Parities::getCname,parities.getCname());
+		lambdaQueryWrapper.eq(Parities::getAnnual,parities.getAnnual());
+		lambdaQueryWrapper.eq(Parities::getTenantId,SecureUtil.getTenantId());
+		lambdaQueryWrapper.eq(Parities::getIsDeleted,0);
+		Parities serviceOne = paritiesService.getOne(lambdaQueryWrapper);
+		if (parities.getId() ==null && serviceOne !=null){
+			throw new SecurityException("该年度的货币汇率已存在");
+		}
+		if (parities.getId() !=null && serviceOne !=null && parities.getId().longValue() != serviceOne.getId().longValue()){
+			throw new SecurityException("该年度的货币汇率已存在");
+		}
 		return R.data(paritiesService.saveParities(parities));
 	}
 

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

@@ -243,7 +243,7 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 	@Override
 	public R calculateList(SchoolTeacherVO schoolTeacher) {
 		schoolTeacher.getIdList().stream().forEach(item ->{
-			SchoolTeacher teacher = baseMapper.selectById(schoolTeacher.getId());
+			SchoolTeacher teacher = baseMapper.selectById(item);
 			if (teacher == null){
 				throw new RuntimeException("未找到职工信息");
 			}

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

@@ -139,7 +139,7 @@ public class SalaryItemController extends BladeController {
 	 * 删除 通济学校-工资管理明细表
 	 */
 	@PostMapping("/remove")
-	@ApiOperationSupport(order = 8)
+	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(salaryItemService.removeByIds(Func.toLongList(ids)));
@@ -148,7 +148,7 @@ public class SalaryItemController extends BladeController {
 	 * 导入模板-工资管理-小学部-工资表导入模板
 	 */
 	@GetMapping("/export/template")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "导入模板-工资管理-小学部-工资表导入模板")
 	public void exportPrice(HttpServletResponse response) {
 		List<SalaryItemExcel> list = new ArrayList<SalaryItemExcel>();
@@ -159,7 +159,7 @@ public class SalaryItemController extends BladeController {
 	 *
 	 * */
 	@PostMapping("/import")
-	@ApiOperationSupport(order = 12)
+	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导入-工资管理-小学部-工资表导入", notes = "传入excel")
 	public R importSupplierDesc(@RequestParam("file") MultipartFile file,@RequestParam("id") Long id)
 	{
@@ -186,7 +186,7 @@ public class SalaryItemController extends BladeController {
 	 *
 	 * */
 	@GetMapping("/export/teacher")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 10)
 	@ApiOperation(value = "导出-工资管理-小学部-工资表导出")
 	public void exportSupplierTemplate(SalaryItem salaryItem,HttpServletResponse response) {
 		salaryItem.setTenantId(SecureUtil.getTenantId());
@@ -198,7 +198,7 @@ public class SalaryItemController extends BladeController {
 	 * 导入聘用模板
 	 */
 	@GetMapping("/export/employ")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 11)
 	@ApiOperation(value = "导入模板-工资管理-小学部-聘用模板")
 	public void exportEmploy(HttpServletResponse response) {
 		List<EmployExcel> list = new ArrayList<EmployExcel>();
@@ -235,7 +235,7 @@ public class SalaryItemController extends BladeController {
 	 * 导入职级模板
 	 */
 	@GetMapping("/export/position")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 13)
 	@ApiOperation(value = "导入模板-工资管理-小学部-职级模板")
 	public void exportPosition(HttpServletResponse response) {
 		List<PositionExcel> list = new ArrayList<PositionExcel>();
@@ -246,7 +246,7 @@ public class SalaryItemController extends BladeController {
 	 *
 	 * */
 	@PostMapping("/import/position")
-	@ApiOperationSupport(order = 12)
+	@ApiOperationSupport(order = 14)
 	@ApiOperation(value = "导入-工资管理-小学部-职级导入", notes = "传入excel")
 	public R importPosition(@RequestParam("file") MultipartFile file,@RequestParam("id") Long id)
 	{
@@ -272,7 +272,7 @@ public class SalaryItemController extends BladeController {
 	 * 导入学习强国扣费模板
 	 */
 	@GetMapping("/export/power")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 15)
 	@ApiOperation(value = "导入模板-工资管理-小学部-学习强国扣费模板")
 	public void exportPower(HttpServletResponse response) {
 		List<LearningPower> list = new ArrayList<LearningPower>();
@@ -283,7 +283,7 @@ public class SalaryItemController extends BladeController {
 	 *
 	 * */
 	@PostMapping("/import/power")
-	@ApiOperationSupport(order = 12)
+	@ApiOperationSupport(order = 16)
 	@ApiOperation(value = "导入-工资管理-小学部-学习强国扣费导入", notes = "传入excel")
 	public R importPower(@RequestParam("file") MultipartFile file,@RequestParam("id") Long id)
 	{
@@ -309,7 +309,7 @@ public class SalaryItemController extends BladeController {
 	 * 导入微信金额模板
 	 */
 	@GetMapping("/export/weChat")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 17)
 	@ApiOperation(value = "导入模板-工资管理-小学部-微信金额模板")
 	public void exportWeChat(HttpServletResponse response) {
 		List<WeChatExcel> list = new ArrayList<WeChatExcel>();
@@ -320,7 +320,7 @@ public class SalaryItemController extends BladeController {
 	 *
 	 * */
 	@PostMapping("/import/weChat")
-	@ApiOperationSupport(order = 12)
+	@ApiOperationSupport(order = 18)
 	@ApiOperation(value = "导入-工资管理-小学部-微信金额导入", notes = "传入excel")
 	public R importWeChat(@RequestParam("file") MultipartFile file,@RequestParam("id") Long id)
 	{
@@ -346,7 +346,7 @@ public class SalaryItemController extends BladeController {
 	 * 导入班主任补贴模板
 	 */
 	@GetMapping("/export/teacherSubsidy")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 19)
 	@ApiOperation(value = "导入模板-工资管理-小学部-班主任补贴模板")
 	public void exportTeacherSubsidy(HttpServletResponse response) {
 		List<TeacherSubsidy> list = new ArrayList<TeacherSubsidy>();
@@ -357,7 +357,7 @@ public class SalaryItemController extends BladeController {
 	 *
 	 * */
 	@PostMapping("/import/teacherSubsidy")
-	@ApiOperationSupport(order = 12)
+	@ApiOperationSupport(order = 20)
 	@ApiOperation(value = "导入-工资管理-小学部-班主任补贴导入", notes = "传入excel")
 	public R importTeacherSubsidy(@RequestParam("file") MultipartFile file,@RequestParam("id") Long id)
 	{
@@ -383,7 +383,7 @@ public class SalaryItemController extends BladeController {
 	 * 导入周末加班模板
 	 */
 	@GetMapping("/export/overtime")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 21)
 	@ApiOperation(value = "导入模板-工资管理-小学部-周末加班模板")
 	public void exportOvertime(HttpServletResponse response) {
 		List<OvertimeExcel> list = new ArrayList<OvertimeExcel>();
@@ -394,7 +394,7 @@ public class SalaryItemController extends BladeController {
 	 *
 	 * */
 	@PostMapping("/import/overtime")
-	@ApiOperationSupport(order = 12)
+	@ApiOperationSupport(order = 22)
 	@ApiOperation(value = "导入-工资管理-小学部-周末加班导入", notes = "传入excel")
 	public R importOvertime(@RequestParam("file") MultipartFile file,@RequestParam("id") Long id)
 	{
@@ -420,7 +420,7 @@ public class SalaryItemController extends BladeController {
 	 * 导入电话费、罚款模板
 	 */
 	@GetMapping("/export/phoneFine")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 23)
 	@ApiOperation(value = "导入模板-工资管理-小学部-电话费、罚款模板")
 	public void exportPhoneFine(HttpServletResponse response) {
 		List<PhoneFineExcel> list = new ArrayList<PhoneFineExcel>();
@@ -431,7 +431,7 @@ public class SalaryItemController extends BladeController {
 	 *
 	 * */
 	@PostMapping("/import/phoneFine")
-	@ApiOperationSupport(order = 12)
+	@ApiOperationSupport(order = 24)
 	@ApiOperation(value = "导入-工资管理-小学部-电话费、罚款导入", notes = "传入excel")
 	public R importPhoneFine(@RequestParam("file") MultipartFile file,@RequestParam("id") Long id)
 	{
@@ -457,7 +457,7 @@ public class SalaryItemController extends BladeController {
 	 * 导入卫生费模板
 	 */
 	@GetMapping("/export/sanitationFee")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 25)
 	@ApiOperation(value = "导入模板-工资管理-小学部-卫生费模板")
 	public void exportSanitationFee(HttpServletResponse response) {
 		List<SanitationFee> list = new ArrayList<SanitationFee>();
@@ -468,7 +468,7 @@ public class SalaryItemController extends BladeController {
 	 *
 	 * */
 	@PostMapping("/import/sanitationFee")
-	@ApiOperationSupport(order = 12)
+	@ApiOperationSupport(order = 26)
 	@ApiOperation(value = "导入-工资管理-小学部-卫生费导入", notes = "传入excel")
 	public R importSanitationFee(@RequestParam("file") MultipartFile file,@RequestParam("id") Long id)
 	{
@@ -494,7 +494,7 @@ public class SalaryItemController extends BladeController {
 	 * 导入出勤模板
 	 */
 	@GetMapping("/export/attendanceExcel")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 27)
 	@ApiOperation(value = "导入模板-工资管理-小学部-出勤模板")
 	public void exportAttendanceExcel(HttpServletResponse response) {
 		List<AttendanceExcel> list = new ArrayList<AttendanceExcel>();
@@ -505,7 +505,7 @@ public class SalaryItemController extends BladeController {
 	 *
 	 * */
 	@PostMapping("/import/attendanceExcel")
-	@ApiOperationSupport(order = 12)
+	@ApiOperationSupport(order = 28)
 	@ApiOperation(value = "导入-工资管理-小学部-出勤导入", notes = "传入excel")
 	public R importAttendanceExcel(@RequestParam("file") MultipartFile file,@RequestParam("id") Long id)
 	{
@@ -531,7 +531,7 @@ public class SalaryItemController extends BladeController {
 	 * 导入保险个人模板
 	 */
 	@GetMapping("/export/personalInsurance")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 29)
 	@ApiOperation(value = "导入模板-工资管理-小学部-保险个人模板")
 	public void exportPersonalInsurance(HttpServletResponse response) {
 		List<PersonalInsurance> list = new ArrayList<PersonalInsurance>();
@@ -542,7 +542,7 @@ public class SalaryItemController extends BladeController {
 	 *
 	 * */
 	@PostMapping("/import/personalInsurance")
-	@ApiOperationSupport(order = 12)
+	@ApiOperationSupport(order = 30)
 	@ApiOperation(value = "导入-工资管理-小学部-保险个人导入", notes = "传入excel")
 	public R importPersonalInsurance(@RequestParam("file") MultipartFile file,@RequestParam("id") Long id)
 	{
@@ -568,7 +568,7 @@ public class SalaryItemController extends BladeController {
 	 * 导入公积金模板
 	 */
 	@GetMapping("/export/reservedFunds")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 31)
 	@ApiOperation(value = "导入模板-工资管理-小学部-公积金模板")
 	public void exportReservedFunds(HttpServletResponse response) {
 		List<ReservedFunds> list = new ArrayList<ReservedFunds>();
@@ -579,7 +579,7 @@ public class SalaryItemController extends BladeController {
 	 *
 	 * */
 	@PostMapping("/import/reservedFunds")
-	@ApiOperationSupport(order = 12)
+	@ApiOperationSupport(order = 32)
 	@ApiOperation(value = "导入-工资管理-小学部-公积金导入", notes = "传入excel")
 	public R importReservedFunds(@RequestParam("file") MultipartFile file,@RequestParam("id") Long id)
 	{
@@ -605,7 +605,7 @@ public class SalaryItemController extends BladeController {
 	 * 导入个税模板
 	 */
 	@GetMapping("/export/payTaxes")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 33)
 	@ApiOperation(value = "导入模板-工资管理-小学部-个税模板")
 	public void exportPayTaxes(HttpServletResponse response) {
 		List<PayTaxes> list = new ArrayList<PayTaxes>();
@@ -616,7 +616,7 @@ public class SalaryItemController extends BladeController {
 	 *
 	 * */
 	@PostMapping("/import/payTaxes")
-	@ApiOperationSupport(order = 12)
+	@ApiOperationSupport(order = 34)
 	@ApiOperation(value = "导入-工资管理-小学部-个税导入", notes = "传入excel")
 	public R importPayTaxes(@RequestParam("file") MultipartFile file,@RequestParam("id") Long id)
 	{
@@ -642,7 +642,7 @@ public class SalaryItemController extends BladeController {
 	 * 导入新岗岗前培训模板
 	 */
 	@GetMapping("/export/postTrainExcel")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 35)
 	@ApiOperation(value = "导入模板-工资管理-小学部-新岗岗前培训模板")
 	public void exportPostTrainExcel(HttpServletResponse response) {
 		List<PostTrainExcel> list = new ArrayList<PostTrainExcel>();
@@ -653,7 +653,7 @@ public class SalaryItemController extends BladeController {
 	 *
 	 * */
 	@PostMapping("/import/postTrainExcel")
-	@ApiOperationSupport(order = 12)
+	@ApiOperationSupport(order = 36)
 	@ApiOperation(value = "导入-工资管理-小学部-新岗岗前培训导入", notes = "传入excel")
 	public R importPostTrainExcel(@RequestParam("file") MultipartFile file,@RequestParam("id") Long id)
 	{
@@ -679,7 +679,7 @@ public class SalaryItemController extends BladeController {
 	 * 导入奖励模板
 	 */
 	@GetMapping("/export/awardExcel")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 37)
 	@ApiOperation(value = "导入模板-工资管理-小学部-奖励模板")
 	public void exportAwardExcel(HttpServletResponse response) {
 		List<AwardExcel> list = new ArrayList<AwardExcel>();
@@ -690,7 +690,7 @@ public class SalaryItemController extends BladeController {
 	 *
 	 * */
 	@PostMapping("/import/awardExcel")
-	@ApiOperationSupport(order = 12)
+	@ApiOperationSupport(order = 38)
 	@ApiOperation(value = "导入-工资管理-小学部-奖励导入", notes = "传入excel")
 	public R importAwardExcel(@RequestParam("file") MultipartFile file,@RequestParam("id") Long id)
 	{
@@ -716,7 +716,7 @@ public class SalaryItemController extends BladeController {
 	 * 导入假期加班模板
 	 */
 	@GetMapping("/export/vacationExcel")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 39)
 	@ApiOperation(value = "导入模板-工资管理-小学部-假期加班模板")
 	public void exportVacationExcel(HttpServletResponse response) {
 		List<VacationExcel> list = new ArrayList<VacationExcel>();
@@ -727,7 +727,7 @@ public class SalaryItemController extends BladeController {
 	 *
 	 * */
 	@PostMapping("/import/vacationExcel")
-	@ApiOperationSupport(order = 12)
+	@ApiOperationSupport(order = 40)
 	@ApiOperation(value = "导入-工资管理-小学部-假期加班导入", notes = "传入excel")
 	public R importVacationExcel(@RequestParam("file") MultipartFile file,@RequestParam("id") Long id)
 	{
@@ -753,7 +753,7 @@ public class SalaryItemController extends BladeController {
 	 * 导入岗位补贴模板
 	 */
 	@GetMapping("/export/postAllowance")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 41)
 	@ApiOperation(value = "导入模板-工资管理-小学部-岗位补贴模板")
 	public void exportPostAllowance(HttpServletResponse response) {
 		List<PostAllowance> list = new ArrayList<PostAllowance>();
@@ -764,7 +764,7 @@ public class SalaryItemController extends BladeController {
 	 *
 	 * */
 	@PostMapping("/import/postAllowance")
-	@ApiOperationSupport(order = 12)
+	@ApiOperationSupport(order = 42)
 	@ApiOperation(value = "导入-工资管理-小学部-岗位补贴导入", notes = "传入excel")
 	public R importPostAllowance(@RequestParam("file") MultipartFile file,@RequestParam("id") Long id)
 	{
@@ -790,7 +790,7 @@ public class SalaryItemController extends BladeController {
 	 * 导入绩效、教学成绩奖模板
 	 */
 	@GetMapping("/export/performanceExcel")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 43)
 	@ApiOperation(value = "导入模板-工资管理-小学部-绩效、教学成绩奖模板")
 	public void exportPerformanceExcel(HttpServletResponse response) {
 		List<PerformanceExcel> list = new ArrayList<PerformanceExcel>();
@@ -801,7 +801,7 @@ public class SalaryItemController extends BladeController {
 	 *
 	 * */
 	@PostMapping("/import/performanceExcel")
-	@ApiOperationSupport(order = 12)
+	@ApiOperationSupport(order = 44)
 	@ApiOperation(value = "导入-工资管理-小学部-绩效、教学成绩奖导入", notes = "传入excel")
 	public R importPerformanceExcel(@RequestParam("file") MultipartFile file,@RequestParam("id") Long id)
 	{
@@ -827,7 +827,7 @@ public class SalaryItemController extends BladeController {
 	 * 导入工作量模板
 	 */
 	@GetMapping("/export/workloadExcel")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 45)
 	@ApiOperation(value = "导入模板-工资管理-小学部-工作量模板")
 	public void exportWorkloadExcel(HttpServletResponse response) {
 		List<WorkloadExcel> list = new ArrayList<WorkloadExcel>();
@@ -838,7 +838,7 @@ public class SalaryItemController extends BladeController {
 	 *
 	 * */
 	@PostMapping("/import/workloadExcel")
-	@ApiOperationSupport(order = 12)
+	@ApiOperationSupport(order = 46)
 	@ApiOperation(value = "导入-工资管理-小学部-工作量导入", notes = "传入excel")
 	public R importWorkloadExcel(@RequestParam("file") MultipartFile file,@RequestParam("id") Long id)
 	{
@@ -864,7 +864,7 @@ public class SalaryItemController extends BladeController {
 	 * 导入查评模板
 	 */
 	@GetMapping("/export/zhaPingExcel")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 47)
 	@ApiOperation(value = "导入模板-工资管理-小学部-查评模板")
 	public void exportZhaPingExcel(HttpServletResponse response) {
 		List<ZhaPingExcel> list = new ArrayList<ZhaPingExcel>();
@@ -875,7 +875,7 @@ public class SalaryItemController extends BladeController {
 	 *
 	 * */
 	@PostMapping("/import/zhaPingExcel")
-	@ApiOperationSupport(order = 12)
+	@ApiOperationSupport(order = 48)
 	@ApiOperation(value = "导入-工资管理-小学部-查评导入", notes = "传入excel")
 	public R importZhaPingExcel(@RequestParam("file") MultipartFile file,@RequestParam("id") Long id)
 	{
@@ -901,7 +901,7 @@ public class SalaryItemController extends BladeController {
 	 * 导入查保险模板
 	 */
 	@GetMapping("/export/insuranceExcel")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 49)
 	@ApiOperation(value = "导入模板-工资管理-小学部-保险模板")
 	public void exportInsuranceExcel(HttpServletResponse response) {
 		List<InsuranceExcel> list = new ArrayList<InsuranceExcel>();
@@ -912,7 +912,7 @@ public class SalaryItemController extends BladeController {
 	 *
 	 * */
 	@PostMapping("/import/insuranceExcel")
-	@ApiOperationSupport(order = 12)
+	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "导入-工资管理-小学部-保险导入", notes = "传入excel")
 	public R importInsuranceExcel(@RequestParam("file") MultipartFile file,@RequestParam("id") Long id)
 	{
@@ -938,7 +938,7 @@ public class SalaryItemController extends BladeController {
 	 * 导入月底人数模板
 	 */
 	@GetMapping("/export/eomNumberExcel")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 51)
 	@ApiOperation(value = "导入模板-工资管理-小学部-月底人数模板")
 	public void exportEomNumberExcel(HttpServletResponse response) {
 		List<EomNumberExcel> list = new ArrayList<EomNumberExcel>();
@@ -949,7 +949,7 @@ public class SalaryItemController extends BladeController {
 	 *
 	 * */
 	@PostMapping("/import/eomNumberExcel")
-	@ApiOperationSupport(order = 12)
+	@ApiOperationSupport(order = 52)
 	@ApiOperation(value = "导入-工资管理-小学部-月底人数导入", notes = "传入excel")
 	public R importEomNumberExcel(@RequestParam("file") MultipartFile file,@RequestParam("id") Long id)
 	{
@@ -975,7 +975,7 @@ public class SalaryItemController extends BladeController {
 	 * 导入教研组长模板
 	 */
 	@GetMapping("/export/teamLeaderExcel")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 53)
 	@ApiOperation(value = "导入模板-工资管理-小学部-教研组长模板")
 	public void exportTeamLeaderExcel(HttpServletResponse response) {
 		List<TeamLeaderExcel> list = new ArrayList<TeamLeaderExcel>();
@@ -986,7 +986,7 @@ public class SalaryItemController extends BladeController {
 	 *
 	 * */
 	@PostMapping("/import/teamLeaderExcel")
-	@ApiOperationSupport(order = 12)
+	@ApiOperationSupport(order = 54)
 	@ApiOperation(value = "导入-工资管理-小学部-教研组长导入", notes = "传入excel")
 	public R importTeamLeaderExcel(@RequestParam("file") MultipartFile file,@RequestParam("id") Long id)
 	{
@@ -1012,7 +1012,7 @@ public class SalaryItemController extends BladeController {
 	 * 导入备课组长模板
 	 */
 	@GetMapping("/export/prepareLessonsExcel")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 55)
 	@ApiOperation(value = "导入模板-工资管理-小学部-备课组长模板")
 	public void exportPrepareLessonsExcel(HttpServletResponse response) {
 		List<PrepareLessonsExcel> list = new ArrayList<PrepareLessonsExcel>();
@@ -1023,7 +1023,7 @@ public class SalaryItemController extends BladeController {
 	 *
 	 * */
 	@PostMapping("/import/prepareLessonsExcel")
-	@ApiOperationSupport(order = 12)
+	@ApiOperationSupport(order = 56)
 	@ApiOperation(value = "导入-工资管理-小学部-备课组长导入", notes = "传入excel")
 	public R importPrepareLessonsExcel(@RequestParam("file") MultipartFile file,@RequestParam("id") Long id)
 	{
@@ -1049,7 +1049,7 @@ public class SalaryItemController extends BladeController {
 	 * 导入领导干部
 	 */
 	@GetMapping("/export/leadExcel")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 57)
 	@ApiOperation(value = "导入模板-工资管理-小学部-领导干部模板")
 	public void exportLeadExcel(HttpServletResponse response) {
 		List<LeadExcel> list = new ArrayList<LeadExcel>();
@@ -1060,7 +1060,7 @@ public class SalaryItemController extends BladeController {
 	 *
 	 * */
 	@PostMapping("/import/leadExcel")
-	@ApiOperationSupport(order = 12)
+	@ApiOperationSupport(order = 58)
 	@ApiOperation(value = "导入-工资管理-小学部-领导干部导入", notes = "传入excel")
 	public R importLeadExcel(@RequestParam("file") MultipartFile file,@RequestParam("id") Long id)
 	{
@@ -1086,7 +1086,7 @@ public class SalaryItemController extends BladeController {
 	 * 导入下学期绩效
 	 */
 	@GetMapping("/export/teachingExcel")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 59)
 	@ApiOperation(value = "导入模板-工资管理-小学部-下学期绩效模板")
 	public void exportTeachingExcel(HttpServletResponse response) {
 		List<TeachingExcel> list = new ArrayList<TeachingExcel>();
@@ -1097,7 +1097,7 @@ public class SalaryItemController extends BladeController {
 	 *
 	 * */
 	@PostMapping("/import/teachingExcel")
-	@ApiOperationSupport(order = 12)
+	@ApiOperationSupport(order = 60)
 	@ApiOperation(value = "导入-工资管理-小学部-下学期绩效导入", notes = "传入excel")
 	public R importTeachingExcell(@RequestParam("file") MultipartFile file,@RequestParam("id") Long id)
 	{
@@ -1123,7 +1123,7 @@ public class SalaryItemController extends BladeController {
 	 * 重新计算工资
 	 */
 	@PostMapping("/calculate")
-	@ApiOperationSupport(order = 6)
+	@ApiOperationSupport(order = 61)
 	@ApiOperation(value = "重新计算工资", notes = "传入salaryItem pid")
 	public R calculate(@Valid @RequestBody SalaryItem salaryItem) {
 		return salaryItemService.calculate(salaryItem);
@@ -1133,7 +1133,7 @@ public class SalaryItemController extends BladeController {
 	 *
 	 * */
 	@GetMapping("/export/exception")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 62)
 	@ApiOperation(value = "导出-工资管理-小学部-异常工资表导出")
 	public void exportException(SalaryItem salaryItem,HttpServletResponse response) {
 		List<SalaryException> list = new ArrayList<>();
@@ -1143,5 +1143,17 @@ public class SalaryItemController extends BladeController {
 		}
 		ExcelUtil.export(response, "工资表", "工资表", list, SalaryException.class);
 	}
+	/**
+	 * 详情
+	 */
+	@GetMapping("/criterion")
+	@ApiOperationSupport(order = 63)
+	@ApiOperation(value = "重新导入工资标准", notes = "传入salaryItem 的 pid")
+	public R<SalaryItem> criterion(SalaryItem salaryItem) {
+		if (salaryItem.getPid() == null){
+			throw new SecurityException("请选择要重新导入的数据");
+		}
+		return salaryItemService.criterion(salaryItem);
+	}
 
 }

blade-service/blade-school/src/main/java/org/springblade/school/service/ISalaryItemService.java

@@ -254,6 +254,13 @@ public interface ISalaryItemService extends IService<SalaryItem> {
 	 */
 	List<WageExcel> exportSupplierTemplate(SalaryItem salaryItem);
 
+	/**
+	 * 重新导入工资标准
+	 * @param salaryItem
+	 * @return
+	 */
+	R criterion(SalaryItem salaryItem);
+
 
 
 }

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

@@ -168,17 +168,28 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			salaryItem.setEducationSalary(teacherMessage.getEducationSalary());//学历工资
 			salaryItem.setSalaryBase(teacherMessage.getSalaryBase());//工资基数
 			salaryItem.setSalaryBaseName(teacherMessage.getSalaryBaseName());//工资基数标准
-			//salaryItem.setWorkloadSalary(teacherMessage.getWorkloadSalary());//工作量工资
+			salaryItem.setWorkloadSalaryCritertion(teacherMessage.getWorkloadSalaryName());//工作量工资标准
 			salaryItem.setVirtualWorkloadSalary(teacherMessage.getVirtualWorkloadSalary());//虚拟工作量工资标准
 			salaryItem.setDoubleCease(teacherMessage.getDoubleCease());//双休日工作量工资标准
+			salaryItem.setVirtualDoubleCease(teacherMessage.getVirtualDoubleCease());//虚拟双休日工作量工资标准
 			salaryItem.setVirtualDailyAssessmentCriteria(teacherMessage.getVirtualDailyAssessmentCriteria());//虚拟日常考核标准
-			salaryItem.setDailyAssessmentCriteria(teacherMessage.getDailyAssessmentCriteria());//日常考核标准
+			salaryItem.setDailyAssessmentCriteria(teacherMessage.getDailyAssessmentCriteriaName());//日常考核标准
 			salaryItem.setDailyAssessmentSalary(teacherMessage.getDailyAssessmentSalary());//日常考核工资
 			salaryItem.setTermPerformanceSalary(teacherMessage.getTermPerformanceSalary());//学期绩效工资
 			salaryItem.setLeadingCadreSubsidy(teacherMessage.getLeadingCadreSubsidy());//领导干部补贴
 			salaryItem.setPrepareLessons(teacherMessage.getPrepareLessons());//备课组长
 			salaryItem.setTeachingResearch(teacherMessage.getTeachingResearch());//教研组长
 			salaryItem.setClassTeacherFee(teacherMessage.getTeacherSubsidy());//班主任费
+			salaryItem.setTeacherSubsidy(teacherMessage.getTeacherSubsidy());//班主任补贴标准
+			salaryItem.setTeacherAssessSubsidy(teacherMessage.getTeacherAssessSubsidy());//班主任考核补贴标准
+			salaryItem.setPerformanceAwardName(teacherMessage.getPerformanceAwardName());//履约奖标准
+			salaryItem.setCapitalIncreaseName(teacherMessage.getCapitalIncreaseName());//增资标准
+			salaryItem.setLeadingCadreSubsidyName(teacherMessage.getLeadingCadreSubsidyName());//领导干部补贴标准
+			salaryItem.setAssessLeadingCadreSubsidyName(teacherMessage.getAssessLeadingCadreSubsidyName());//领导干部考核补贴标准
+			salaryItem.setPrepareLessonsName(teacherMessage.getPrepareLessonsName());//备课组长补贴标准
+			salaryItem.setAssessPrepareLessonsName(teacherMessage.getAssessPrepareLessonsName());//备课组长考核补贴标准
+			salaryItem.setTeachingResearchName(teacherMessage.getTeachingResearchName());//教研组长补贴标准
+			salaryItem.setAssessTeachingResearchName(teacherMessage.getAssessTeachingResearchName());//教研组长考核补贴标准
 			salaryItem.setWorkloadSalaryCritertion(teacherMessage.getWorkloadSalaryName());
 		}else {
 			salaryItem = null;
@@ -1430,6 +1441,31 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 	}
 
 	/**
+	 * 重新导入工资标准
+	 * @param salaryItem
+	 * @return
+	 */
+	@Override
+	@Transactional
+	public R criterion(SalaryItem salaryItem) {
+		LambdaQueryWrapper<SalaryItem> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(SalaryItem::getPid, salaryItem.getPid());
+		lambdaQueryWrapper.eq(SalaryItem::getTenantId, SecureUtil.getTenantId());
+		lambdaQueryWrapper.eq(SalaryItem::getIsDeleted, 0);
+		List<SalaryItem> list = baseMapper.selectList(lambdaQueryWrapper);
+		if (CollectionUtils.isNotEmpty(list)){
+			list.stream().forEach(item ->{
+				SalaryItem clientMessage = this.getClientMessage(item);
+				if (clientMessage!= null){
+					baseMapper.updateById(clientMessage);
+					this.countSalary(clientMessage);
+				}
+			});
+		}
+		return R.success("导入完成");
+	}
+
+	/**
 	 *工资计算
 	 *
 	 * @param salaryItem