ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ak:8f119d27e8c40d1ef18d5544f04be1d5fe98d265
Branches Tags
ak:dev
ak:prod
ak:dev-aikai-开支日报导出
ak:dev-补录附件
ak:frx
ak:工单-dev
ak:frx_export
ak:dev-erp
ak:crm-业绩目标
..
compare: ak:e2bebcf9117e345eb5ac07ce5fae2e8019d780ef
Branches Tags
ak:dev
ak:prod
ak:dev-aikai-开支日报导出
ak:dev-补录附件
ak:frx
ak:工单-dev
ak:frx_export
ak:dev-erp
ak:crm-业绩目标

No commits in common. "8f119d27e8c40d1ef18d5544f04be1d5fe98d265" and "e2bebcf9117e345eb5ac07ce5fae2e8019d780ef" have entirely different histories.
8f119d27e8 ... e2bebcf911

2 changed files with 1 additions and 3 deletions
Show Stats Expand all files Collapse all files

3
zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/attendance/StaffAttendanceRecordServiceImpl.java
View File

@ -10,9 +10,6 @@ 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.SfAttendanceReviewMapper;
import cn.iocoder.yudao.module.smartfactory.dal.mysql.attendance.StaffAttendanceRecordMapper; 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.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.stereotype.Service;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;

1
zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/staffsalary/StaffSalaryServiceImpl.java
View File

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