|
|
|
@ -729,48 +729,48 @@
|
|
|
|
|
</select>
|
|
|
|
|
|
|
|
|
|
<select id="getPictureHistoryList" resultType="cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo">
|
|
|
|
|
SELECT distinct t2.ID id,
|
|
|
|
|
t2.PICTUREID pictureId,
|
|
|
|
|
t2.STATES states,
|
|
|
|
|
t2.PROCESSINSTANCEID processInstanceId,
|
|
|
|
|
t2.PROCESSDEFINITIONID processDefinitionId,
|
|
|
|
|
t2.DEPLOYMENTID deploymentId,
|
|
|
|
|
t2.ASSIGNEENAME assigneeName,
|
|
|
|
|
t2.ASSIGNEE assignee,
|
|
|
|
|
t2.FILEANNEX fileAnnex,
|
|
|
|
|
t2.GUIDANG guiDang,
|
|
|
|
|
t2.CREATEUSER createUser,
|
|
|
|
|
t2.CREATEUSERNAME createUserName,
|
|
|
|
|
t2.CREATEDATE createDate,
|
|
|
|
|
t2.USERID userId,
|
|
|
|
|
t2.USERNAME userName,
|
|
|
|
|
t2.FROMTASKID fromTaskId,
|
|
|
|
|
t2.FROMTASKNAME fromTaskName,
|
|
|
|
|
t2.FROMUSERID fromUserId,
|
|
|
|
|
t2.FROMPROJECTID fromProjectId,
|
|
|
|
|
t2.FROMPLANID fromPlanId,
|
|
|
|
|
t2.FROMUPTIME fromupTime,
|
|
|
|
|
t2.FROMSOURCEID fromSourceId,
|
|
|
|
|
t2.HAVEPOINTS havePoints,
|
|
|
|
|
t2.TASKNAME taskName,
|
|
|
|
|
t2.TASKID taskId,
|
|
|
|
|
t2.FROMUSERNAME fromUserName,
|
|
|
|
|
t2.FROMPROJECTNAME fromProjectName,
|
|
|
|
|
t2.FINISHTIME finishTime,
|
|
|
|
|
SELECT distinct t2.ID id,
|
|
|
|
|
t2.PICTUREID pictureId,
|
|
|
|
|
t2.STATES states,
|
|
|
|
|
t2.PROCESSINSTANCEID processInstanceId,
|
|
|
|
|
t2.PROCESSDEFINITIONID processDefinitionId,
|
|
|
|
|
t2.DEPLOYMENTID deploymentId,
|
|
|
|
|
t2.ASSIGNEENAME assigneeName,
|
|
|
|
|
t2.ASSIGNEE assignee,
|
|
|
|
|
t2.FILEANNEX fileAnnex,
|
|
|
|
|
t2.GUIDANG guiDang,
|
|
|
|
|
t2.CREATEUSER createUser,
|
|
|
|
|
t2.CREATEUSERNAME createUserName,
|
|
|
|
|
t2.CREATEDATE createDate,
|
|
|
|
|
t2.USERID userId,
|
|
|
|
|
t2.USERNAME userName,
|
|
|
|
|
t2.FROMTASKID fromTaskId,
|
|
|
|
|
t2.FROMTASKNAME fromTaskName,
|
|
|
|
|
t2.FROMUSERID fromUserId,
|
|
|
|
|
t2.FROMPROJECTID fromProjectId,
|
|
|
|
|
t2.FROMPLANID fromPlanId,
|
|
|
|
|
t2.FROMUPTIME fromupTime,
|
|
|
|
|
t2.FROMSOURCEID fromSourceId,
|
|
|
|
|
t2.HAVEPOINTS havePoints,
|
|
|
|
|
t2.TASKNAME taskName,
|
|
|
|
|
t2.TASKID taskId,
|
|
|
|
|
t2.FROMUSERNAME fromUserName,
|
|
|
|
|
t2.FROMPROJECTNAME fromProjectName,
|
|
|
|
|
t2.FINISHTIME finishTime,
|
|
|
|
|
t1.imgUrl,
|
|
|
|
|
t1.submit_date_timestamp submitDateTimestamp,
|
|
|
|
|
t1.photo_date_timestamp photoDateTimestamp,
|
|
|
|
|
t1.similarity_score similarityScore,
|
|
|
|
|
t1.server_thumbnail_url serverThumbnailUrl,
|
|
|
|
|
COALESCE(
|
|
|
|
|
(SELECT t3.STATSHIS
|
|
|
|
|
FROM oa_userapprove_t t3
|
|
|
|
|
WHERE t3.FORMID = t2.ID
|
|
|
|
|
AND t3.TASKINDEX = (SELECT TASKNODE
|
|
|
|
|
FROM ocr_taskchild_picture
|
|
|
|
|
WHERE PICTUREID = #{pictureId})
|
|
|
|
|
LIMIT 1),
|
|
|
|
|
1) AS historyStates
|
|
|
|
|
t1.submit_date_timestamp submitDateTimestamp,
|
|
|
|
|
t1.photo_date_timestamp photoDateTimestamp,
|
|
|
|
|
t1.similarity_score similarityScore,
|
|
|
|
|
t1.server_thumbnail_url serverThumbnailUrl,
|
|
|
|
|
IF(EXISTS (SELECT STATSHIS FROM oa_userapprove_t WHERE FORMID = t2.ID and STATSHIS = 3), 3,
|
|
|
|
|
IFNULL((SELECT t3.STATSHIS
|
|
|
|
|
FROM oa_userapprove_t t3
|
|
|
|
|
WHERE t3.FORMID = t2.ID
|
|
|
|
|
and t3.TASKINDEX =
|
|
|
|
|
(SELECT TASKNODE
|
|
|
|
|
FROM ocr_taskchild_picture
|
|
|
|
|
WHERE PICTUREID = #{pictureId})
|
|
|
|
|
LIMIT 1), 1)) AS historyStates
|
|
|
|
|
FROM ocr_picture t1
|
|
|
|
|
LEFT JOIN ocr_taskchild_picture t2
|
|
|
|
|
on t1.ID = t2.PICTUREID
|
|
|
|
|