|
@@ -509,7 +509,7 @@
|
509
|
509
|
from prj_ApproveRecord a
|
510
|
510
|
left join sys_user_info u1 on a.TJR = u1.user_id
|
511
|
511
|
left join sys_user_info u2 on a.SHR = u2.user_id
|
512
|
|
- where a.XMID = #{xmid} and a.TABLENAME = #{tableName}
|
|
512
|
+ where a.XMID = #{xmid}
|
513
|
513
|
<if test="spzt != null and spzt != ''">
|
514
|
514
|
and a.ZT = #{spzt}
|
515
|
515
|
</if>
|
|
@@ -521,13 +521,18 @@
|
521
|
521
|
order by ${sortName} ${sortOrder} DESC
|
522
|
522
|
</when>
|
523
|
523
|
</choose>
|
524
|
|
- order by a.id DESC
|
|
524
|
+ order by a.id asc
|
|
525
|
+ </select>
|
|
526
|
+ <select id="getOldApproveRecord" resultType="com.liang.entity.PrjApproverecord">
|
|
527
|
+ SELECT TOP 1 * FROM prj_ApproveRecord WHERE XMID = #{xmid} ORDER BY ID DESC
|
525
|
528
|
</select>
|
526
|
529
|
|
527
|
530
|
<update id="updateRevokeRecord">
|
528
|
531
|
UPDATE prj_ApproveRecord
|
529
|
|
- SET WC=1
|
530
|
|
- WHERE ID = (SELECT TOP 1 ID FROM prj_ApproveRecord WHERE XMID = #{xmid} ORDER BY ID DESC)
|
|
532
|
+ SET WC = 1,
|
|
533
|
+ SPCZ = '撤销审批',
|
|
534
|
+ SHSJ = CURRENT_TIMESTAMP
|
|
535
|
+ WHERE ID = (SELECT TOP 1 ID FROM prj_ApproveRecord WHERE XMID = #{xmid} ORDER BY ID DESC);
|
531
|
536
|
</update>
|
532
|
537
|
|
533
|
538
|
</mapper>
|