学校修改

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

@@ -63,9 +63,9 @@ public class SalaryItem implements Serializable {
 		@ApiModelProperty(value = "类别")
 		private String itemType;
 	/**
-	* 转正时间
+	* 校龄开始时间
 	*/
-		@ApiModelProperty(value = "转正时间")
+		@ApiModelProperty(value = "校龄开始时间")
 		@JsonFormat(pattern = "yyyy-MM-dd")
 		private Date positiveTime;
 	/**
@@ -156,12 +156,12 @@ public class SalaryItem implements Serializable {
 	/**
 	* 月份课时
 	*/
-		@ApiModelProperty(value = "月份课时")
+		@ApiModelProperty(value = "月份工作量")
 		private BigDecimal monthHour;
 	/**
 	* 月份课时工资
 	*/
-		@ApiModelProperty(value = "月份课时工资")
+		@ApiModelProperty(value = "月份工作量工资")
 		private BigDecimal momthWorkloadSalary;
 	/**
 	* 自定义
@@ -179,39 +179,39 @@ public class SalaryItem implements Serializable {
 		@ApiModelProperty(value = "代课工作量工资")
 		private BigDecimal customTwo;
 	/**
-	* 自定义3
+	* 工作量工资1
 	*/
-		@ApiModelProperty(value = "自定义3")
+		@ApiModelProperty(value = "工作量工资1")
 		private BigDecimal customThree;
 	/**
-	* 自定义4
+	* 工作量工资2
 	*/
-		@ApiModelProperty(value = "自定义4")
+		@ApiModelProperty(value = "工作量工资2")
 		private BigDecimal customFour;
 	/**
-	* 自定义5
+	* 工作量工资3
 	*/
-		@ApiModelProperty(value = "自定义5")
+		@ApiModelProperty(value = "工作量工资3")
 		private BigDecimal customFive;
 	/**
-	* 自定义6
+	* 工作量工资4
 	*/
-		@ApiModelProperty(value = "自定义6")
+		@ApiModelProperty(value = "工作量工资4")
 		private BigDecimal customSix;
 	/**
-	* 自定义7
+	* 工作量工资5
 	*/
-		@ApiModelProperty(value = "自定义7")
+		@ApiModelProperty(value = "工作量工资5")
 		private BigDecimal customSeven;
 	/**
 	* 自定义8
 	*/
-		@ApiModelProperty(value = "自定义8")
+		@ApiModelProperty(value = "学期绩效工资标准")
 		private BigDecimal customEight;
 	/**
-	* 自定义9
+	* 学期绩效工资1
 	*/
-		@ApiModelProperty(value = "自定义9")
+		@ApiModelProperty(value = "学期绩效工资1")
 		private BigDecimal customNine;
 	/**
 	 * 工作量工资
@@ -241,52 +241,52 @@ public class SalaryItem implements Serializable {
 	/**
 	* 自定义奖励
 	*/
-		@ApiModelProperty(value = "自定义奖励")
+		@ApiModelProperty(value = "奖励1")
 		private BigDecimal customAward;
 	/**
 	* 自定义奖励1
 	*/
-		@ApiModelProperty(value = "自定义奖励1")
+		@ApiModelProperty(value = "奖励2")
 		private BigDecimal customAwardOne;
 	/**
 	* 自定义奖励2
 	*/
-		@ApiModelProperty(value = "自定义奖励2")
+		@ApiModelProperty(value = "奖励3")
 		private BigDecimal customAwardTwo;
 	/**
 	* 自定义奖励3
 	*/
-		@ApiModelProperty(value = "自定义奖励3")
+		@ApiModelProperty(value = "奖励4")
 		private BigDecimal customAwardThree;
 	/**
 	* 自定义奖励4
 	*/
-		@ApiModelProperty(value = "自定义奖励4")
+		@ApiModelProperty(value = "奖励5")
 		private BigDecimal customAwardFour;
 	/**
 	* 自定义奖励5
 	*/
-		@ApiModelProperty(value = "自定义奖励5")
+		@ApiModelProperty(value = "奖励6")
 		private BigDecimal customAwardFive;
 	/**
 	* 自定义奖励6
 	*/
-		@ApiModelProperty(value = "自定义奖励6")
+		@ApiModelProperty(value = "奖励7")
 		private BigDecimal customAwardSix;
 	/**
 	* 自定义奖励7
 	*/
-		@ApiModelProperty(value = "自定义奖励7")
+		@ApiModelProperty(value = "奖励8")
 		private BigDecimal customAwardSeven;
 	/**
 	* 自定义奖励8
 	*/
-		@ApiModelProperty(value = "自定义奖励8")
+		@ApiModelProperty(value = "奖励9")
 		private BigDecimal customAwardEight;
 	/**
 	* 自定义奖励9
 	*/
-		@ApiModelProperty(value = "自定义奖励9")
+		@ApiModelProperty(value = "奖励10")
 		private BigDecimal customAwardNine;
 	/**
 	* 奖励工资
@@ -299,14 +299,14 @@ public class SalaryItem implements Serializable {
 		@ApiModelProperty(value = "领导干部补贴")
 		private BigDecimal leadingCadreSubsidy;
 	/**
-	* 备课组长
+	* 备课组长补贴
 	*/
-		@ApiModelProperty(value = "备课组长")
+		@ApiModelProperty(value = "备课组长补贴")
 		private BigDecimal prepareLessons;
 	/**
-	* 教研组长
+	* 教研组长补贴
 	*/
-		@ApiModelProperty(value = "教研组长")
+		@ApiModelProperty(value = "教研组长补贴")
 		private BigDecimal teachingResearch;
 	/**
 	* 职务津贴
@@ -321,7 +321,7 @@ public class SalaryItem implements Serializable {
 	/**
 	* 班额
 	*/
-		@ApiModelProperty(value = "班额")
+		@ApiModelProperty(value = "班额津贴")
 		private BigDecimal classes;
 	/**
 	* 班主任津贴
@@ -341,112 +341,112 @@ public class SalaryItem implements Serializable {
 	/**
 	* 周末加班
 	*/
-		@ApiModelProperty(value = "周末加班")
+		@ApiModelProperty(value = "周末工作量工资")
 		private BigDecimal overtimeAtWeekend;
 	/**
-	* 年上学期绩效
+	* 补贴1
 	*/
-		@ApiModelProperty(value = "年上学期绩效")
+		@ApiModelProperty(value = "补贴1")
 		private BigDecimal yearUpPerformance;
 	/**
-	* 年下学期绩效
+	* 补贴2
 	*/
-		@ApiModelProperty(value = "年下学期绩效")
+		@ApiModelProperty(value = "补贴2")
 		private BigDecimal yearDownPerformance;
 	/**
-	* 干部补贴预留
+	* 补贴3
 	*/
-		@ApiModelProperty(value = "干部补贴预留")
+		@ApiModelProperty(value = "补贴3")
 		private BigDecimal cadreAllowanceReservation;
 	/**
-	* 假期加班费
+	* 补贴4
 	*/
-		@ApiModelProperty(value = "假期加班费")
+		@ApiModelProperty(value = "补贴4")
 		private BigDecimal vacationOvertimePay;
 	/**
-	* 新岗岗前培训
+	* 补贴5
 	*/
-		@ApiModelProperty(value = "新岗岗前培训")
+		@ApiModelProperty(value = "补贴5")
 		private BigDecimal newPostTrain;
 	/**
-	* 期中期末考试学科优胜奖(预留发放)
+	* 补贴6
 	*/
-		@ApiModelProperty(value = "期中期末考试学科优胜奖(预留发放)")
+		@ApiModelProperty(value = "补贴6")
 		private BigDecimal winningPrize;
 	/**
-	* 级部长(预留发放)
+	* 补贴7
 	*/
-		@ApiModelProperty(value = "级部长(预留发放)")
+		@ApiModelProperty(value = "补贴7")
 		private BigDecimal classMinister;
 	/**
-	* 月副班费(预留发放)
+	* 补贴8
 	*/
-		@ApiModelProperty(value = "月副班费(预留发放)")
+		@ApiModelProperty(value = "补贴8")
 		private BigDecimal monthViceClassFee;
 	/**
-	* 餐车、周五测温、周五安全岗(预留发放)
+	* 补贴9
 	*/
-		@ApiModelProperty(value = "餐车、周五测温、周五安全岗(预留发放)")
+		@ApiModelProperty(value = "补贴9")
 		private BigDecimal safetyFees;
 	/**
-	* 预留补发
+	* 补贴10
 	*/
-		@ApiModelProperty(value = "预留补发")
+		@ApiModelProperty(value = "补贴10")
 		private BigDecimal reserveReplacement;
 	/**
 	* 调整差额
 	*/
-		@ApiModelProperty(value = "调整差额")
+		@ApiModelProperty(value = "校车考核")
 		private BigDecimal adjustTheBalance;
 	/**
-	* 自定义
+	* 学期绩效工资2
 	*/
-		@ApiModelProperty(value = "自定义")
+		@ApiModelProperty(value = "学期绩效工资2")
 		private BigDecimal customize;
 	/**
-	* 自定义1
+	* 学期绩效工资3
 	*/
-		@ApiModelProperty(value = "自定义1")
+		@ApiModelProperty(value = "学期绩效工资3")
 		private BigDecimal customizeOne;
 	/**
-	* 自定义2
+	* 学期绩效工资4
 	*/
-		@ApiModelProperty(value = "自定义2")
+		@ApiModelProperty(value = "学期绩效工资4")
 		private BigDecimal customizeTwo;
 	/**
-	* 自定义3
+	* 学期绩效工资5
 	*/
-		@ApiModelProperty(value = "自定义3")
+		@ApiModelProperty(value = "学期绩效工资5")
 		private BigDecimal customizeThree;
 	/**
-	* 自定义4
+	* 绩效工资
 	*/
-		@ApiModelProperty(value = "自定义4")
+		@ApiModelProperty(value = "绩效工资")
 		private BigDecimal customizeFour;
 	/**
-	* 自定义5
+	* 领导干部考核补贴
 	*/
-		@ApiModelProperty(value = "自定义5")
+		@ApiModelProperty(value = "领导干部考核补贴")
 		private BigDecimal customizeFive;
 	/**
-	* 自定义6
+	* 备课组长考核补贴
 	*/
-		@ApiModelProperty(value = "自定义6")
+		@ApiModelProperty(value = "备课组长考核补贴")
 		private BigDecimal customizeSix;
 	/**
-	* 自定义7
+	* 教研组长考核补贴
 	*/
-		@ApiModelProperty(value = "自定义7")
+		@ApiModelProperty(value = "教研组长考核补贴")
 		private BigDecimal customizeSeven;
 	/**
-	* 自定义8
+	* 班主任考核津贴
 	*/
-		@ApiModelProperty(value = "自定义8")
+		@ApiModelProperty(value = "班主任考核津贴")
 		private BigDecimal customizeEight;
 	/**
 	* 自定义9
 	*/
-		@ApiModelProperty(value = "自定义9")
+		@ApiModelProperty(value = "周末工作量")
 		private BigDecimal customizeNine;
 	/**
 	* 补贴项
@@ -459,14 +459,14 @@ public class SalaryItem implements Serializable {
 		@ApiModelProperty(value = "出勤")
 		private BigDecimal attendance;
 	/**
-	* 督查罚款
+	* 督查
 	*/
-		@ApiModelProperty(value = "督查罚款")
+		@ApiModelProperty(value = "督查")
 		private BigDecimal inspectorFines;
 	/**
-	* 电话费
+	* 超额电话费
 	*/
-		@ApiModelProperty(value = "电话费")
+		@ApiModelProperty(value = "超额电话费")
 		private BigDecimal telephoneBill;
 	/**
 	* 学习强国
@@ -519,79 +519,79 @@ public class SalaryItem implements Serializable {
 		@ApiModelProperty(value = "应发工资")
 		private BigDecimal salary;
 	/**
-	* 个税
+	* 个人所得税
 	*/
-		@ApiModelProperty(value = "个税")
+		@ApiModelProperty(value = "个人所得税")
 		private BigDecimal personageTaxes;
 	/**
 	* 实发工资(减去个人)
 	*/
-		@ApiModelProperty(value = "实发工资(减去个人)")
+		@ApiModelProperty(value = "实发工资")
 		private BigDecimal fSalary;
 	/**
-	* 工资备注
+	* 备注
 	*/
-		@ApiModelProperty(value = "工资备注")
+		@ApiModelProperty(value = "备注")
 		private String salaryRemark;
 	/**
 	* 自定义
 	*/
-		@ApiModelProperty(value = "自定义")
+		@ApiModelProperty(value = "周末课时费")
 		private BigDecimal ribbon;
 	/**
-	* 自定义1
+	* 扣除1
 	*/
-		@ApiModelProperty(value = "自定义1")
+		@ApiModelProperty(value = "扣除1")
 		private BigDecimal ribbonOne;
 	/**
-	* 自定义2
+	* 扣除2
 	*/
-		@ApiModelProperty(value = "自定义2")
+		@ApiModelProperty(value = "扣除2")
 		private BigDecimal ribbonTwo;
 	/**
-	* 自定义3
+	* 扣除3
 	*/
-		@ApiModelProperty(value = "自定义3")
+		@ApiModelProperty(value = "扣除3")
 		private BigDecimal ribbonThree;
 	/**
-	* 自定义4
+	* 扣除4
 	*/
-		@ApiModelProperty(value = "自定义4")
+		@ApiModelProperty(value = "扣除4")
 		private BigDecimal ribbonFour;
 	/**
-	* 自定义5
+	* 扣除5
 	*/
-		@ApiModelProperty(value = "自定义5")
+		@ApiModelProperty(value = "扣除5")
 		private BigDecimal ribbonFive;
 	/**
-	* 自定义6
+	* 扣除6
 	*/
-		@ApiModelProperty(value = "自定义6")
+		@ApiModelProperty(value = "扣除6")
 		private BigDecimal ribbonSix;
 	/**
-	* 自定义7
+	* 扣除7
 	*/
-		@ApiModelProperty(value = "自定义7")
+		@ApiModelProperty(value = "扣除7")
 		private BigDecimal ribbonSeven;
 	/**
-	* 自定义8
+	* 扣除8
 	*/
-		@ApiModelProperty(value = "自定义8")
+		@ApiModelProperty(value = "扣除8")
 		private BigDecimal ribbonEight;
 	/**
-	* 自定义9
+	* 扣除9
 	*/
-		@ApiModelProperty(value = "自定义9")
+		@ApiModelProperty(value = "扣除9")
 		private BigDecimal ribbonNine;
 	/**
 	* 日照银行代发最终
 	*/
-		@ApiModelProperty(value = "日照银行代发最终")
+		@ApiModelProperty(value = "班级微信群考核")
 		private BigDecimal payrollCredit;
 	/**
 	* 已付
 	*/
-		@ApiModelProperty(value = "已付")
+		@ApiModelProperty(value = "财务考核")
 		private BigDecimal paid;
 	/**
 	* 冲借款
@@ -606,12 +606,12 @@ public class SalaryItem implements Serializable {
 	/**
 	* 暂不付
 	*/
-		@ApiModelProperty(value = "暂不付")
+		@ApiModelProperty(value = "扣除10")
 		private BigDecimal pauseNoPay;
 	/**
 	* 暂不付1
 	*/
-		@ApiModelProperty(value = "暂不付1")
+		@ApiModelProperty(value = "实发工资取整")
 		private BigDecimal pauseNoPayOne;
 	/**
 	* 暂不付2
@@ -656,12 +656,12 @@ public class SalaryItem implements Serializable {
 	/**
 	* 暂不付备注
 	*/
-		@ApiModelProperty(value = "暂不付备注")
+		@ApiModelProperty(value = "备注1")
 		private String pauseNoPayRemark;
 	/**
 	* 备注
 	*/
-		@ApiModelProperty(value = "备注")
+		@ApiModelProperty(value = "备注2")
 		private String remarks;
 	/**
 	* 版本
@@ -735,22 +735,22 @@ public class SalaryItem implements Serializable {
 		@ApiModelProperty(value = "工资基数标准")
 		private BigDecimal salaryBaseName;
 	/**
-	 * 学期绩效工资
+	 * 绩效工资标准
 	 */
-		@ApiModelProperty(value = "学期绩效标准")
+		@ApiModelProperty(value = "绩效工资标准")
 		private BigDecimal termPerformanceSalaryName;
 	/**
 	 * 班主任补贴标准
 	 */
-		@ApiModelProperty(value = "班主任补贴标准")
+		@ApiModelProperty(value = "班主任补贴")
 		private BigDecimal teacherSubsidy;
 	/**
-	 * 班主任考核补贴标准
+	 * 班主任考核津贴标准
 	 */
-		@ApiModelProperty(value = "班主任考核补贴标准")
+		@ApiModelProperty(value = "班主任考核津贴标准")
 		private BigDecimal teacherAssessSubsidy;
 	/**
-	 * 履约奖
+	 * 履约奖标准
 	 */
 		@ApiModelProperty(value = "履约奖标准")
 		private BigDecimal performanceAwardName;

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

@@ -95,17 +95,24 @@ public class SchoolTeacherController extends BladeController {
 		LambdaQueryWrapper<SchoolTeacher> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(SchoolTeacher::getIsDeleted,0);
 		lambdaQueryWrapper.eq(SchoolTeacher::getTenantId,SecureUtil.getTenantId());
-		lambdaQueryWrapper.eq(Func.isNotEmpty(schoolTeacher.getStatus()),SchoolTeacher::getStatus,schoolTeacher.getStatus());//职工状态
-		lambdaQueryWrapper.eq(Func.isNotEmpty(schoolTeacher.getGender()),SchoolTeacher::getGender,schoolTeacher.getGender());//性别
-		lambdaQueryWrapper.eq(Func.isNotEmpty(schoolTeacher.getSchoolAge()),SchoolTeacher::getSchoolAge,schoolTeacher.getSchoolAge());//校龄
-		lambdaQueryWrapper.eq(Func.isNotEmpty(schoolTeacher.getDoubleTeachers()),SchoolTeacher::getDoubleTeachers,schoolTeacher.getDoubleTeachers());//是否班主任
+		lambdaQueryWrapper.like(Func.isNotEmpty(schoolTeacher.getInSection()),SchoolTeacher::getInSection,schoolTeacher.getInSection());//所在部门
+		lambdaQueryWrapper.like(Func.isNotEmpty(schoolTeacher.getDepartment()),SchoolTeacher::getDepartment,schoolTeacher.getDepartment());//级部
 		lambdaQueryWrapper.like(Func.isNotEmpty(schoolTeacher.getCname()),SchoolTeacher::getCname,schoolTeacher.getCname());//姓名
 		lambdaQueryWrapper.like(Func.isNotEmpty(schoolTeacher.getIdNumber()),SchoolTeacher::getIdNumber,schoolTeacher.getIdNumber());//身份证号
-		lambdaQueryWrapper.like(Func.isNotEmpty(schoolTeacher.getPhone()),SchoolTeacher::getPhone,schoolTeacher.getPhone());//联系电话
+		lambdaQueryWrapper.eq(Func.isNotEmpty(schoolTeacher.getGender()),SchoolTeacher::getGender,schoolTeacher.getGender());//性别
 		lambdaQueryWrapper.like(Func.isNotEmpty(schoolTeacher.getCode()),SchoolTeacher::getCode,schoolTeacher.getCode());//学历
-		lambdaQueryWrapper.like(Func.isNotEmpty(schoolTeacher.getInSection()),SchoolTeacher::getInSection,schoolTeacher.getInSection());//所在部门
-		lambdaQueryWrapper.like(Func.isNotEmpty(schoolTeacher.getDepartment()),SchoolTeacher::getDepartment,schoolTeacher.getDepartment());//级部
+		lambdaQueryWrapper.eq(Func.isNotEmpty(schoolTeacher.getStatus()),SchoolTeacher::getStatus,schoolTeacher.getStatus());//职工状态
 		lambdaQueryWrapper.like(Func.isNotEmpty(schoolTeacher.getInStaffRoom()),SchoolTeacher::getInStaffRoom,schoolTeacher.getInStaffRoom());//班级
+		lambdaQueryWrapper.eq(Func.isNotEmpty(schoolTeacher.getStaffType()),SchoolTeacher::getStaffType,schoolTeacher.getStaffType());//教师类别
+		lambdaQueryWrapper.eq(Func.isNotEmpty(schoolTeacher.getClassType()),SchoolTeacher::getClassType,schoolTeacher.getClassType());//授课类别
+		lambdaQueryWrapper.eq(Func.isNotEmpty(schoolTeacher.getSalaryWithdrawalStandardName()),SchoolTeacher::getSalaryWithdrawalStandardName,schoolTeacher.getSalaryWithdrawalStandardName());//类别
+		lambdaQueryWrapper.eq(Func.isNotEmpty(schoolTeacher.getRankType()),SchoolTeacher::getRankType,schoolTeacher.getRankType());//职称
+		lambdaQueryWrapper.eq(Func.isNotEmpty(schoolTeacher.getRankSalaryName()),SchoolTeacher::getRankSalaryName,schoolTeacher.getRankSalaryName());//职级等级
+		lambdaQueryWrapper.eq(Func.isNotEmpty(schoolTeacher.getDailyGrade()),SchoolTeacher::getDailyGrade,schoolTeacher.getDailyGrade());//日常考核等级
+		lambdaQueryWrapper.eq(Func.isNotEmpty(schoolTeacher.getPerformanceGrade()),SchoolTeacher::getPerformanceGrade,schoolTeacher.getPerformanceGrade());//学期绩效等级
+		lambdaQueryWrapper.eq(Func.isNotEmpty(schoolTeacher.getSchoolAge()),SchoolTeacher::getSchoolAge,schoolTeacher.getSchoolAge());//校龄
+		lambdaQueryWrapper.eq(Func.isNotEmpty(schoolTeacher.getDoubleTeachers()),SchoolTeacher::getDoubleTeachers,schoolTeacher.getDoubleTeachers());//是否班主任
+		lambdaQueryWrapper.like(Func.isNotEmpty(schoolTeacher.getPhone()),SchoolTeacher::getPhone,schoolTeacher.getPhone());//联系电话
 		lambdaQueryWrapper.like(Func.isNotEmpty(schoolTeacher.getCompileCategory()),SchoolTeacher::getCompileCategory,schoolTeacher.getCompileCategory());//职务
 		lambdaQueryWrapper.like(Func.isNotEmpty(schoolTeacher.getRemarks()),SchoolTeacher::getRemarks,schoolTeacher.getRemarks());//备注
 		lambdaQueryWrapper.ge(Func.isNotEmpty(schoolTeacher.getCreateTimeStart()), SchoolTeacher::getJoiningDate,schoolTeacher.getCreateTimeStart());//入职日期开始
@@ -114,6 +121,7 @@ public class SchoolTeacherController extends BladeController {
 		lambdaQueryWrapper.le(Func.isNotEmpty(schoolTeacher.getDateValidityEnd()),SchoolTeacher::getBirthdate,schoolTeacher.getDateValidityEnd());//转正日期结束
 		lambdaQueryWrapper.ge(Func.isNotEmpty(schoolTeacher.getSchoolAgeSalaryDateStart()),SchoolTeacher::getSchoolAgeSalaryDate,schoolTeacher.getSchoolAgeSalaryDateStart());//校龄开始日期起始时间
 		lambdaQueryWrapper.le(Func.isNotEmpty(schoolTeacher.getSchoolAgeSalaryDateEnd()),SchoolTeacher::getSchoolAgeSalaryDate,schoolTeacher.getSchoolAgeSalaryDateEnd());//校龄开始日期结束时间
+		lambdaQueryWrapper.orderByAsc(SchoolTeacher::getId);
 		IPage<SchoolTeacher> pages = schoolTeacherService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);
 	}