|
|
@@ -298,11 +298,12 @@
|
|
|
where x.user_id =y.aid
|
|
|
</update>
|
|
|
|
|
|
- <select id="selectByDDUidAndTime" resultType="com.ruoyi.project.domain.ProjectStaffRecord">
|
|
|
+ <select id="selectByDDUidAndTime" resultType="com.ruoyi.project.domain.ProjectStaffRecordOut">
|
|
|
select
|
|
|
- b.id,b.duration,b.aid,b.pid,
|
|
|
+ b.id,b.duration,b.aid,b.pid,c.name projectName,
|
|
|
date_format(b.record_time,'%Y-%m-%d')recordTime
|
|
|
from sys_user a left join project_staff_record b on a.user_id=b.aid
|
|
|
+ left join project_task c on b.pid=c.id
|
|
|
where a.dd_user_id= #{ddUserId}
|
|
|
and b.record_time = #{clockDate}
|
|
|
</select>
|