From c40fd060af05e060501a9068e95fc8cc5c6ef11d Mon Sep 17 00:00:00 2001 From: hshansha Date: Fri, 6 Jun 2025 08:20:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/pay/controller/PayDayWorkHoursController.java | 1 + .../main/java/com/ruoyi/pay/domain/vo/PayDayWorkHoursExport.java | 1 + 2 files changed, 2 insertions(+) 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;