diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpTimesheetInfoVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpTimesheetInfoVo.java index 28f0e454..34f1731d 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpTimesheetInfoVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpTimesheetInfoVo.java @@ -16,7 +16,6 @@ import java.io.Serializable; import java.util.Date; import java.util.List; - /** * 工时填报视图对象 erp_timesheet_info * @@ -58,6 +57,12 @@ public class ErpTimesheetInfoVo implements Serializable { */ private Long deptId; + /** + * 部门名称 + */ + @ExcelProperty(value = "人员部门") + private String deptName; + /** * 起始时间(自然周的周一) */ @@ -113,5 +118,4 @@ public class ErpTimesheetInfoVo implements Serializable { private List timesheetDeptList; private List timesheetProjectList; - } diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpTimesheetInfoMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpTimesheetInfoMapper.xml index 6986e8a6..2b12c335 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpTimesheetInfoMapper.xml +++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpTimesheetInfoMapper.xml @@ -14,17 +14,21 @@