diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml index e62cbb75..78a36e69 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml @@ -499,19 +499,6 @@ ${izupuser.likeend} - - ${izApprovalStatus.rulesOp} tcp.FROMUSERID ${izApprovalStatus.dataOp} ${izApprovalStatus.likestar} - - - - #{item} - - - - #{izApprovalStatus.value} - - ${izApprovalStatus.likeend} - ${iztaskrrom.rulesOp} tcp.FROMSOURCEID ${iztaskrrom.dataOp} ${iztaskrrom.likestar} @@ -655,6 +642,12 @@ where tc.ASSIGNEE = #{searchassignee} and tc.TENANTID = #{searchtenantid} and tc.STATES = 2 + + ${izApprovalStatus.rulesOp} + ( + #{izApprovalStatus.value} ${izApprovalStatus.dataOp} COALESCE(uf.STATSHIS, 1) + ) + UNION select tc.*, uf.COMMENTHIS, @@ -675,6 +668,12 @@ and uf.USERID = #{thisLoginUserid} + + ${izApprovalStatus.rulesOp} + ( + #{izApprovalStatus.value} ${izApprovalStatus.dataOp} COALESCE(uf.STATSHIS, 1) + ) + ) as tcp @@ -703,6 +702,12 @@ and uf.USERID = #{thisLoginUserid} + + ${izApprovalStatus.rulesOp} + ( + #{izApprovalStatus.value} ${izApprovalStatus.dataOp} COALESCE(uf.STATSHIS, 1) + ) + ) as tcp