huminmin
7 小时以前 3e2fc5361f545d7e2660924b55ea5b702992fca4
src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.dto.WordDateDto;
import com.ruoyi.staff.dto.StaffOnJobDto;
import com.ruoyi.staff.mapper.StaffJoinLeaveRecordMapper;
import com.ruoyi.staff.mapper.StaffOnJobMapper;
import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
@@ -46,7 +47,7 @@
    //在职员工台账分页查询
    @Override
    public IPage<StaffOnJob> staffOnJobListPage(Page page, StaffOnJob staffOnJob) {
    public IPage<StaffOnJobDto> staffOnJobListPage(Page page, StaffOnJob staffOnJob) {
        return staffOnJobMapper.staffOnJobListPage(page,staffOnJob);
    }
@@ -111,24 +112,40 @@
        LocalDate localDate3 = staff.getTrialStartDate().toInstant().atZone(ZoneId.of("Asia/Shanghai")).toLocalDate();
        LocalDate localDate4 = staff.getTrialEndDate().toInstant().atZone(ZoneId.of("Asia/Shanghai")).toLocalDate();
        staff.setQyear(localDate2.getYear() + "");
        staff.setQmoth(localDate2.getMonthValue() + "");
        staff.setQday(localDate2.getDayOfMonth() + "");
        if(staff.getDateSelect().equals("A")){
            staff.setSyear(localDate1.getYear() + "");
            staff.setSmoth(localDate1.getMonthValue() + "");
            staff.setSday(localDate1.getDayOfMonth() + "");
            staff.setEyear(localDate.getDayOfMonth() + "");
            staff.setEmoth(localDate.getDayOfMonth() + "");
            staff.setEday(localDate.getDayOfMonth() + "");
        staff.setSyear(localDate1.getYear() + "");
        staff.setSmoth(localDate1.getMonthValue() + "");
        staff.setSday(localDate1.getDayOfMonth() + "");
        staff.setEyear(localDate.getDayOfMonth() + "");
        staff.setEmoth(localDate.getDayOfMonth() + "");
        staff.setEday(localDate.getDayOfMonth() + "");
            staff.setStyear(localDate3.getYear() + "");
            staff.setStmoth(localDate3.getMonthValue() + "");
            staff.setStday(localDate3.getDayOfMonth() + "");
            staff.setSeyear(localDate4.getYear() + "");
            staff.setSemoth(localDate4.getMonthValue() + "");
            staff.setSeday(localDate4.getDayOfMonth() + "");
        }else if (staff.getDateSelect().equals("B")){
        staff.setStyear(localDate3.getYear() + "");
        staff.setStmoth(localDate3.getMonthValue() + "");
        staff.setStday(localDate3.getDayOfMonth() + "");
        staff.setSeyear(localDate4.getYear() + "");
        staff.setSemoth(localDate4.getMonthValue() + "");
        staff.setSeday(localDate4.getDayOfMonth() + "");
            staff.setBsyear(localDate1.getYear() + "");
            staff.setBsmoth(localDate1.getMonthValue() + "");
            staff.setBsday(localDate1.getDayOfMonth() + "");
            staff.setBstyear(localDate3.getYear() + "");
            staff.setBstmoth(localDate3.getMonthValue() + "");
            staff.setBstday(localDate3.getDayOfMonth() + "");
            staff.setBseyear(localDate4.getYear() + "");
            staff.setBsemoth(localDate4.getMonthValue() + "");
            staff.setBseday(localDate4.getDayOfMonth() + "");
        }else if (staff.getDateSelect().equals("C")){
            staff.setCsyear(localDate1.getYear() + "");
            staff.setCsmoth(localDate1.getMonthValue() + "");
            staff.setCsday(localDate1.getDayOfMonth() + "");
        }
        Map<String,Object> data = new HashMap<>();
        data.put("item",staff);