Commit 05742781 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.17' into MVP1.7.17

parents 642a7f8e 1bc7f625
......@@ -28,8 +28,6 @@
<id property="id" column="id"/>
<result property="leaveStatus" column="leave_status"/>
<result property="doStatus" column="do_status"/>
<result property="doDetail" column="do_detail"/>
<result property="doRemark" column="do_remark"/>
<result property="doStatusContract" column="do_status_contract"/>
<result property="doStatusSocial" column="do_status_social"/>
<result property="doStatusFund" column="do_status_fund"/>
......@@ -452,7 +450,7 @@ when '4' then '待减员' when '5' then '待办理' when '6' then '减员中' wh
1=1
<include refid="employeeRegistrationLeave_where"/>
</where>
ORDER BY b.create_time asc,b.id asc
ORDER BY b.create_time desc,b.id asc
</select>
<!-- 离职待办列表2000条-->
......@@ -474,7 +472,7 @@ when '4' then '待减员' when '5' then '待办理' when '6' then '减员中' wh
</if>
</if>
</where>
ORDER BY b.create_time asc,b.id asc
ORDER BY b.create_time desc,b.id asc
limit 2000
</select>
<!--离职确认列表-->
......@@ -487,7 +485,7 @@ when '4' then '待减员' when '5' then '待办理' when '6' then '减员中' wh
a.confirm_user is not null
<include refid="employeeRegistrationLeave_where"/>
</where>
ORDER BY b.create_time asc,b.id asc
ORDER BY b.create_time desc,b.id asc
</select>
<!-- 离职待办导出-->
......@@ -500,7 +498,7 @@ when '4' then '待减员' when '5' then '待办理' when '6' then '减员中' wh
1=1
<include refid="employeeRegistrationLeave_where"/>
</where>
ORDER BY b.create_time asc,b.id asc
ORDER BY b.create_time desc,b.id asc
<if test="employeeRegistrationLeave != null">
<if test="employeeRegistrationLeave.limitStart != null">
limit #{employeeRegistrationLeave.limitStart},#{employeeRegistrationLeave.limitEnd}
......@@ -517,7 +515,7 @@ when '4' then '待减员' when '5' then '待办理' when '6' then '减员中' wh
a.confirm_user is not null
<include refid="employeeRegistrationLeave_where"/>
</where>
ORDER BY b.create_time asc,b.id asc
ORDER BY b.create_time desc,b.id asc
<if test="employeeRegistrationLeave != null">
<if test="employeeRegistrationLeave.limitStart != null">
limit #{employeeRegistrationLeave.limitStart},#{employeeRegistrationLeave.limitEnd}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment