hbyt/evo-Financial-pc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

薪资生成调整

Browse Source
This commit is contained in:
andy 2025-07-14 17:31:01 +08:00
parent 071ca3c40a
commit 5acd7aaaf4
5 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
evo-admin/src/main/java/com/evo/finance/processor/SalaryCalculationStrategyExchangeProcessor.java
View File

@ -2,10 +2,7 @@ package com.evo.finance.processor;
import com.evo.attendance.domain.RzAttendanceStatistical;
import com.evo.common.constant.Constants;
import com.evo.common.utils.DataUtils;
import com.evo.common.utils.DateUtils;
import com.evo.common.utils.ParamUtils;
import com.evo.common.utils.StringUtils;
import com.evo.common.utils.*;
import com.evo.common.utils.spring.SpringUtils;
import com.evo.finance.domain.RzSalaryDetail;
import com.evo.finance.mapper.RzSalaryDetailMapper;
@ -399,5 +396,15 @@ public interface SalaryCalculationStrategyExchangeProcessor {
// }
// }
public static void main(String[] args) {
String cva = "郝新苹-17100-63;" +
"耿胜果-19500-135;" +
"孔盈莹-7666.47-0";
for (String cv : cva.split(";")){
String[] x = cv.split("-");
System.out.println("update sys_staff_detail set total_wages='"+x[1]+"', aggregate_personal_income_tax='"+x[2]+"' where staff_id = (select user_id from sys_staff where name='"+x[0]+"' and del_flag='0');");
}
}
}

11
evo-admin/src/main/java/com/evo/finance/processor/impl/DailyWageStrategyExchangeProcessor.java
View File

@ -7,6 +7,7 @@ import com.evo.attendance.domain.RzAttendance;
import com.evo.attendance.domain.RzAttendanceStatistical;
import com.evo.attendance.mapper.RzAttendanceMapper;
import com.evo.common.constant.Constants;
import com.evo.common.utils.Collections;
import com.evo.common.utils.DateUtils;
import com.evo.common.utils.ParamUtils;
import com.evo.finance.domain.RzSalaryDetail;
@ -46,15 +47,15 @@ public class DailyWageStrategyExchangeProcessor implements SalaryCalculationStra
@Override
public void exchangeSalaryCalculation(SysStaff sysStaff, SysStaffDetail sysStaffDetail, RzSalaryDetail rzSalaryDetail, RzAttendanceStatistical attendanceStatistical, Map<Long, Boolean> overTimeMap) {
//组件基础数据
buildRzSalaryDetail(false, sysStaff, sysStaffDetail,rzSalaryDetail, attendanceStatistical);
// //计算基本工资
// monthSalary(sysStaff, sysStaffDetail,rzSalaryDetail, attendanceStatistical);
if(Collections.asList("李亚茹","侯阔","周红娟","刘晓谦").contains(sysStaff.getName())){
System.out.println(11111);
}
//计算社保
socialSecurity(sysStaff,sysStaffDetail, attendanceStatistical);
//组件基础数据
buildRzSalaryDetail(false, sysStaff, sysStaffDetail,rzSalaryDetail, attendanceStatistical);
//计算薪资
calculation(sysStaff, sysStaffDetail,rzSalaryDetail);

4
evo-admin/src/main/java/com/evo/finance/processor/impl/MonthlySalaryStrategyExchangeProcessor.java
View File

@ -53,8 +53,8 @@ public class MonthlySalaryStrategyExchangeProcessor implements SalaryCalculation
*/
@Override
public void exchangeSalaryCalculation(SysStaff sysStaff, SysStaffDetail sysStaffDetail, RzSalaryDetail rzSalaryDetail, RzAttendanceStatistical attendanceStatistical, Map<Long, Boolean> overTimeMap) {
// //计算基本工资
// monthSalary(sysStaff, sysStaffDetail,rzSalaryDetail, attendanceStatistical);
//计算社保
socialSecurity(sysStaff,sysStaffDetail, attendanceStatistical);
//组件基础数据
buildRzSalaryDetail(true, sysStaff, sysStaffDetail,rzSalaryDetail, attendanceStatistical);
//计算薪资

4
evo-admin/src/main/java/com/evo/system/domain/vo/SysStaffVo.java
View File

@ -83,8 +83,12 @@ public class SysStaffVo {
private BigDecimal dailyWage;
@Excel(name = "享有补助", customExcelField = true, excelFieldHandler= SysStaffExcelFieldHandlerAdapter.class, defaultValue = "0")
private Map<String, Object> subsidyMap;
@Excel(name = "其他补助")
private BigDecimal otherSubsidies;
@Excel(name = "固定补助")
private BigDecimal fixedAllowance;
@Excel(name = "其他扣款")
private BigDecimal deductions;
@Excel(name = "养老保险")
private BigDecimal endowmentInsurance;

7
evo-admin/src/main/java/com/evo/system/service/impl/SysStaffServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.evo.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.evo.attendance.domain.vo.RzSalaryVo;
import com.evo.attendance.service.IRzAttendanceStatisticalService;
@ -234,7 +235,10 @@ public class SysStaffServiceImpl extends ServiceImpl<SysStaffMapper, SysStaff> i
return AjaxResult.error();
}
//如果是离职, 推送金蝶禁用
if(StringUtils.isNotEmpty(sysStaff.getJobCode())){
KingdeeRequestUtils.employeeDisabled(Collections.asMap("Numbers",sysStaff.getJobCode().split("_")[0]));
}
return AjaxResult.success();
}
}
@ -735,9 +739,8 @@ public class SysStaffServiceImpl extends ServiceImpl<SysStaffMapper, SysStaff> i
@Transactional
public AjaxResult reEmployment(Long userId) {
try {
update(new UpdateWrapper<SysStaff>().set("status", Constants.JOB_STATIS_1).set("quit_date", null).eq("user_id", userId));
SysStaff sysStaff = getBaseMapper().selectById(userId);
sysStaff.setStatus(Constants.JOB_STATIS_1);
getBaseMapper().updateSysStaff(sysStaff);
//打卡统计，打卡详情
rzAttendanceStatisticalService.createRzAttendance(sysStaff, Collections.emptyList(), null);
//处理餐饮信息