@ -188,7 +188,7 @@
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" >
and PICTURERESULT ${pictureresult.dataOp} ${pictureresult.likestar}#{pictureresult.value}${pictureresult.likeend}
and PICTURERESULT ${pictureresult.dataOp} ${pictureresult.likestar}#{pictureresult.value}${pictureresult.likeend}
@ -309,7 +309,7 @@
</if>
</if>
<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" >
and tcp.PICTURERESULT ${pictureresult.dataOp} ${pictureresult.likestar}#{pictureresult.value}${pictureresult.likeend}
and tcp.PICTURERESULT ${pictureresult.dataOp} ${pictureresult.likestar}#{pictureresult.value}${pictureresult.likeend}
@ -487,6 +487,147 @@
OR tcp.FROMTASKNAME LIKE CONCAT('%', #{fuzzyRetrieval.value}, '%')
OR tcp.FROMTASKNAME LIKE CONCAT('%', #{fuzzyRetrieval.value}, '%')
)
)
</if>
</if>
<!-- pic 相关条件检索 -->
<if test= "tenantname != null" >
and pic.tenantname ${tenantname.dataOp} ${tenantname.likestar}
<if test= "tenantname.value instanceof java.util.List" >
<foreach item= "item" collection= "tenantname.value" open= "" separator= "," close= "" >
#{item}
</foreach>
</if>
<if test= "!tenantname.value instanceof java.util.List" >
#{tenantname.value}
</if>
${tenantname.likeend}
</if>
<if test= "projectId != null" >
and pic.projectId ${projectId.dataOp} ${projectId.likestar}
<if test= "projectId.value instanceof java.util.List" >
<foreach item= "item" collection= "projectId.value" open= "" separator= "," close= "" >
#{item}
</foreach>
</if>
<if test= "!projectId.value instanceof java.util.List" >
#{projectId.value}
</if>
${projectId.likeend}
</if>
<if test= "projectIdName != null" >
and pic.projectIdName ${projectIdName.dataOp} ${projectIdName.likestar}
<if test= "projectIdName.value instanceof java.util.List" >
<foreach item= "item" collection= "projectIdName.value" open= "" separator= "," close= "" >
#{item}
</foreach>
</if>
<if test= "!projectIdName.value instanceof java.util.List" >
#{projectIdName.value}
</if>
${projectIdName.likeend}
</if>
<if test= "planId != null" >
and pic.planId ${planId.dataOp} ${planId.likestar}
<if test= "planId.value instanceof java.util.List" >
<foreach item= "item" collection= "planId.value" open= "" separator= "," close= "" >
#{item}
</foreach>
</if>
<if test= "!planId.value instanceof java.util.List" >
#{planId.value}
</if>
${planId.likeend}
</if>
<if test= "planName != null" >
and pic.planName ${planName.dataOp} ${planName.likestar}
<if test= "planName.value instanceof java.util.List" >
<foreach item= "item" collection= "planName.value" open= "" separator= "," close= "" >
#{item}
</foreach>
</if>
<if test= "!planName.value instanceof java.util.List" >
#{planName.value}
</if>
${planName.likeend}
</if>
<if test= "releaseArea != null" >
and pic.releaseArea ${releaseArea.dataOp} ${releaseArea.likestar}
<if test= "releaseArea.value instanceof java.util.List" >
<foreach item= "item" collection= "releaseArea.value" open= "" separator= "," close= "" >
#{item}
</foreach>
</if>
<if test= "!releaseArea.value instanceof java.util.List" >
#{releaseArea.value}
</if>
${releaseArea.likeend}
</if>
<if test= "field5 != null" >
and pic.field5 ${field5.dataOp} ${field5.likestar}
<if test= "field5.value instanceof java.util.List" >
<foreach item= "item" collection= "field5.value" open= "" separator= "," close= "" >
#{item}
</foreach>
</if>
<if test= "!field5.value instanceof java.util.List" >
#{field5.value}
</if>
${field5.likeend}
</if>
<if test= "field3 != null" >
and pic.field3 ${field3.dataOp} ${field3.likestar}
<if test= "field3.value instanceof java.util.List" >
<foreach item= "item" collection= "field3.value" open= "" separator= "," close= "" >
#{item}
</foreach>
</if>
<if test= "!field3.value instanceof java.util.List" >
#{field3.value}
</if>
${field3.likeend}
</if>
<if test= "field1 != null" >
and pic.field1 ${field1.dataOp} ${field1.likestar}
<if test= "field1.value instanceof java.util.List" >
<foreach item= "item" collection= "field1.value" open= "" separator= "," close= "" >
#{item}
</foreach>
</if>
<if test= "!field1.value instanceof java.util.List" >
#{field1.value}
</if>
${field1.likeend}
</if>
<if test= "field2 != null" >
and pic.field2 ${field2.dataOp} ${field2.likestar}
<if test= "field2.value instanceof java.util.List" >
<foreach item= "item" collection= "field2.value" open= "" separator= "," close= "" >
#{item}
</foreach>
</if>
<if test= "!field2.value instanceof java.util.List" >
#{field2.value}
</if>
${field2.likeend}
</if>
</trim>
</trim>
</where>
</where>
</sql>
</sql>
@ -561,7 +702,7 @@
<when test= "izuptimeStart.rulesOp == 'or' || izuptimeEnd.rulesOp == 'or'" >
<when test= "izuptimeStart.rulesOp == 'or' || izuptimeEnd.rulesOp == 'or'" >
<if test= "izuptimeEnd != null" >
<if test= "izuptimeEnd != null" >
and (tcp.FROMUPTIME ${izuptimeStart.dataOp} '${izuptimeStart.value}'
and (tcp.FROMUPTIME ${izuptimeStart.dataOp} '${izuptimeStart.value}'
or tcp.FROMUPTIME ${izuptimeEnd.dataOp} '${izuptimeEnd.value}')
or tcp.FROMUPTIME ${izuptimeEnd.dataOp} '${izuptimeEnd.value}')
</if>
</if>
</when>
</when>
<otherwise >
<otherwise >
@ -581,19 +722,19 @@
select tcp.*, pic.field11 reporttime, pic.similarity_score similarityscore from (
select tcp.*, pic.field11 reporttime, pic.similarity_score similarityscore from (
select tc.*
select tc.*
from ocr_taskchild_picture tc,
from ocr_taskchild_picture tc,
OA_USERFINAL_T uf
OA_USERFINAL_T uf
where tc.ID = uf.FORMID
where tc.ID = uf.FORMID
<if test= "thisLoginUserid != null" >
<if test= "thisLoginUserid != null" >
and uf.USERID ${thisLoginUserid.dataOp} ${thisLoginUserid.likestar}#{thisLoginUserid.value}${thisLoginUserid.likeend}
and uf.USERID ${thisLoginUserid.dataOp} ${thisLoginUserid.likestar}#{thisLoginUserid.value}${thisLoginUserid.likeend}
</if>
</if>
UNION
UNION
select
select
tc.*
tc.*
from ocr_taskchild_picture tc
from ocr_taskchild_picture tc
where tc.STATES = 5
where tc.STATES = 5
) as tcp
) as tcp
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
@ -644,44 +785,60 @@
parameterType="java.util.Map">
parameterType="java.util.Map">
select tcp.* from (
select tcp.* from (
select tc.*,
select tc.*,
uf.COMMENTHIS,
uf.COMMENTHIS,
uf.TASKNAME as TASKNAMEHIS,
uf.TASKNAME as TASKNAMEHIS,
uf.STATSHIS,
uf.STATSHIS,
uf.TASKNO,
uf.TASKNO,
uf.TASKINDEX as taskNodeIndex,
uf.TASKINDEX as taskNodeIndex,
op.field6 as fromCustomerLevel,
op.field6 as fromCustomerLevel,
op.releaseArea as fromCity,
op.releaseArea as fromCity,
op.is_repeat,
op.is_repeat,
tc.is_repeated_nodules as isRepeatedNodules
tc.is_repeated_nodules as isRepeatedNodules
from ocr_taskchild_picture tc
from ocr_taskchild_picture tc
LEFT JOIN OA_USERAPPROVE_T uf ON tc.ID = uf.ID LEFT JOIN OA_USERAPPROVE_T uf ON tc.ID = uf.ID
left join ocr_picture op on tc.PICTUREID = op.ID left join ocr_picture op on tc.PICTUREID = op.ID
where FIND_IN_SET(#{searchassignee}, tc.ASSIGNEE)
where FIND_IN_SET(#{searchassignee}, tc.ASSIGNEE)
and tc.TENANTID = #{searchtenantid}
and tc.TENANTID = #{searchtenantid}
and tc.STATES = 2
and tc.STATES = 2
and op.suspiciousfile = 0
and op.suspiciousfile = 0
<if test= "izApprovalStatus != null" >
<if test= "izApprovalStatus != null" >
${izApprovalStatus.rulesOp}
${izApprovalStatus.rulesOp}
( #{izApprovalStatus.value} ${izApprovalStatus.dataOp} COALESCE (uf.STATSHIS
(
, 1)
<if test= "!izApprovalStatus.value instanceof java.lang.String" >
)
<foreach item= "item" collection= "izApprovalStatus.value" open= "" separator= "OR" close= "" >
#{item} = COALESCE (uf.STATSHIS, 1)
</foreach>
</if>
<if test= "izApprovalStatus.value instanceof java.lang.String" >
#{izApprovalStatus.value} = COALESCE (uf.STATSHIS, 1)
</if>
)
</if>
</if>
UNION
UNION
select
select
tc.*, uf.COMMENTHIS, uf.TASKNAME as TASKNAMEHIS, uf.STATSHIS, uf.TASKNO, uf.TASKINDEX as taskNodeIndex, op.field6 as fromCustomerLevel, op.releaseArea as fromCity, op.is_repeat, tc.is_repeated_nodules as isRepeatedNodules
tc.*, uf.COMMENTHIS, uf.TASKNAME as TASKNAMEHIS, uf.STATSHIS, uf.TASKNO, uf.TASKINDEX as taskNodeIndex, op.field6 as fromCustomerLevel, op.releaseArea as fromCity, op.is_repeat, tc.is_repeated_nodules as isRepeatedNodules
from ocr_taskchild_picture tc, OA_USERAPPROVE_T uf, ocr_picture op
from ocr_taskchild_picture tc, OA_USERAPPROVE_T uf, ocr_picture op
where tc.ID = uf.FORMID
where tc.ID = uf.FORMID
and tc.PICTUREID = op.ID
and tc.PICTUREID = op.ID
and op.suspiciousfile = 0
and op.suspiciousfile = 0
and tc.TENANTID = #{searchtenantid}
and tc.TENANTID = #{searchtenantid}
<if test= "thisLoginUserid != null" >
<if test= "thisLoginUserid != null" >
and uf.USERID = #{thisLoginUserid}
and uf.USERID = #{thisLoginUserid}
</if>
</if>
<if test= "izApprovalStatus != null" >
<if test= "izApprovalStatus != null" >
${izApprovalStatus.rulesOp}
${izApprovalStatus.rulesOp}
( #{izApprovalStatus.value} ${izApprovalStatus.dataOp} COALESCE (uf.STATSHIS
(
, 1)
<if test= "!izApprovalStatus.value instanceof java.lang.String" >
)
<foreach item= "item" collection= "izApprovalStatus.value" open= "" separator= "OR" close= "" >
#{item} = COALESCE (uf.STATSHIS, 1)
</foreach>
</if>
<if test= "izApprovalStatus.value instanceof java.lang.String" >
#{izApprovalStatus.value} = COALESCE (uf.STATSHIS, 1)
</if>
)
</if>
</if>
) as tcp
) as tcp
<include refid= "Base_Where_union" >
<include refid= "Base_Where_union" >
@ -714,8 +871,16 @@
and op.suspiciousfile = 0
and op.suspiciousfile = 0
<if test= "izApprovalStatus != null" >
<if test= "izApprovalStatus != null" >
${izApprovalStatus.rulesOp}
${izApprovalStatus.rulesOp}
( #{izApprovalStatus.value} ${izApprovalStatus.dataOp} COALESCE (uf.STATSHIS
(
, 1)
<if test= "!izApprovalStatus.value instanceof java.lang.String" >
<foreach item= "item" collection= "izApprovalStatus.value" open= "" separator= "OR" close= "" >
#{item} = COALESCE (uf.STATSHIS, 1)
</foreach>
</if>
<if test= "izApprovalStatus.value instanceof java.lang.String" >
#{izApprovalStatus.value} = COALESCE (uf.STATSHIS, 1)
</if>
)
)
</if>
</if>
UNION
UNION
@ -730,8 +895,16 @@
</if>
</if>
<if test= "izApprovalStatus != null " >
<if test= "izApprovalStatus != null " >
${izApprovalStatus.rulesOp}
${izApprovalStatus.rulesOp}
( #{izApprovalStatus.value} ${izApprovalStatus.dataOp} COALESCE (uf.STATSHIS
(
, 1)
<if test= "!izApprovalStatus.value instanceof java.lang.String" >
<foreach item= "item" collection= "izApprovalStatus.value" open= "" separator= "OR" close= "" >
#{item} = COALESCE (uf.STATSHIS, 1)
</foreach>
</if>
<if test= "izApprovalStatus.value instanceof java.lang.String" >
#{izApprovalStatus.value} = COALESCE (uf.STATSHIS, 1)
</if>
)
)
</if>
</if>
) as tcp
) as tcp
@ -764,16 +937,16 @@
<select id= "queryExamineApprove" resultType= "cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPictureAppro" >
<select id= "queryExamineApprove" resultType= "cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPictureAppro" >
select tc.*,
select tc.*,
op.is_repeat,
op.is_repeat,
tc.is_repeated_nodules as isRepeatedNodules
tc.is_repeated_nodules as isRepeatedNodules
from ocr_taskchild_picture tc
from ocr_taskchild_picture tc
left join ocr_picture op on tc.PICTUREID = op.ID left join ocr_picture op on tc.PICTUREID = op.ID
where tc.TENANTID = #{tenantId}
where tc.TENANTID = #{tenantId}
and op.suspiciousfile = 0
and op.suspiciousfile = 0
and tc.ID IN
and tc.ID IN
<foreach item= "formId" collection= "formIdList" open= "(" separator= "," close= ")" >
<foreach item= "formId" collection= "formIdList" open= "(" separator= "," close= ")" >
#{formId}
#{formId}
</foreach>
</foreach>
</select>
</select>
<select id= "queryPendingApproval" resultType= "cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPictureAppro" >
<select id= "queryPendingApproval" resultType= "cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPictureAppro" >
select tc.*,
select tc.*,
@ -799,51 +972,51 @@
<select id= "getPictureHistoryList" resultType= "cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo" >
<select id= "getPictureHistoryList" resultType= "cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo" >
SELECT distinct t2.ID id,
SELECT distinct 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,
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,
t1.server_thumbnail_url serverThumbnailUrl, t1.server_thumbnail_url serverThumbnailUrl,
IF(EXISTS (SELECT STATSHIS IF(EXISTS (SELECT STATSHIS
FROM oa_userapprove_t FROM oa_userapprove_t
WHERE FORMID = t2.ID and STATSHIS = 3 and 'finale_judgment' = #{taskNode}), 3, WHERE FORMID = t2.ID and STATSHIS = 3 and 'finale_judgment' = #{taskNode}), 3,
IFNULL((SELECT t3.STATSHIS IFNULL((SELECT t3.STATSHIS
FROM oa_userapprove_t t3 FROM oa_userapprove_t t3
WHERE t3.FORMID = t2.ID WHERE t3.FORMID = t2.ID
and t3.TASKINDEX = #{taskNode} and t3.TASKINDEX = #{taskNode}
LIMIT 1), 1)) AS historyStates LIMIT 1), 1)) AS historyStates
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
where t1.suspiciousfile = 0
where t1.suspiciousfile = 0
and t1.ID in
and 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}
@ -914,50 +1087,50 @@
<select id= "getPackageSimilarityList" resultType= "cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo" >
<select id= "getPackageSimilarityList" resultType= "cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo" >
SELECT distinct t3.ID id,
SELECT distinct t3.ID id,
t3.PICTUREID pictureId, t3.PICTUREID pictureId,
t3.STATES states, t3.STATES states,
t3.PROCESSINSTANCEID processInstanceId, t3.PROCESSINSTANCEID processInstanceId,
t3.PROCESSDEFINITIONID processDefinitionId, t3.PROCESSDEFINITIONID processDefinitionId,
t3.DEPLOYMENTID deploymentId, t3.DEPLOYMENTID deploymentId,
t3.ASSIGNEENAME assigneeName, t3.ASSIGNEENAME assigneeName,
t3.ASSIGNEE assignee, t3.ASSIGNEE assignee,
t3.FILEANNEX fileAnnex, t3.FILEANNEX fileAnnex,
t3.GUIDANG guiDang, t3.GUIDANG guiDang,
t3.CREATEUSER createUser, t3.CREATEUSER createUser,
t3.CREATEUSERNAME createUserName, t3.CREATEUSERNAME createUserName,
t3.CREATEDATE createDate, t3.CREATEDATE createDate,
t3.USERID userId, t3.USERID userId,
t3.USERNAME userName, t3.USERNAME userName,
t3.FROMTASKID fromTaskId, t3.FROMTASKID fromTaskId,
t3.FROMTASKNAME fromTaskName, t3.FROMTASKNAME fromTaskName,
t3.FROMUSERID fromUserId, t3.FROMUSERID fromUserId,
t3.FROMPROJECTID fromProjectId, t3.FROMPROJECTID fromProjectId,
t3.FROMPLANID fromPlanId, t3.FROMPLANID fromPlanId,
t3.FROMUPTIME fromupTime, t3.FROMUPTIME fromupTime,
t3.FROMSOURCEID fromSourceId, t3.FROMSOURCEID fromSourceId,
t3.HAVEPOINTS havePoints, t3.HAVEPOINTS havePoints,
t3.TASKNAME taskName, t3.TASKNAME taskName,
t3.FROMUSERNAME fromUserName, t3.FROMUSERNAME fromUserName,
t3.FROMPROJECTNAME fromProjectName, t3.FROMPROJECTNAME fromProjectName,
t3.FINISHTIME finishTime, t3.FINISHTIME finishTime,
t3.TASKID taskId, t3.TASKID taskId,
t2.imgUrl, t2.imgUrl,
t2.submit_date_timestamp submitDateTimestamp, t2.submit_date_timestamp submitDateTimestamp,
t2.photo_date_timestamp photoDateTimestamp, t2.photo_date_timestamp photoDateTimestamp,
t2.server_thumbnail_url serverThumbnailUrl, t2.server_thumbnail_url serverThumbnailUrl,
t1.max_similarity maxSimilarity, t1.max_similarity maxSimilarity,
COALESCE( COALESCE(
(SELECT t4.STATSHIS (SELECT t4.STATSHIS
FROM oa_userapprove_t t4 FROM oa_userapprove_t t4
WHERE t4.FORMID = t3.ID WHERE t4.FORMID = t3.ID
ORDER BY t4.CREATEDATE DESC ORDER BY t4.CREATEDATE DESC
LIMIT 1), 1) AS historyStates, LIMIT 1), 1) AS historyStates,
t1.check_duplicate_id t1.check_duplicate_id
FROM ocr_check_duplicate_result t1
FROM ocr_check_duplicate_result t1
LEFT JOIN ocr_picture t2 ON t1.picture_id = t2.ID LEFT JOIN ocr_picture t2 ON t1.picture_id = t2.ID
LEFT JOIN ocr_taskchild_picture t3 ON t2.ID = t3.PICTUREID LEFT JOIN ocr_taskchild_picture t3 ON t2.ID = t3.PICTUREID
WHERE t1.check_duplicate_id = #{checkDuplicateId}
WHERE t1.check_duplicate_id = #{checkDuplicateId}
and t2.suspiciousfile = 0
and t2.suspiciousfile = 0
<if test= "pictureId != null and pictureId != ''" >
<if test= "pictureId != null and pictureId != ''" >
and t1.picture_id != #{pictureId}
and t1.picture_id != #{pictureId}
</if>
</if>
@ -971,43 +1144,43 @@
<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,
t1.server_thumbnail_url serverThumbnailUrl,
t1.server_thumbnail_url serverThumbnailUrl,
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}
@ -1016,33 +1189,32 @@
<select id= "listFinalTask" resultType= "cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture"
<select id= "listFinalTask" resultType= "cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture"
parameterType="java.util.Map">
parameterType="java.util.Map">
select distinct tcp.*,
select tcp.*,
pic.field11 reporttime,
pic.field11 reporttime,
pic.similarity_score similarityscore,
pic.similarity_score similarityscore,
pic.server_thumbnail_url serverThumbnailUrl,
pic.server_thumbnail_url serverThumbnailUrl,
pic.imgUrl imgUrl
pic.imgUrl imgUrl,
pic.field3 field3,
pic.planName planchildname,
pic.field14 field14,
pic.is_repeat is_repeat
from ocr_taskchild_picture tcp
from ocr_taskchild_picture tcp
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 tcp.ISFINAIL = 1
and tcp.ISFINAIL = 1
and pic.suspiciousfile = 0
and pic.suspiciousfile = 0
<if test= "thisLoginUserid != null and isFail == null" >
<if test= "thisLoginUserid != null and isFail == null" >
and FIND_IN_SET(#{thisLoginUserid.value}
and FIND_IN_SET(#{thisLoginUserid.value}
, tcp.ASSIGNEE)
, tcp.ASSIGNEE)
</if>
</if>
<if test= "thisLoginUserid != null and isFail != null" >
<if test= "thisLoginUserid != null and isFail != null" >
and (FIND_IN_SET(#{thisLoginUserid.value}
and (FIND_IN_SET(#{thisLoginUserid.value}
, tcp.ASSIGNEE) or
, tcp.ASSIGNEE)
<if test= "contractor != null" >
or tcp.STATES = 5)
if((select count(1) from ocr_contractor_task where tenant_id =#{tenantid.value} and pic.${contractor.value} = contractor and FIND_IN_SET(#{thisLoginUserid.value},task_user_assignee))>1, 1=1,tcp.STATES = 5)
</if>
<if test= "contractor == null" >
tcp.STATES = 5
</if>
)
</if>
</if>
<if test= "fromuptimeStart != null" >
<if test= "fromuptimeStart != null" >
and tcp.fromuptime > = ${fromuptimeStart.value}
and tcp.fromuptime > = ${fromuptimeStart.value}
</if>
</if>
Brian Lee
11 months ago