feat(erp/TimesheetInfo): 添加工时填报中的部门信息显示

- 在工时填报查询中增加部门名称字段
- 修改数据库查询语句添加部门表关联
- 更新视图对象添加部门名称属性
- 配置部门名称导出到Excel功能
dev
Yangk 1 week ago
parent 8b1f480044
commit 1656a3235b

@ -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<ErpTimesheetDeptVo> timesheetDeptList;
private List<ErpTimesheetProjectVo> timesheetProjectList;
}

@ -14,17 +14,21 @@
<select id="selectCustomVoPage" resultType="org.dromara.oa.erp.domain.vo.ErpTimesheetInfoVo">
SELECT
t.*,
u.nick_name
u.nick_name,
d.dept_name
FROM erp_timesheet_info t
LEFT JOIN sys_user u ON t.user_id = u.user_id
LEFT JOIN sys_dept d ON t.dept_id = d.dept_id
${ew.customSqlSegment}
</select>
<select id="selectCustomVoList" resultType="org.dromara.oa.erp.domain.vo.ErpTimesheetInfoVo">
SELECT t.*,
u.nick_name
u.nick_name,
d.dept_name
FROM erp_timesheet_info t
LEFT JOIN sys_user u ON t.user_id = u.user_id
LEFT JOIN sys_dept d ON t.dept_id = d.dept_id
${ew.customSqlSegment}
</select>

Loading…
Cancel
Save