Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
This commit is contained in:
commit
7856d7d7ac
@ -175,25 +175,25 @@
|
||||
|
||||
|
||||
<select id="selectFinishTasksByApprovalStaffId" resultType="com.lz.modules.performance.dto.TaskListDto">
|
||||
SELECT DISTINCT(record_id),f.flow_process,f.flow_name,f.approval_staff_id,f.record_staff_id,start_id,r.gmt_modified,f.type from lz_flow_record f
|
||||
SELECT DISTINCT(record_id),f.flow_process,f.flow_name,f.approval_staff_id,f.record_staff_id,start_id,f.gmt_modified,f.type from lz_flow_record f
|
||||
LEFT JOIN lz_result_record r
|
||||
ON f.record_id = r.id
|
||||
where f.is_delete=0 and r.is_delete=0
|
||||
and approval_staff_id = #{approvalStaffId}
|
||||
and f.status = 1
|
||||
and f.flow_process != 2
|
||||
order by r.gmt_modified desc
|
||||
order by f.gmt_modified desc
|
||||
</select>
|
||||
|
||||
<select id="selectTodoTasksByApprovalStaffId" resultType="com.lz.modules.performance.dto.TaskListDto">
|
||||
SELECT DISTINCT(record_id),f.flow_process,f.flow_name,f.approval_staff_id,f.record_staff_id,start_id,r.gmt_modified,f.type from lz_flow_record f
|
||||
SELECT DISTINCT(record_id),f.flow_process,f.flow_name,f.approval_staff_id,f.record_staff_id,start_id,f.gmt_modified,f.type from lz_flow_record f
|
||||
LEFT JOIN lz_result_record r
|
||||
ON f.record_id = r.id
|
||||
where f.is_delete=0 and r.is_delete=0
|
||||
and approval_staff_id = #{approvalStaffId}
|
||||
and f.status = 2
|
||||
and f.flow_process != 2
|
||||
order by r.gmt_modified desc
|
||||
order by f.gmt_modified desc
|
||||
</select>
|
||||
|
||||
<insert id="insertFlowRecords">
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user