diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayRequireAttendanceReportController.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayRequireAttendanceReportController.java index bb744d3..c7966ec 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayRequireAttendanceReportController.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayRequireAttendanceReportController.java @@ -6,6 +6,7 @@ import java.util.Arrays; import java.util.concurrent.TimeUnit; import com.ruoyi.pay.domain.PayRequireAttendanceReport; +import com.ruoyi.system.domain.vo.SysUserImportVo; import lombok.RequiredArgsConstructor; import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.*; @@ -61,9 +62,17 @@ public class PayRequireAttendanceReportController extends BaseController { List list = iPayRequireAttendanceReportService.queryList(bo); ExcelUtil.exportExcel(list, "应出勤报", PayRequireAttendanceReportVo.class, response); } + /** + * 导入模板 + */ + @Log(title = "应出勤下载模板", businessType = BusinessType.EXPORT) + @PostMapping("/importTemplate") + public void importTemplate( HttpServletResponse response) { + ExcelUtil.exportExcel(new ArrayList<>(), "应出勤数据", PayRequireAttendanceReportVo.class, response); + } /** - * 导出应出勤报列表 + * 导入应出勤报列表 */ @SaCheckPermission("pay:requireAttendanceReport:import") @Log(title = "应出勤报", businessType = BusinessType.EXPORT) diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayRequireAttendanceReportVo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayRequireAttendanceReportVo.java index bcc7579..bdd5709 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayRequireAttendanceReportVo.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayRequireAttendanceReportVo.java @@ -25,13 +25,13 @@ public class PayRequireAttendanceReportVo { /** * 主键 */ - @ExcelProperty(value = "主键") + // @ExcelProperty(value = "主键") private Long id; /** * 租户id */ - @ExcelProperty(value = "租户id") + // @ExcelProperty(value = "租户id") private Long tenantId; /** @@ -49,7 +49,7 @@ public class PayRequireAttendanceReportVo { /** * 员工id */ - @ExcelProperty(value = "员工id") + // @ExcelProperty(value = "员工id") private Long employeeId; /** @@ -67,7 +67,8 @@ public class PayRequireAttendanceReportVo { /** * 休息类别 */ - @ExcelProperty(value = "休息类别") + @ExcelProperty(value = "休息类型" ,converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "pay_work_rest_type") private String restType; /** @@ -107,9 +108,9 @@ public class PayRequireAttendanceReportVo { private BigDecimal holidayHours; /** - * + * */ - @ExcelProperty(value = "") + @ExcelProperty(value = "请假天数") private BigDecimal leaveDays; /**