组织快照
This commit is contained in:
parent
de5af5f2c9
commit
5b8562edb6
|
|
@ -4,6 +4,7 @@ import com.engine.salary.common.LocalDateRange;
|
|||
import com.engine.salary.entity.salarysob.dto.SalarySobCycleDTO;
|
||||
import com.engine.salary.entity.salarysob.po.SalarySobPO;
|
||||
import com.engine.salary.enums.SalaryCycleTypeEnum;
|
||||
import com.engine.salary.util.SalaryDateUtil;
|
||||
|
||||
import java.time.*;
|
||||
import java.util.Date;
|
||||
|
|
@ -30,7 +31,8 @@ public class SalarySobCycleBO {
|
|||
if (salarySob == null) {
|
||||
return null;
|
||||
}
|
||||
return SalarySobCycleDTO.builder()
|
||||
|
||||
SalarySobCycleDTO salarySobCycleDTO = SalarySobCycleDTO.builder()
|
||||
.salarySobId(salarySob.getId())
|
||||
.salaryMonth(salaryMonth)
|
||||
.taxCycle(buildCycle(salaryMonth, salarySob.getTaxCycleType()))
|
||||
|
|
@ -38,6 +40,18 @@ public class SalarySobCycleBO {
|
|||
.salaryCycle(buildCycleDateRange(salaryMonth, salarySob.getSalaryCycleType(), salarySob.getSalaryCycleFromDay()))
|
||||
.attendCycle(buildCycleDateRange(salaryMonth, salarySob.getAttendCycleType(), salarySob.getAttendCycleFromDay()))
|
||||
.build();
|
||||
|
||||
salarySobCycleDTO.setSalaryDate(SalaryDateUtil.toDate(salarySobCycleDTO.getSalaryMonth(), 1));
|
||||
salarySobCycleDTO.setTaxDate(SalaryDateUtil.toDate(salarySobCycleDTO.getTaxCycle(), 1));
|
||||
salarySobCycleDTO.setSocialSecurityDate(SalaryDateUtil.toDate(salarySobCycleDTO.getSocialSecurityCycle(), 1));
|
||||
LocalDateRange salaryCycle = salarySobCycleDTO.getSalaryCycle();
|
||||
salarySobCycleDTO.setSalaryCycleFromDate(salaryCycle.getFromDate());
|
||||
salarySobCycleDTO.setSalaryCycleEndDate(salaryCycle.getEndDate());
|
||||
LocalDateRange attendCycle = salarySobCycleDTO.getAttendCycle();
|
||||
salarySobCycleDTO.setAttendCycleFromDate(attendCycle.getFromDate());
|
||||
salarySobCycleDTO.setAttendCycleEndDate(attendCycle.getEndDate());
|
||||
|
||||
return salarySobCycleDTO;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in New Issue