guoxiangbin
/
ocr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'fix: 终审列表添加排序' (#62) from sunchenliang into test

Browse Source 
Reviewed-on: #62
pull/63/head
sunchenliang 1 year ago
parent 493e07c2ee 1680322a64
commit 78cd6cbc60
1 changed files with 43 additions and 37 deletions
Show Stats Download Patch File Download Diff File

80
jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
Unescape View File

@ -185,6 +185,7 @@
<if test="ocpictureid != null"> <if test="ocpictureid != null">
and OCPICTUREID ${ocpictureid.dataOp} ${ocpictureid.likestar}#{ocpictureid.value}${ocpictureid.likeend} and OCPICTUREID ${ocpictureid.dataOp} ${ocpictureid.likestar}#{ocpictureid.value}${ocpictureid.likeend}
</if> </if>
<if test="pictureresult != null"> <if test="pictureresult != null">
@ -307,6 +308,7 @@
<if test="ocpictureid != null"> <if test="ocpictureid != null">
and tcp.OCPICTUREID ${ocpictureid.dataOp} ${ocpictureid.likestar}#{ocpictureid.value}${ocpictureid.likeend} and tcp.OCPICTUREID ${ocpictureid.dataOp} ${ocpictureid.likestar}#{ocpictureid.value}${ocpictureid.likeend}
</if> </if>
<if test="pictureresult != null"> <if test="pictureresult != null">
@ -499,7 +501,6 @@
left join ocr_picture pic left join ocr_picture pic
on tcp.PICTUREID = pic.ID on tcp.PICTUREID = pic.ID
<include refid="Base_Where_union"> <include refid="Base_Where_union">
</include> </include>
and pic.suspiciousfile = 0 and pic.suspiciousfile = 0
<if test="fromuptimeStart != null"> <if test="fromuptimeStart != null">
@ -510,7 +511,12 @@
</if> </if>
<if test="page != null"> <if test="page != null">
<if test="page.sortname != null"> <if test="page.sortname != null">
order by tcp.${page.sortname} ${page.sortorder} <if test="page.sortname == 'states'">
order by tcp.${page.sortname} ${page.sortorder}
</if>
<if test="page.sortname != 'states'">
order by pic.${page.sortname} ${page.sortorder}
</if>
</if> </if>
limit ${page.start}, ${page.Pagesize} limit ${page.start}, ${page.Pagesize}
</if> </if>
@ -774,42 +780,42 @@
<select id="getDubiousfileList" resultType="cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo"> <select id="getDubiousfileList" resultType="cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo">
SELECT t2.ID id, SELECT t2.ID id,
t2.PICTUREID pictureId, t2.PICTUREID pictureId,
t2.STATES states, t2.STATES states,
t2.PROCESSINSTANCEID processInstanceId, t2.PROCESSINSTANCEID processInstanceId,
t2.PROCESSDEFINITIONID processDefinitionId, t2.PROCESSDEFINITIONID processDefinitionId,
t2.DEPLOYMENTID deploymentId, t2.DEPLOYMENTID deploymentId,
t2.ASSIGNEENAME assigneeName, t2.ASSIGNEENAME assigneeName,
t2.ASSIGNEE assignee, t2.ASSIGNEE assignee,
t2.FILEANNEX fileAnnex, t2.FILEANNEX fileAnnex,
t2.GUIDANG guiDang, t2.GUIDANG guiDang,
t2.CREATEUSER createUser, t2.CREATEUSER createUser,
t2.CREATEUSERNAME createUserName, t2.CREATEUSERNAME createUserName,
t2.CREATEDATE createDate, t2.CREATEDATE createDate,
t2.USERID userId, t2.USERID userId,
t2.USERNAME userName, t2.USERNAME userName,
t2.FROMTASKID fromTaskId, t2.FROMTASKID fromTaskId,
t2.FROMTASKNAME fromTaskName, t2.FROMTASKNAME fromTaskName,
t2.FROMUSERID fromUserId, t2.FROMUSERID fromUserId,
t2.FROMPROJECTID fromProjectId, t2.FROMPROJECTID fromProjectId,
t2.FROMPLANID fromPlanId, t2.FROMPLANID fromPlanId,
t2.FROMUPTIME fromupTime, t2.FROMUPTIME fromupTime,
t2.FROMSOURCEID fromSourceId, t2.FROMSOURCEID fromSourceId,
t2.HAVEPOINTS havePoints, t2.HAVEPOINTS havePoints,
t2.TASKNAME taskName, t2.TASKNAME taskName,
t2.TASKID taskId, t2.TASKID taskId,
t2.FROMUSERNAME fromUserName, t2.FROMUSERNAME fromUserName,
t2.FROMPROJECTNAME fromProjectName, t2.FROMPROJECTNAME fromProjectName,
t2.FINISHTIME finishTime, t2.FINISHTIME finishTime,
t1.imgUrl, t1.imgUrl,
ifnull(t3.STATSHIS, 1) historyStates, ifnull(t3.STATSHIS, 1) historyStates,
t1.submit_date_timestamp submitDateTimestamp, t1.submit_date_timestamp submitDateTimestamp,
t1.photo_date_timestamp photoDateTimestamp, t1.photo_date_timestamp photoDateTimestamp,
t1.similarity_score similarityScore t1.similarity_score similarityScore
FROM ocr_picture t1 FROM ocr_picture t1
LEFT JOIN ocr_taskchild_picture t2 LEFT JOIN ocr_taskchild_picture t2
on t1.ID = t2.PICTUREID on t1.ID = t2.PICTUREID
LEFT JOIN oa_userapprove_t t3 on t2.ID = t3.FORMID and t3.TASKNAME = '${taskname}' LEFT JOIN oa_userapprove_t t3 on t2.ID = t3.FORMID and t3.TASKNAME = '${taskname}'
where t1.ID in where t1.ID in
<foreach collection="pictureIds" open="(" close=")" item="item" separator="," index="index"> <foreach collection="pictureIds" open="(" close=")" item="item" separator="," index="index">
#{item} #{item}

Write Preview
Loading…
Cancel
Save