hansha
/
pay
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

薪资接口修改

Browse Source
master 35
hshansha 7 months ago
parent bf5e66420a
commit 0564d651c6
2 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File

44
ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PaySalaryReportBo.java
Unescape View File

@ -25,7 +25,7 @@ public class PaySalaryReportBo extends BaseEntity {
/**
* 主键
*/
@NotNull(message = "主键不能为空", groups = { EditGroup.class })
// @NotNull(message = "主键不能为空", groups = { EditGroup.class })
private Long id;
/**
@ -85,97 +85,97 @@ public class PaySalaryReportBo extends BaseEntity {
/**
* 实际出勤小时数
*/
@NotNull(message = "实际出勤小时数不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotNull(message = "实际出勤小时数不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal actuallyHours;
/**
* 出勤工时
*/
@NotNull(message = "出勤工时不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotNull(message = "出勤工时不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal dayWorkHours;
/**
* 包活工时
*/
@NotNull(message = "包活工时不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotNull(message = "包活工时不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal workOrderHours;
/**
* 加班工时
*/
@NotNull(message = "加班工时不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotNull(message = "加班工时不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal overtimeWorkHours;
/**
*  日工帮工工时
*/
@NotNull(message = " 日工帮工工时不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotNull(message = " 日工帮工工时不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal rigongHelpHours;
/**
* 日工工资
*/
@NotNull(message = "日工工资不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotNull(message = "日工工资不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal dayWorkPay;
/**
* 包活工资
*/
@NotNull(message = "包活工资不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotNull(message = "包活工资不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal workOrderPay;
/**
* 加班工资
*/
@NotNull(message = "加班工资不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotNull(message = "加班工资不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal overtime;
/**
* 帮工工资
*/
@NotNull(message = "帮工工资不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotNull(message = "帮工工资不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal banggongPay;
/**
* 值班/拉货工资 废弃
*/
@NotNull(message = "值班/拉货工资 废弃不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotNull(message = "值班/拉货工资 废弃不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal zhibanOrLahuo;
/**
* 节假日工资 废弃
*/
@NotNull(message = "节假日工资 废弃不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotNull(message = "节假日工资 废弃不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal holiday;
/**
* 岗位津贴 废弃
*/
@NotNull(message = "岗位津贴 废弃不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotNull(message = "岗位津贴 废弃不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal post;
/**
* 话费及其他补贴 废弃
*/
@NotNull(message = "话费及其他补贴 废弃不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotNull(message = "话费及其他补贴 废弃不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal phoneCharge;
/**
* 合同补 废弃
*/
@NotNull(message = "合同补 废弃不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotNull(message = "合同补 废弃不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal contract;
/**
* 全勤奖 废弃
*/
@NotNull(message = "全勤奖 废弃不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotNull(message = "全勤奖 废弃不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal fullTime;
/**
* 上月差异 废弃
*/
@NotNull(message = "上月差异 废弃不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotNull(message = "上月差异 废弃不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal diffOfLastMonth;
/**
@ -187,13 +187,13 @@ public class PaySalaryReportBo extends BaseEntity {
/**
* 扣款忘刷迟到 废弃
*/
@NotNull(message = "扣款忘刷迟到 废弃不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotNull(message = "扣款忘刷迟到 废弃不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal late;
/**
* 扣款保险/党费 废弃
*/
@NotNull(message = "扣款保险/党费 废弃不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotNull(message = "扣款保险/党费 废弃不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal insurance;
/**
@ -205,19 +205,19 @@ public class PaySalaryReportBo extends BaseEntity {
/**
* 员工补贴对象
*/
@NotBlank(message = "员工补贴对象不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotBlank(message = "员工补贴对象不能为空", groups = { AddGroup.class, EditGroup.class })
private String allButieData;
/**
* 备注
*/
@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
private String note;
/**
* 员工工资是否可查
*/
@NotNull(message = "员工工资是否可查不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotNull(message = "员工工资是否可查不能为空", groups = { AddGroup.class, EditGroup.class })
private Long empQuery;

11
ruoyi-pay/src/main/resources/mapper/pay/PaySalaryReportMapper.xml
Unescape View File

@ -42,8 +42,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="queryLastMonthReport" resultMap="PaySalaryReportResult">
SELECT * FROM `pay_salary_report` s
where s.year=(select max(year) maxYear from `pay_salary_report` ${ew.customSqlSegment})
and s.`month`=(select max(month) from `pay_salary_report` where `year`= select max(year) maxYear from `pay_salary_report` ${ew.customSqlSegment})
${ew.customSqlSegment}
<where>
s.`month`=(select max(month) from `pay_salary_report` where
`year`= (select max(year) maxYear from `pay_salary_report` ${ew.customSqlSegment})
<if test="ew.sqlSegment != null and ew.sqlSegment != ''"> and ${ew.sqlSegment} </if> )
<if test="ew.sqlSegment != null and ew.sqlSegment != ''"> and ${ew.sqlSegment} </if>
</where>
<!--${ew.customSqlSegment}-->
</select>
</mapper>

Write Preview
Loading…
Cancel
Save