feat(smartfactory): 添加员工工资计算功能

- 新增工资计算相关接口和实现
- 添加考勤记录审核功能
- 优化员工信息获取方法
-调整工业事故相关模型和接口
This commit is contained in:
furongxin 2025-03-31 10:10:51 +08:00
parent cc944a133e
commit 0ab3bf2974
3 changed files with 4 additions and 1 deletions

View File

@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.smartfactory.api.staff.dto.StaffDTO;
import cn.iocoder.yudao.module.smartfactory.service.staff.StaffService;
import org.springframework.context.annotation.Bean;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RestController;

View File

@ -10,6 +10,9 @@ import cn.iocoder.yudao.module.smartfactory.dal.dataobject.attendance.StaffAtten
import cn.iocoder.yudao.module.smartfactory.dal.mysql.attendance.SfAttendanceReviewMapper;
import cn.iocoder.yudao.module.smartfactory.dal.mysql.attendance.StaffAttendanceRecordMapper;
import cn.iocoder.yudao.module.smartfactory.service.staffsalary.StaffSalaryService;
import cn.iocoder.yudao.module.smartfactory.framework.job.staffSalary.StaffSalaryJob;
import cn.iocoder.yudao.module.smartfactory.service.staffsalary.StaffSalaryService;
import org.springframework.data.redis.connection.stream.ObjectRecord;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;

View File

@ -134,7 +134,6 @@ public class StaffSalaryServiceImpl implements StaffSalaryService {
// 更新借支管理中 人员的归还金额
LoanDTO updateDO = new LoanDTO()
.setUserId(staffSalaryDO.getStaffId())
.setLoanType(1)
.setAmount(BigDecimal.ZERO)
.setReturnAmount(staffSalaryDO.getReturnAmount());
loanApi.createLoan(updateDO);