学校修改

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

@@ -66,6 +66,11 @@ public class SchoolConfig implements Serializable {
 		@ApiModelProperty(value = "职务")
 		private String compileCategory;
 	/**
+	 * 授课类别
+	 */
+		@ApiModelProperty(value = "授课类别(字典表 文化课 非文化课)")
+		private String classType;
+	/**
 	 * 备注
 	 */
 		@ApiModelProperty(value = "备注")

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

@@ -576,6 +576,16 @@ public class SchoolTeacher implements Serializable {
 	 */
 	@ApiModelProperty(value = "虚拟双休日工作量工资标准")
 	private BigDecimal virtualDoubleCease;
+	/**
+	 * 日常考核等级
+	 */
+	@ApiModelProperty(value = "日常考核等级")
+	private String dailyGrade;
+	/**
+	 * 学期绩效等级
+	 */
+	@ApiModelProperty(value = "学期绩效等级")
+	private String performanceGrade;
 
 
 

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

@@ -296,6 +296,16 @@ public class SchoolTeacherExcel implements Serializable {
 	@ExcelProperty(value = "授课类别(文化课/非文化课)")
 	private String classType;
 	/**
+	 * 日常考核等级
+	 */
+	@ExcelProperty(value = "日常考核等级")
+	private String dailyGrade;
+	/**
+	 * 学期绩效等级
+	 */
+	@ExcelProperty(value = "学期绩效等级")
+	private String performanceGrade;
+	/**
 	 * 备注
 	 */
 	@ExcelProperty(value = "备注")

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

@@ -55,6 +55,7 @@ public interface SchoolConfigItemMapper extends BaseMapper<SchoolConfigItem> {
 									  @Param("salaryWithdrawalStandardName") String salaryWithdrawalStandardName,
 									  @Param("normType") String normType,
 									  @Param("parameter") String parameter,
-									  @Param("compileCategory") String compileCategory);
+									  @Param("compileCategory") String compileCategory,
+									  @Param("classType") String classType);
 
 }

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

@@ -53,6 +53,12 @@
         <if test="compileCategory==null or compileCategory == ''">
             AND cf.compile_category = ''
         </if>
+        <if test="classType!=null and classType != ''">
+            AND cf.class_type = #{classType}
+        </if>
+        <if test="classType==null and classType == ''">
+            AND cf.class_type = ''
+        </if>
 	    ORDER BY ci.salary DESC LIMIT 1
     </select>
 

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

@@ -67,6 +67,8 @@ public class SchoolConfigServiceImpl extends ServiceImpl<SchoolConfigMapper, Sch
 		lambdaQueryWrapper.isNull(Func.isNull(schoolConfig.getNormType()),SchoolConfig::getNormType);
 		lambdaQueryWrapper.eq(Func.isNotEmpty(schoolConfig.getCompileCategory()),SchoolConfig::getCompileCategory,schoolConfig.getCompileCategory());
 		lambdaQueryWrapper.isNull(Func.isNull(schoolConfig.getCompileCategory()),SchoolConfig::getCompileCategory);
+		lambdaQueryWrapper.eq(Func.isNotEmpty(schoolConfig.getClassType()),SchoolConfig::getClassType,schoolConfig.getClassType());
+		lambdaQueryWrapper.isNull(Func.isNull(schoolConfig.getClassType()),SchoolConfig::getClassType);
 		SchoolConfig config = baseMapper.selectOne(lambdaQueryWrapper);
 		if (config != null && schoolConfig.getId() == null){
 			throw new RuntimeException("标准已存在,请勿重复创建");

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

@@ -110,6 +110,8 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 			.add(configMessage.getVirtualWorkloadSalary()).subtract(configMessage.getDoubleCease()).subtract(configMessage.getDailyAssessmentCriteriaName())
 			.add(configMessage.getVirtualDoubleCease()).add(configMessage.getVirtualDailyAssessmentCriteria()).subtract(configMessage.getTermPerformanceSalaryName()));
 		configMessage.setSalaryBaseName(configMessage.getSalaryBase());
+		//日常考核工资
+		configMessage.setDailyAssessmentCriteria(configMessage.getDailyAssessmentCriteriaName().subtract(configMessage.getVirtualDailyAssessmentCriteria()));
 		baseMapper.updateById(configMessage);
 		if (CollectionUtils.isNotEmpty(configMessage.getCauseList())){
 			configMessage.getCauseList().stream().forEach(item ->{
@@ -192,6 +194,8 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 				.add(configMessage.getVirtualWorkloadSalary()).subtract(configMessage.getDoubleCease()).subtract(configMessage.getDailyAssessmentCriteriaName())
 				.add(configMessage.getVirtualDoubleCease()).add(configMessage.getVirtualDailyAssessmentCriteria()).subtract(configMessage.getTermPerformanceSalaryName()));
 			configMessage.setSalaryBaseName(configMessage.getSalaryBase());
+			//日常考核工资
+			configMessage.setDailyAssessmentCriteria(configMessage.getDailyAssessmentCriteriaName().subtract(configMessage.getVirtualDailyAssessmentCriteria()));
 			baseMapper.updateById(configMessage);
 		}
 		if (StringUtils.isNotBlank(errMsg)){
@@ -221,6 +225,8 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 					.add(configMessage.getVirtualWorkloadSalary()).subtract(configMessage.getDoubleCease()).subtract(configMessage.getDailyAssessmentCriteriaName())
 					.add(configMessage.getVirtualDoubleCease()).add(configMessage.getVirtualDailyAssessmentCriteria()).subtract(configMessage.getTermPerformanceSalaryName()));
 				configMessage.setSalaryBaseName(configMessage.getSalaryBase());
+				//日常考核工资
+				configMessage.setDailyAssessmentCriteria(configMessage.getDailyAssessmentCriteriaName().subtract(configMessage.getVirtualDailyAssessmentCriteria()));
 				baseMapper.updateById(configMessage);
 			});
 		}
@@ -240,6 +246,8 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 		.add(configMessage.getVirtualWorkloadSalary()).subtract(configMessage.getDoubleCease()).subtract(configMessage.getDailyAssessmentCriteriaName())
 		.add(configMessage.getVirtualDoubleCease()).add(configMessage.getVirtualDailyAssessmentCriteria()).subtract(configMessage.getTermPerformanceSalaryName()));
 		configMessage.setSalaryBaseName(configMessage.getSalaryBase());
+		//日常考核工资
+		configMessage.setDailyAssessmentCriteria(configMessage.getDailyAssessmentCriteriaName().subtract(configMessage.getVirtualDailyAssessmentCriteria()));
 		baseMapper.updateById(configMessage);
 		return R.data(configMessage);
 	}
@@ -257,6 +265,8 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 				.add(configMessage.getVirtualWorkloadSalary()).subtract(configMessage.getDoubleCease()).subtract(configMessage.getDailyAssessmentCriteriaName())
 				.add(configMessage.getVirtualDoubleCease()).add(configMessage.getVirtualDailyAssessmentCriteria()).subtract(configMessage.getTermPerformanceSalaryName()));
 			configMessage.setSalaryBaseName(configMessage.getSalaryBase());
+			//日常考核工资
+			configMessage.setDailyAssessmentCriteria(configMessage.getDailyAssessmentCriteriaName().subtract(configMessage.getVirtualDailyAssessmentCriteria()));
 			baseMapper.updateById(configMessage);
 		});
 		return R.data("计算完成");
@@ -265,53 +275,94 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 	//获取工资标准配置信息
 	public SchoolTeacher getConfigMessage(SchoolTeacher schoolTeacher){
 		//获取工资拨付标准 公办用职称查询 其他用校龄查询
-		if (!schoolTeacher.getSalaryWithdrawalStandardName().contains("公办")){
-			//非公办教师查询按校龄查询 查询不到按最大的校龄取值
-			SchoolConfigItem configMessage = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(),
-				schoolTeacher.getInSection(), schoolTeacher.getSalaryWithdrawalStandardName(),
-				"工资拨付标准", schoolTeacher.getSchoolAge().toString(),null);
-			if (configMessage == null){
-				SchoolConfigItem configItem = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(),
-					schoolTeacher.getInSection(),
-					schoolTeacher.getSalaryWithdrawalStandardName(), "工资拨付标准", null,null);
-				if (configItem != null){
-					schoolTeacher.setSalaryWithdrawalStandard(configItem.getSalary());
-					schoolTeacher.setWorkloadSalaryName(configItem.getWorkloadSalaryName());//工作量工资标准
-					schoolTeacher.setVirtualWorkloadSalary(configItem.getVirtualWorkloadSalary());//虚拟工作量工资标准
-					schoolTeacher.setDoubleCease(configItem.getDoubleCease());//双休日工作量工资标准
-					schoolTeacher.setDailyAssessmentCriteriaName(configItem.getDailyAssessmentCriteriaName());//日常考核工资标准
-					schoolTeacher.setVirtualDoubleCease(configItem.getVirtualDoubleCease());//虚拟双休日工作量工资标准
-					schoolTeacher.setVirtualDailyAssessmentCriteria(configItem.getVirtualDailyAssessmentCriteria());//虚拟日常考核工资标准
-					schoolTeacher.setTermPerformanceSalaryName(configItem.getTermPerformanceSalaryName());//学期绩效工资标准
+		if (!schoolTeacher.getInSection().equals("高中部")){
+			if (!schoolTeacher.getSalaryWithdrawalStandardName().contains("公办")){
+				//非公办教师查询按校龄查询 查询不到按最大的校龄取值
+				SchoolConfigItem configMessage = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(),
+					schoolTeacher.getInSection(), schoolTeacher.getSalaryWithdrawalStandardName(),
+					"工资拨付标准", schoolTeacher.getSchoolAge().toString(),null,null);
+				if (configMessage == null){
+					SchoolConfigItem configItem = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(),
+						schoolTeacher.getInSection(),
+						schoolTeacher.getSalaryWithdrawalStandardName(), "工资拨付标准", null,null,null);
+					if (configItem != null){
+						schoolTeacher.setSalaryWithdrawalStandard(configItem.getSalary());
+						schoolTeacher.setWorkloadSalaryName(configItem.getWorkloadSalaryName());//工作量工资标准
+						schoolTeacher.setVirtualWorkloadSalary(configItem.getVirtualWorkloadSalary());//虚拟工作量工资标准
+						schoolTeacher.setDoubleCease(configItem.getDoubleCease());//双休日工作量工资标准
+						schoolTeacher.setDailyAssessmentCriteriaName(configItem.getDailyAssessmentCriteriaName());//日常考核工资标准
+						schoolTeacher.setVirtualDoubleCease(configItem.getVirtualDoubleCease());//虚拟双休日工作量工资标准
+						schoolTeacher.setVirtualDailyAssessmentCriteria(configItem.getVirtualDailyAssessmentCriteria());//虚拟日常考核工资标准
+						schoolTeacher.setTermPerformanceSalaryName(configItem.getTermPerformanceSalaryName());//学期绩效工资标准
+					}
+				}else {
+					schoolTeacher.setSalaryWithdrawalStandard(configMessage.getSalary());
+					schoolTeacher.setWorkloadSalaryName(configMessage.getWorkloadSalaryName());//工作量工资标准
+					schoolTeacher.setVirtualWorkloadSalary(configMessage.getVirtualWorkloadSalary());//虚拟工作量工资标准
+					schoolTeacher.setDoubleCease(configMessage.getDoubleCease());//双休日工作量工资标准
+					schoolTeacher.setDailyAssessmentCriteriaName(configMessage.getDailyAssessmentCriteriaName());//日常考核工资标准
+					schoolTeacher.setVirtualDoubleCease(configMessage.getVirtualDoubleCease());//虚拟双休日工作量工资标准
+					schoolTeacher.setVirtualDailyAssessmentCriteria(configMessage.getVirtualDailyAssessmentCriteria());//虚拟日常考核工资标准
+					schoolTeacher.setTermPerformanceSalaryName(configMessage.getTermPerformanceSalaryName());//学期绩效工资标准
 				}
 			}else {
-				schoolTeacher.setSalaryWithdrawalStandard(configMessage.getSalary());
-				schoolTeacher.setWorkloadSalaryName(configMessage.getWorkloadSalaryName());//工作量工资标准
-				schoolTeacher.setVirtualWorkloadSalary(configMessage.getVirtualWorkloadSalary());//虚拟工作量工资标准
-				schoolTeacher.setDoubleCease(configMessage.getDoubleCease());//双休日工作量工资标准
-				schoolTeacher.setDailyAssessmentCriteriaName(configMessage.getDailyAssessmentCriteriaName());//日常考核工资标准
-				schoolTeacher.setVirtualDoubleCease(configMessage.getVirtualDoubleCease());//虚拟双休日工作量工资标准
-				schoolTeacher.setVirtualDailyAssessmentCriteria(configMessage.getVirtualDailyAssessmentCriteria());//虚拟日常考核工资标准
-				schoolTeacher.setTermPerformanceSalaryName(configMessage.getTermPerformanceSalaryName());//学期绩效工资标准
-			}
-			if (schoolTeacher.getInSection().equals("高中部") && schoolTeacher.getClassType().equals("文化课")){
-				schoolTeacher.setSalaryWithdrawalStandard(schoolTeacher.getSalaryWithdrawalStandard().add(new BigDecimal(700)));
+				SchoolConfigItem configMessage = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(),
+					schoolTeacher.getInSection(), schoolTeacher.getSalaryWithdrawalStandardName(),
+					"工资拨付标准", schoolTeacher.getRankType(),null,null);
+				if (configMessage != null){
+					schoolTeacher.setSalaryWithdrawalStandard(configMessage.getSalary());
+					schoolTeacher.setWorkloadSalaryName(configMessage.getWorkloadSalaryName());//工作量工资标准
+					schoolTeacher.setVirtualWorkloadSalary(configMessage.getVirtualWorkloadSalary());//虚拟工作量工资标准
+					schoolTeacher.setDoubleCease(configMessage.getDoubleCease());//双休日工作量工资标准
+					schoolTeacher.setDailyAssessmentCriteriaName(configMessage.getDailyAssessmentCriteriaName());//日常考核工资标准
+					schoolTeacher.setVirtualDoubleCease(configMessage.getVirtualDoubleCease());//虚拟双休日工作量工资标准
+					schoolTeacher.setVirtualDailyAssessmentCriteria(configMessage.getVirtualDailyAssessmentCriteria());//虚拟日常考核工资标准
+					schoolTeacher.setTermPerformanceSalaryName(configMessage.getTermPerformanceSalaryName());//学期绩效工资标准
+				}
 			}
 		}else {
-			SchoolConfigItem configMessage = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(),
-				schoolTeacher.getInSection(), schoolTeacher.getSalaryWithdrawalStandardName(),
-				"工资拨付标准", schoolTeacher.getRankType(),null);
-			if (configMessage != null){
-				schoolTeacher.setSalaryWithdrawalStandard(configMessage.getSalary());
-				schoolTeacher.setWorkloadSalaryName(configMessage.getWorkloadSalaryName());//工作量工资标准
-				schoolTeacher.setVirtualWorkloadSalary(configMessage.getVirtualWorkloadSalary());//虚拟工作量工资标准
-				schoolTeacher.setDoubleCease(configMessage.getDoubleCease());//双休日工作量工资标准
-				schoolTeacher.setDailyAssessmentCriteriaName(configMessage.getDailyAssessmentCriteriaName());//日常考核工资标准
-				schoolTeacher.setVirtualDoubleCease(configMessage.getVirtualDoubleCease());//虚拟双休日工作量工资标准
-				schoolTeacher.setVirtualDailyAssessmentCriteria(configMessage.getVirtualDailyAssessmentCriteria());//虚拟日常考核工资标准
-				schoolTeacher.setTermPerformanceSalaryName(configMessage.getTermPerformanceSalaryName());//学期绩效工资标准
-				if (schoolTeacher.getInSection().equals("高中部") && schoolTeacher.getClassType().equals("文化课")){
-					schoolTeacher.setSalaryWithdrawalStandard(schoolTeacher.getSalaryWithdrawalStandard().add(new BigDecimal(700)));
+			if (!schoolTeacher.getSalaryWithdrawalStandardName().contains("公办")){
+				//非公办教师查询按校龄查询 查询不到按最大的校龄取值
+				SchoolConfigItem configMessage = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(),
+					schoolTeacher.getInSection(), schoolTeacher.getSalaryWithdrawalStandardName(),
+					"工资拨付标准", schoolTeacher.getSchoolAge().toString(),null,schoolTeacher.getClassType());
+				if (configMessage == null){
+					SchoolConfigItem configItem = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(),
+						schoolTeacher.getInSection(),
+						schoolTeacher.getSalaryWithdrawalStandardName(), "工资拨付标准", null,null,schoolTeacher.getClassType());
+					if (configItem != null){
+						schoolTeacher.setSalaryWithdrawalStandard(configItem.getSalary());
+						schoolTeacher.setWorkloadSalaryName(configItem.getWorkloadSalaryName());//工作量工资标准
+						schoolTeacher.setVirtualWorkloadSalary(configItem.getVirtualWorkloadSalary());//虚拟工作量工资标准
+						schoolTeacher.setDoubleCease(configItem.getDoubleCease());//双休日工作量工资标准
+						schoolTeacher.setDailyAssessmentCriteriaName(configItem.getDailyAssessmentCriteriaName());//日常考核工资标准
+						schoolTeacher.setVirtualDoubleCease(configItem.getVirtualDoubleCease());//虚拟双休日工作量工资标准
+						schoolTeacher.setVirtualDailyAssessmentCriteria(configItem.getVirtualDailyAssessmentCriteria());//虚拟日常考核工资标准
+						schoolTeacher.setTermPerformanceSalaryName(configItem.getTermPerformanceSalaryName());//学期绩效工资标准
+					}
+				}else {
+					schoolTeacher.setSalaryWithdrawalStandard(configMessage.getSalary());
+					schoolTeacher.setWorkloadSalaryName(configMessage.getWorkloadSalaryName());//工作量工资标准
+					schoolTeacher.setVirtualWorkloadSalary(configMessage.getVirtualWorkloadSalary());//虚拟工作量工资标准
+					schoolTeacher.setDoubleCease(configMessage.getDoubleCease());//双休日工作量工资标准
+					schoolTeacher.setDailyAssessmentCriteriaName(configMessage.getDailyAssessmentCriteriaName());//日常考核工资标准
+					schoolTeacher.setVirtualDoubleCease(configMessage.getVirtualDoubleCease());//虚拟双休日工作量工资标准
+					schoolTeacher.setVirtualDailyAssessmentCriteria(configMessage.getVirtualDailyAssessmentCriteria());//虚拟日常考核工资标准
+					schoolTeacher.setTermPerformanceSalaryName(configMessage.getTermPerformanceSalaryName());//学期绩效工资标准
+				}
+			}else {
+				SchoolConfigItem configMessage = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(),
+					schoolTeacher.getInSection(), schoolTeacher.getSalaryWithdrawalStandardName(),
+					"工资拨付标准", schoolTeacher.getRankType(),null,schoolTeacher.getClassType());
+				if (configMessage != null){
+					schoolTeacher.setSalaryWithdrawalStandard(configMessage.getSalary());
+					schoolTeacher.setWorkloadSalaryName(configMessage.getWorkloadSalaryName());//工作量工资标准
+					schoolTeacher.setVirtualWorkloadSalary(configMessage.getVirtualWorkloadSalary());//虚拟工作量工资标准
+					schoolTeacher.setDoubleCease(configMessage.getDoubleCease());//双休日工作量工资标准
+					schoolTeacher.setDailyAssessmentCriteriaName(configMessage.getDailyAssessmentCriteriaName());//日常考核工资标准
+					schoolTeacher.setVirtualDoubleCease(configMessage.getVirtualDoubleCease());//虚拟双休日工作量工资标准
+					schoolTeacher.setVirtualDailyAssessmentCriteria(configMessage.getVirtualDailyAssessmentCriteria());//虚拟日常考核工资标准
+					schoolTeacher.setTermPerformanceSalaryName(configMessage.getTermPerformanceSalaryName());//学期绩效工资标准
 				}
 			}
 		}
@@ -321,14 +372,14 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 		//获取职级拨付标准 按校龄取值 查询不到不赋值
 		SchoolConfigItem teacherSubsidy = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(),
 			schoolTeacher.getInSection(), schoolTeacher.getSalaryWithdrawalStandardName(), "职级拨付标准",
-			schoolTeacher.getSchoolAge().toString(),null);
+			schoolTeacher.getSchoolAge().toString(),null,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);
+				null, null,null);
 			if (message != null){
 				schoolTeacher.setRankWithdrawalStandardName(message.getSalary());
 				schoolTeacher.setRankWithdrawalStandard(message.getSalary());
@@ -337,59 +388,59 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 		//班主任补贴标准
 		SchoolConfigItem message = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(),
 			schoolTeacher.getInSection(), null, "班主任补贴标准", schoolTeacher.getDepartment()+schoolTeacher.getDoubleTeachers(),
-			schoolTeacher.getCompileCategory());
+			schoolTeacher.getCompileCategory(),null);
 		if (message != null){
 			schoolTeacher.setTeacherSubsidy(message.getSalary());
 		}
 		//班主任考核补贴标准
-		SchoolConfigItem teacherAssessSubsidy = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "班主任考核补贴标准", schoolTeacher.getDepartment()+schoolTeacher.getDoubleTeachers(),schoolTeacher.getCompileCategory());
+		SchoolConfigItem teacherAssessSubsidy = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "班主任考核补贴标准", schoolTeacher.getDepartment()+schoolTeacher.getDoubleTeachers(),schoolTeacher.getCompileCategory(),null);
 		if (teacherAssessSubsidy != null){
 			schoolTeacher.setTeacherAssessSubsidy(teacherAssessSubsidy.getSalary());
 		}
 		//教研组长补贴标准
-		SchoolConfigItem assessTeachingResearch = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "教研组长补贴标准", null,schoolTeacher.getCompileCategory());
+		SchoolConfigItem assessTeachingResearch = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "教研组长补贴标准", null,schoolTeacher.getCompileCategory(),null);
 		if (assessTeachingResearch != null){
 			schoolTeacher.setAssessTeachingResearch(assessTeachingResearch.getSalary());
 		}
 		//教研组长考核补贴标准
-		SchoolConfigItem assessTeachingResearchName = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "教研组长考核补贴标准", null,schoolTeacher.getCompileCategory());
+		SchoolConfigItem assessTeachingResearchName = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "教研组长考核补贴标准", null,schoolTeacher.getCompileCategory(),null);
 		if (assessTeachingResearchName != null){
 			schoolTeacher.setAssessTeachingResearchName(assessTeachingResearchName.getSalary());
 		}
 		//备课组长补贴标准
-		SchoolConfigItem assessPrepareLessonsName = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "备课组长补贴标准", null,schoolTeacher.getCompileCategory());
+		SchoolConfigItem assessPrepareLessonsName = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "备课组长补贴标准", null,schoolTeacher.getCompileCategory(),null);
 		if (assessPrepareLessonsName != null){
 			schoolTeacher.setAssessPrepareLessonsName(assessPrepareLessonsName.getSalary());
 		}
 		//备课组长考核补贴标准
-		SchoolConfigItem assessPrepareLessons = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "备课组长考核补贴标准", null,schoolTeacher.getCompileCategory());
+		SchoolConfigItem assessPrepareLessons = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "备课组长考核补贴标准", null,schoolTeacher.getCompileCategory(),null);
 		if (assessPrepareLessons != null){
 			schoolTeacher.setAssessPrepareLessons(assessPrepareLessons.getSalary());
 		}
 		//领导干部补贴标准
-		SchoolConfigItem assessLeadingCadreSubsidyName = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "领导干部补贴标准", null,schoolTeacher.getCompileCategory());
+		SchoolConfigItem assessLeadingCadreSubsidyName = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "领导干部补贴标准", null,schoolTeacher.getCompileCategory(),null);
 		if (assessLeadingCadreSubsidyName != null){
 			schoolTeacher.setAssessLeadingCadreSubsidyName(assessLeadingCadreSubsidyName.getSalary());
 		}
 		//领导干部考核补贴标准
-		SchoolConfigItem assessLeadingCadreSubsidy = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "领导干部考核补贴标准", null,schoolTeacher.getCompileCategory());
+		SchoolConfigItem assessLeadingCadreSubsidy = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "领导干部考核补贴标准", null,schoolTeacher.getCompileCategory(),null);
 		if (assessLeadingCadreSubsidy != null){
 			schoolTeacher.setAssessLeadingCadreSubsidy(assessLeadingCadreSubsidy.getSalary());
 		}
 		//学历工资
-		SchoolConfigItem code = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "学历标准", schoolTeacher.getCode(), null);
+		SchoolConfigItem code = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "学历标准", schoolTeacher.getCode(), null,null);
 		if (code != null){
 			schoolTeacher.setEducationSalary(code.getSalary());
 		}
 		//职级等级工资
-		SchoolConfigItem rankSalaryName = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "职级等级标准", schoolTeacher.getRankSalaryName(), null);
+		SchoolConfigItem rankSalaryName = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "职级等级标准", schoolTeacher.getRankSalaryName(), null,null);
 		if (rankSalaryName != null){
 			schoolTeacher.setRankSalary(rankSalaryName.getSalary());
 		}
 		//增资标准
-		SchoolConfigItem capitalIncreaseName = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "增资标准", schoolTeacher.getSchoolAge().toString(), null);
+		SchoolConfigItem capitalIncreaseName = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "增资标准", schoolTeacher.getSchoolAge().toString(), null,null);
 		if (capitalIncreaseName == null){
-			SchoolConfigItem capitalIncrease = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "增资标准", null, null);
+			SchoolConfigItem capitalIncrease = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "增资标准", null, null,null);
 			if (capitalIncrease != null){
 				schoolTeacher.setCapitalIncreaseName(capitalIncrease.getSalary());
 				schoolTeacher.setCapitalIncrease(capitalIncrease.getSalary());
@@ -399,9 +450,9 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 			schoolTeacher.setCapitalIncrease(capitalIncreaseName.getSalary());
 		}
 		//履约奖标准
-		SchoolConfigItem performanceAward = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "履约奖标准", schoolTeacher.getSchoolAge().toString(), null);
+		SchoolConfigItem performanceAward = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "履约奖标准", schoolTeacher.getSchoolAge().toString(), null,null);
 		if (performanceAward == null){
-			SchoolConfigItem performanceAwardName = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "履约奖标准", null, null);
+			SchoolConfigItem performanceAwardName = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "履约奖标准", null, null,null);
 			if (performanceAwardName != null){
 				schoolTeacher.setPerformanceAward(performanceAwardName.getSalary());
 				schoolTeacher.setPerformanceAwardName(performanceAwardName.getSalary());
@@ -410,6 +461,30 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 			schoolTeacher.setPerformanceAward(performanceAward.getSalary());
 			schoolTeacher.setPerformanceAwardName(performanceAward.getSalary());
 		}
+		if (schoolTeacher.getInSection().equals("高中部")){
+			//日常考核工资标准
+			SchoolConfigItem assessment = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "日常考核工资标准", schoolTeacher.getDailyGrade(), null,schoolTeacher.getClassType());
+			if (assessment != null){
+				schoolTeacher.setDailyAssessmentCriteriaName(assessment.getSalary());
+			}
+			//学期绩效工资标准
+			SchoolConfigItem performance = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "学期绩效工资标准", schoolTeacher.getPerformanceGrade(), null,schoolTeacher.getClassType());
+			if (performance != null){
+				schoolTeacher.setTermPerformanceSalary(performance.getSalary());
+			}
+
+		}else {
+			//日常考核工资标准
+			SchoolConfigItem assessment = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "日常考核工资标准", schoolTeacher.getDailyGrade(), null,null);
+			if (assessment != null){
+				schoolTeacher.setDailyAssessmentCriteriaName(assessment.getSalary());
+			}
+			//学期绩效工资标准
+			SchoolConfigItem performance = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "学期绩效工资标准", schoolTeacher.getPerformanceGrade(), null,null);
+			if (performance != null){
+				schoolTeacher.setTermPerformanceSalary(performance.getSalary());
+			}
+		}
 		return schoolTeacher;
 	}
 

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

@@ -1150,8 +1150,8 @@ public class SalaryItemController extends BladeController {
 	@ApiOperationSupport(order = 63)
 	@ApiOperation(value = "重新导入工资标准", notes = "传入salaryItem 的 pid")
 	public R<SalaryItem> criterion(SalaryItemVO salaryItem) {
-		if (salaryItem.getPid() == null){
-			throw new SecurityException("请选择要重新导入的数据");
+		if (StringUtils.isBlank(salaryItem.getInSection())){
+			throw new SecurityException("缺少必要的参数");
 		}
 		return salaryItemService.criterion(salaryItem);
 	}

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

@@ -1448,11 +1448,11 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 	@Override
 	@Transactional
 	public R criterion(SalaryItemVO salaryItem) {
-		List<SalaryItem> list = new ArrayList<>();
 		R<List<SchoolTeacher>> teacher = schoolTeacherClient.getTeacher(salaryItem.getInSection());
 		if (teacher.isSuccess() && CollectionUtils.isNotEmpty(teacher.getData())){
 			teacher.getData().stream().forEach(item ->{
 				SalaryItem salary = new SalaryItem();
+				salary.setPid(salaryItem.getPid());
 				salary.setCname(item.getCname());//姓名
 				salary.setIdNumber(item.getIdNumber());//身份证
 				salary.setPositiveTime(item.getBirthdate());//转正日期
@@ -1492,10 +1492,23 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salary.setTeachingResearchName(item.getTeachingResearchName());//教研组长补贴标准
 				salary.setAssessTeachingResearchName(item.getAssessTeachingResearchName());//教研组长考核补贴标准
 				salary.setWorkloadSalaryCritertion(item.getWorkloadSalaryName());
-				list.add(salary);
+				SalaryItem selectOne = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salary.getIdNumber()).eq("cname",salary.getCname()).eq("tenant_id", SecureUtil.getTenantId())
+					.eq("is_deleted", 0).eq("pid",salary.getPid()));
+				if (selectOne == null){
+					salary.setCreateTime(new Date());
+					salary.setCreateUser(SecureUtil.getUserId());
+					baseMapper.insert(salary);
+				}else {
+					salary.setId(selectOne.getId());
+					salary.setUpdateTime(new Date());
+					salary.setUpdateUser(SecureUtil.getUserId());
+					baseMapper.updateById(salary);
+				}
+				//更新计算工资
+				this.countSalary(salary);
 			});
 		}
-		return R.data(list);
+		return R.success("导入成功");
 	}
 
 	@Override