|
@@ -25,6 +25,7 @@
|
|
|
<result property="checkStatus" column="check_status" jdbcType="INTEGER"/>
|
|
<result property="checkStatus" column="check_status" jdbcType="INTEGER"/>
|
|
|
<result property="tianheUrl" column="tianhe_url" jdbcType="VARCHAR"/>
|
|
<result property="tianheUrl" column="tianhe_url" jdbcType="VARCHAR"/>
|
|
|
<result property="tianheType" column="tianhe_type" jdbcType="INTEGER"/>
|
|
<result property="tianheType" column="tianhe_type" jdbcType="INTEGER"/>
|
|
|
|
|
+ <result property="projectName" column="projectName" jdbcType="INTEGER"/>
|
|
|
</resultMap>
|
|
</resultMap>
|
|
|
|
|
|
|
|
<sql id="Base_Column_List">
|
|
<sql id="Base_Column_List">
|
|
@@ -349,30 +350,32 @@
|
|
|
and pid = #{id}
|
|
and pid = #{id}
|
|
|
and record_time between #{startDate} and #{endDate}
|
|
and record_time between #{startDate} and #{endDate}
|
|
|
</select>
|
|
</select>
|
|
|
- <select id="getCompanyClock" resultMap="BaseResultMap">
|
|
|
|
|
|
|
+ <select id="getCompanyClock" resultType="com.ruoyi.project.domain.CompanyClockBo">
|
|
|
select a.id,
|
|
select a.id,
|
|
|
a.aid,
|
|
a.aid,
|
|
|
a.pid,
|
|
a.pid,
|
|
|
a.name,
|
|
a.name,
|
|
|
- a.process_status,
|
|
|
|
|
|
|
+ a.process_status processStatus,
|
|
|
a.content,
|
|
a.content,
|
|
|
- a.annex_url,
|
|
|
|
|
- a.create_time,
|
|
|
|
|
- a.project_status,
|
|
|
|
|
|
|
+ a.annex_url annexUrl,
|
|
|
|
|
+ a.create_time createTime,
|
|
|
|
|
+ a.project_status projectStatus,
|
|
|
a.duration,
|
|
a.duration,
|
|
|
- a.examine_id,
|
|
|
|
|
- a.examine_time,
|
|
|
|
|
- a.examine_name,
|
|
|
|
|
- a.record_time,
|
|
|
|
|
- a.examine_content,
|
|
|
|
|
- a.init_duration,
|
|
|
|
|
- a.check_duration,
|
|
|
|
|
- a.check_status,
|
|
|
|
|
- a.tianhe_type,
|
|
|
|
|
- a.tianhe_url
|
|
|
|
|
|
|
+ a.examine_id examineId,
|
|
|
|
|
+ a.examine_time examineTime,
|
|
|
|
|
+ a.examine_name examineName,
|
|
|
|
|
+ a.record_time recordTime,
|
|
|
|
|
+ a.examine_content examineContent,
|
|
|
|
|
+ a.init_duration initDuration,
|
|
|
|
|
+ a.check_duration checkDuration,
|
|
|
|
|
+ a.check_status checkStatus,
|
|
|
|
|
+ a.tianhe_type tianheType,
|
|
|
|
|
+ a.tianhe_url tianheUrl,
|
|
|
|
|
+ d.name projectName
|
|
|
from project_staff_record a
|
|
from project_staff_record a
|
|
|
left join sys_user b on a.aid = b.user_id
|
|
left join sys_user b on a.aid = b.user_id
|
|
|
left join sys_dept c on b.dept_id = c.dept_id
|
|
left join sys_dept c on b.dept_id = c.dept_id
|
|
|
|
|
+ left join project_task d on a.pid = d.id
|
|
|
where a.process_status = 2
|
|
where a.process_status = 2
|
|
|
and a.duration >= 0
|
|
and a.duration >= 0
|
|
|
and (c.dept_id = #{deptId} or find_in_set(#{deptId}, c.ancestors))
|
|
and (c.dept_id = #{deptId} or find_in_set(#{deptId}, c.ancestors))
|