diff --git a/evo-admin/src/main/java/com/evo/finance/processor/SalaryCalculationStrategyExchangeProcessor.java b/evo-admin/src/main/java/com/evo/finance/processor/SalaryCalculationStrategyExchangeProcessor.java index fa0fcbd..b61f916 100644 --- a/evo-admin/src/main/java/com/evo/finance/processor/SalaryCalculationStrategyExchangeProcessor.java +++ b/evo-admin/src/main/java/com/evo/finance/processor/SalaryCalculationStrategyExchangeProcessor.java @@ -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');"); + } + + } } diff --git a/evo-admin/src/main/java/com/evo/finance/processor/impl/DailyWageStrategyExchangeProcessor.java b/evo-admin/src/main/java/com/evo/finance/processor/impl/DailyWageStrategyExchangeProcessor.java index ea1cab3..17a1dde 100644 --- a/evo-admin/src/main/java/com/evo/finance/processor/impl/DailyWageStrategyExchangeProcessor.java +++ b/evo-admin/src/main/java/com/evo/finance/processor/impl/DailyWageStrategyExchangeProcessor.java @@ -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 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); diff --git a/evo-admin/src/main/java/com/evo/finance/processor/impl/MonthlySalaryStrategyExchangeProcessor.java b/evo-admin/src/main/java/com/evo/finance/processor/impl/MonthlySalaryStrategyExchangeProcessor.java index f345888..d60af53 100644 --- a/evo-admin/src/main/java/com/evo/finance/processor/impl/MonthlySalaryStrategyExchangeProcessor.java +++ b/evo-admin/src/main/java/com/evo/finance/processor/impl/MonthlySalaryStrategyExchangeProcessor.java @@ -53,8 +53,8 @@ public class MonthlySalaryStrategyExchangeProcessor implements SalaryCalculation */ @Override public void exchangeSalaryCalculation(SysStaff sysStaff, SysStaffDetail sysStaffDetail, RzSalaryDetail rzSalaryDetail, RzAttendanceStatistical attendanceStatistical, Map overTimeMap) { -// //计算基本工资 -// monthSalary(sysStaff, sysStaffDetail,rzSalaryDetail, attendanceStatistical); + //计算社保 + socialSecurity(sysStaff,sysStaffDetail, attendanceStatistical); //组件基础数据 buildRzSalaryDetail(true, sysStaff, sysStaffDetail,rzSalaryDetail, attendanceStatistical); //计算薪资 diff --git a/evo-admin/src/main/java/com/evo/system/domain/vo/SysStaffVo.java b/evo-admin/src/main/java/com/evo/system/domain/vo/SysStaffVo.java index 7e64fa9..aaeb47e 100644 --- a/evo-admin/src/main/java/com/evo/system/domain/vo/SysStaffVo.java +++ b/evo-admin/src/main/java/com/evo/system/domain/vo/SysStaffVo.java @@ -83,8 +83,12 @@ public class SysStaffVo { private BigDecimal dailyWage; @Excel(name = "享有补助", customExcelField = true, excelFieldHandler= SysStaffExcelFieldHandlerAdapter.class, defaultValue = "0") private Map subsidyMap; + @Excel(name = "其他补助") + private BigDecimal otherSubsidies; @Excel(name = "固定补助") private BigDecimal fixedAllowance; + @Excel(name = "其他扣款") + private BigDecimal deductions; @Excel(name = "养老保险") private BigDecimal endowmentInsurance; diff --git a/evo-admin/src/main/java/com/evo/system/service/impl/SysStaffServiceImpl.java b/evo-admin/src/main/java/com/evo/system/service/impl/SysStaffServiceImpl.java index a52b856..b0c21f2 100644 --- a/evo-admin/src/main/java/com/evo/system/service/impl/SysStaffServiceImpl.java +++ b/evo-admin/src/main/java/com/evo/system/service/impl/SysStaffServiceImpl.java @@ -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 i return AjaxResult.error(); } //如果是离职, 推送金蝶禁用 - KingdeeRequestUtils.employeeDisabled(Collections.asMap("Numbers",sysStaff.getJobCode().split("_")[0])); + 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 i @Transactional public AjaxResult reEmployment(Long userId) { try { + update(new UpdateWrapper().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); //处理餐饮信息