学校修改

blade-service-api/blade-client-api/src/main/java/org/springblade/client/feign/ISchoolTeacherClient.java

@@ -63,7 +63,7 @@ public interface ISchoolTeacherClient {
 	@GetMapping(GET_CONFIG)
 	R<SchoolConfigItem> getConfig(@RequestParam(value = "tenantId",required = true) String tenantId,
 								  @RequestParam(value = "inSection",required = true) String inSection,
-								  @RequestParam(value = "salaryWithdrawalStandardName",required = true) String salaryWithdrawalStandardName,
+								  @RequestParam(value = "salaryWithdrawalStandardName",required = false) String salaryWithdrawalStandardName,
 								  @RequestParam(value = "normType",required = true) String normType,
 								  @RequestParam(value = "parameter",required = false) String parameter,
 								  @RequestParam(value = "compileCategory",required = false) String compileCategory,

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

@@ -805,4 +805,14 @@ public class SalaryItem implements Serializable {
 	 */
 	@ApiModelProperty(value = "学历")
 	private String code;
+	/**
+	 * 日常考核等级
+	 */
+	@ApiModelProperty(value = "日常考核等级")
+	private String dailyGrade;
+	/**
+	 * 学期绩效等级
+	 */
+	@ApiModelProperty(value = "学期绩效等级")
+	private String performanceGrade;
 }

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

@@ -73,7 +73,7 @@
         <if test="parameter!=null and parameter != ''">
             AND ci.parameter = #{parameter}
         </if>
-        <if test="parameter!=null or parameter != ''">
+        <if test="parameter==null or parameter == ''">
             AND ci.parameter IS NULL
         </if>
         <if test="salaryWithdrawalStandardName!=null and salaryWithdrawalStandardName != ''">

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

@@ -1083,22 +1083,22 @@ public class SalaryItemController extends BladeController {
 		return salaryItemService.LeadExcel(excelList,false,id,file);
 	}
 	/**
-	 * 导入下学期绩效
+	 * 导入学期绩效
 	 */
 	@GetMapping("/export/teachingExcel")
 	@ApiOperationSupport(order = 59)
 	@ApiOperation(value = "导入模板-工资管理-小学部-下学期绩效模板")
 	public void exportTeachingExcel(HttpServletResponse response) {
 		List<TeachingExcel> list = new ArrayList<TeachingExcel>();
-		ExcelUtil.export(response, "下学期绩效", "下学期绩效", list, TeachingExcel.class);
+		ExcelUtil.export(response, "学期绩效", "学期绩效", list, TeachingExcel.class);
 	}
 	/**
-	 * 导入-工资管理-小学部-下学期绩效导入
+	 * 导入-工资管理-小学部-学期绩效导入
 	 *
 	 * */
 	@PostMapping("/import/teachingExcel")
 	@ApiOperationSupport(order = 60)
-	@ApiOperation(value = "导入-工资管理-小学部-下学期绩效导入", notes = "传入excel")
+	@ApiOperation(value = "导入-工资管理-小学部-学期绩效导入", notes = "传入excel")
 	public R importTeachingExcell(@RequestParam("file") MultipartFile file,@RequestParam("id") Long id)
 	{
 		//校验模板

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

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -39,13 +40,15 @@ public class TeachingExcel implements Serializable {
 	@ExcelProperty(value = "部门(必填)")
 	private String grading;
 	/**
-	 * 等级
+	 * 学科
 	 */
-	@ExcelProperty(value = "等级")
-	private String grade;
+	@ColumnWidth(45)
+	@ExcelProperty(value = "学科(文化课/非文化课 高中必填)")
+	private String discipline;
 	/**
-	 * 年下学期绩效
+	 * 等级
 	 */
-	@ExcelProperty(value = "年下学期绩效")
-	private BigDecimal yearDownPerformance;
+	@ExcelProperty(value = "学期绩效等级(必填)")
+	@ColumnWidth(35)
+	private String performanceGrade;
 }

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

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -39,8 +40,15 @@ public class ZhaPingExcel implements Serializable {
 	@ExcelProperty(value = "部门(必填)")
 	private String grading;
 	/**
+	 * 学科
+	 */
+	@ColumnWidth(45)
+	@ExcelProperty(value = "学科(文化课/非文化课 高中必填)")
+	private String discipline;
+	/**
 	 * 等级
 	 */
-	@ExcelProperty(value = "等级")
-	private String absenteeism;
+	@ExcelProperty(value = "日常考核等级(必填)")
+	@ColumnWidth(35)
+	private String dailyGrade;
 }

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

@@ -226,7 +226,7 @@ public interface ISalaryItemService extends IService<SalaryItem> {
 	 */
 	R PrepareLessonsExcel(List<PrepareLessonsExcel> data, Boolean isCovered, Long id,MultipartFile file);
 	/**
-	 * 年下学期绩效
+	 * 学期绩效
 	 * @param data
 	 * @param isCovered
 	 * @return

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

@@ -1062,19 +1062,19 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			//获取日常考核工资
 			if (zhaPingExcel.getGrading().equals("高中部")){
 				//日常考核工资标准
-				R<SchoolConfigItem> config = schoolTeacherClient.getConfig(item.getTenantId(), zhaPingExcel.getGrading(), null, "日常考核工资标准", zhaPingExcel.getAbsenteeism(), null, item.getDiscipline());
+				R<SchoolConfigItem> config = schoolTeacherClient.getConfig(SecureUtil.getTenantId(), zhaPingExcel.getGrading(), null, "日常考核工资标准", salaryItem.getDailyGrade(), null, salaryItem.getDiscipline());
 				if (config.isSuccess() && config.getData() != null){
-					salaryItem.setDailyAssessmentCriteria(config.getData().getSalary());
+					salaryItem.setDailyAssessmentSalary(config.getData().getSalary());
 				}else {
-					salaryItem.setDailyAssessmentCriteria(new BigDecimal(BigInteger.ZERO));
+					salaryItem.setDailyAssessmentSalary(new BigDecimal(BigInteger.ZERO));
 				}
 			}else {
 				//日常考核工资标准
-				R<SchoolConfigItem>  config = schoolTeacherClient.getConfig(item.getTenantId(), zhaPingExcel.getGrading(), null, "日常考核工资标准", zhaPingExcel.getAbsenteeism(), null,null);
+				R<SchoolConfigItem>  config = schoolTeacherClient.getConfig(SecureUtil.getTenantId(), zhaPingExcel.getGrading(), null, "日常考核工资标准", salaryItem.getDailyGrade(), null,null);
 				if (config.isSuccess() && config.getData() != null){
-					salaryItem.setDailyAssessmentCriteria(config.getData().getSalary());
+					salaryItem.setDailyAssessmentSalary(config.getData().getSalary());
 				}else {
-					salaryItem.setDailyAssessmentCriteria(new BigDecimal(BigInteger.ZERO));
+					salaryItem.setDailyAssessmentSalary(new BigDecimal(BigInteger.ZERO));
 				}
 			}
 			if (item != null){
@@ -1366,7 +1366,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 		}
 	}
 	/**
-	 * 年下学期绩效
+	 * 学期绩效
 	 * @param data
 	 * @param isCovered
 	 * @return
@@ -1395,6 +1395,24 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
 			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0).eq("pid",id));
+			//获取学期绩效工资
+			if (insuranceExcel.getGrading().equals("高中部")){
+				//学期绩效工资
+				R<SchoolConfigItem> config = schoolTeacherClient.getConfig(SecureUtil.getTenantId(),insuranceExcel.getGrading(), null, "学期绩效工资标准", salaryItem.getPerformanceGrade(), null,salaryItem.getDiscipline());
+				if (config != null){
+					salaryItem.setTermPerformanceSalary(config.getData().getSalary());
+				}else {
+					salaryItem.setTermPerformanceSalary(new BigDecimal(BigInteger.ZERO));
+				}
+			}else {
+				//学期绩效工资
+				R<SchoolConfigItem> config = schoolTeacherClient.getConfig(SecureUtil.getTenantId(),insuranceExcel.getGrading(), null, "学期绩效工资标准", salaryItem.getPerformanceGrade(), null,salaryItem.getDiscipline());
+				if (config != null){
+					salaryItem.setTermPerformanceSalary(config.getData().getSalary());
+				}else {
+					salaryItem.setTermPerformanceSalary(new BigDecimal(BigInteger.ZERO));
+				}
+			}
 			if (item != null){
 				salaryItem.setPid(id);
 				salaryItem.setId(item.getId());