diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayDayWorkHoursController.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayDayWorkHoursController.java index 5598201..75a0e9b 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayDayWorkHoursController.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayDayWorkHoursController.java @@ -79,6 +79,7 @@ public class PayDayWorkHoursController extends BaseController { export.setHours(dwhours.getHours().doubleValue()); if(dwhours.getIsHelper()==1){ export.setIsHelper("是") ; + export.setDeptName2(dwhours.getDeptName()); }else{ export.setIsHelper("否") ; } diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDayWorkHoursExport.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDayWorkHoursExport.java index c641ffd..35f2790 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDayWorkHoursExport.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDayWorkHoursExport.java @@ -2,6 +2,7 @@ package com.ruoyi.pay.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.converters.localdate.LocalDateDateConverter; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PaySalaryReportVo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PaySalaryReportVo.java index bcf6037..99221d1 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PaySalaryReportVo.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PaySalaryReportVo.java @@ -5,7 +5,10 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.ruoyi.common.annotation.ExcelDictFormat; import com.ruoyi.common.convert.ExcelDictConvert; +import com.ruoyi.common.core.domain.BaseEntity; import lombok.Data; +import lombok.EqualsAndHashCode; + import java.util.Date; @@ -18,20 +21,20 @@ import java.util.Date; */ @Data @ExcelIgnoreUnannotated -public class PaySalaryReportVo { +public class PaySalaryReportVo { private static final long serialVersionUID = 1L; /** * 主键 */ - @ExcelProperty(value = "主键") + // @ExcelProperty(value = "主键") private Long id; /** * 租户id */ - @ExcelProperty(value = "租户id") + // @ExcelProperty(value = "租户id") private Long tenantId; /** @@ -49,7 +52,7 @@ public class PaySalaryReportVo { /** * 部门id */ - @ExcelProperty(value = "部门id") + // @ExcelProperty(value = "部门id") private Long deptId; /** @@ -61,7 +64,7 @@ public class PaySalaryReportVo { /** * 员工id */ - @ExcelProperty(value = "员工id") + // @ExcelProperty(value = "员工id") private Long employeeId; /** diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/util/SalaryExportUtil.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/util/SalaryExportUtil.java index 07127d9..63749dc 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/util/SalaryExportUtil.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/util/SalaryExportUtil.java @@ -8,11 +8,10 @@ import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellStyle; import org.apache.poi.ss.usermodel.FillPatternType; import org.apache.poi.ss.usermodel.IndexedColors; -import sun.misc.BASE64Encoder; - +//import sun.misc.BASE64Encoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.net.URLEncoder; +//import java.net.URLEncoder; import java.util.List; import java.util.Map; @@ -60,7 +59,7 @@ public class SalaryExportUtil { String agent=request.getHeader("user-agent"); String filename=sheetName+".xls"; //不同浏览器需要对文件名做特殊处理 - if (agent.contains("Firefox")) { // 火狐浏览器 + /* if (agent.contains("Firefox")) { // 火狐浏览器 filename = "=?UTF-8?B?" + new BASE64Encoder().encode(filename.getBytes("utf-8")) + "?="; @@ -68,7 +67,7 @@ public class SalaryExportUtil { } else { // IE及其他浏览器 filename = URLEncoder.encode(filename, "utf-8"); filename = filename.replace("+"," "); - } + }*/ //推送浏览器 response.setHeader("Content-Disposition","attachment;filename="+filename); hssfWorkbook.write(response.getOutputStream());