DeXun/fad_oa
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加1报工审批2添加我的申请

Browse Source
This commit is contained in:
86156
2026-04-22 15:52:58 +08:00
parent 8b3e016568
commit 8b78e82a80
22 changed files with 991 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
ruoyi-oa/src/main/resources/mapper/oa/OaProjectReportMapper.xml
View File

@@ -195,11 +195,54 @@
left join sys_user su on su.user_id = opr.user_id
left join sys_dept sd on su.dept_id = sd.dept_id
WHERE opr.del_flag = 0
AND DATE(opr.create_time)
BETWEEN DATE_FORMAT(#{start}, '%Y-%m-%d')
AND DATE_FORMAT(#{end}, '%Y-%m-%d')
<if test="start != null">
AND DATE(opr.create_time) &gt;= DATE_FORMAT(#{start}, '%Y-%m-%d')
</if>
<if test="end != null">
AND DATE(opr.create_time) &lt;= DATE_FORMAT(#{end}, '%Y-%m-%d')
</if>
ORDER BY opr.create_time DESC
</select>
<select id="selectTravelCompareReportPage" resultType="com.ruoyi.oa.domain.vo.OaProjectReportVo">
select opr.report_id,
opr.user_id,
opr.is_trip,
opr.work_place,
opr.project_id,
opr.content,
opr.create_time,
opr.create_by,
opr.update_time,
opr.update_by,
opr.del_flag,
opr.remark,
op.project_name,
op.project_num,
op.project_code,
su.nick_name,
opr.work_type,
sd.dept_name
from oa_project_report opr
left join sys_oa_project op on opr.project_id = op.project_id
left join sys_user su on su.user_id = opr.user_id
left join sys_dept sd on su.dept_id = sd.dept_id
<where>
opr.del_flag = 0
<if test="start != null">
AND DATE(opr.create_time) &gt;= DATE_FORMAT(#{start}, '%Y-%m-%d')
</if>
<if test="end != null">
AND DATE(opr.create_time) &lt;= DATE_FORMAT(#{end}, '%Y-%m-%d')
</if>
<if test="nickName != null and nickName != ''">
AND su.nick_name LIKE CONCAT('%', #{nickName}, '%')
</if>
<if test="workPlace != null and workPlace != ''">
AND opr.work_place LIKE CONCAT('%', #{workPlace}, '%')
</if>
</where>
ORDER BY opr.create_time DESC
LIMIT 20
</select>
<select id="getSummaryData" resultType="com.ruoyi.oa.domain.vo.OaProjectReportVo">