fix: 优化任务包主图 #145

Merged
sunchenliang merged 1 commits from fix/updatePictureSimilarity20240422 into test 1 year ago

@ -330,7 +330,11 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
@Override @Override
public OcrPicture getPackagePictureInfo(String checkDuplicateId, String pictureId, UserToken userToken) { public OcrPicture getPackagePictureInfo(String checkDuplicateId, String pictureId, UserToken userToken) {
OcrPicture ocrPicture = pictureMybatisDao.getPackagePictureInfo(checkDuplicateId,pictureId); OcrPicture ocrPicture = pictureMybatisDao.getPackagePictureInfo(checkDuplicateId,pictureId);
ocrPicture.getPictureInfo().setCreateTime(ocrPicture.getPhotoDateTimestamp()); OcrPictureInfo one = ocrPictureInfoService.getOne(new LambdaQueryWrapper<OcrPictureInfo>().eq(OcrPictureInfo::getPictureId, ocrPicture.getId()));
ocrPicture.setPictureInfo(one);
if(ObjectUtil.isNotEmpty(one)){
ocrPicture.getPictureInfo().setCreateTime(ocrPicture.getPhotoDateTimestamp());
}
return ocrPicture; return ocrPicture;
} }

@ -227,7 +227,6 @@
<select id="getPackagePictureInfo" resultMap="BaseResultMap"> <select id="getPackagePictureInfo" resultMap="BaseResultMap">
SELECT t2.*, SELECT t2.*,
t3.*,
t4.STATES, t4.STATES,
t4.TASKID, t4.TASKID,
t4.ID taskchildId, t4.ID taskchildId,
@ -240,7 +239,6 @@
1) AS historyStates 1) AS historyStates
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_picture_info t3 on t2.ID = t3.picture_id
left join ocr_taskchild_picture t4 on t2.ID = t4.PICTUREID left join ocr_taskchild_picture t4 on t2.ID = t4.PICTUREID
where t1.check_duplicate_id = #{packageId} where t1.check_duplicate_id = #{packageId}
and t2.suspiciousfile = 0 and t2.suspiciousfile = 0

@ -1084,7 +1084,6 @@
LIMIT 1), 1) AS historyStates LIMIT 1), 1) AS historyStates
from ocr_picture t2 from ocr_picture t2
LEFT JOIN ocr_taskchild_picture t3 ON t2.ID = t3.PICTUREID LEFT JOIN ocr_taskchild_picture t3 ON t2.ID = t3.PICTUREID
left join ocr_picture_info t5 on t2.ID = t5.picture_id
WHERE t2.suspiciousfile = 0 WHERE t2.suspiciousfile = 0
and t2.ID in and t2.ID in
<foreach collection="pictureIds" open="(" close=")" item="item" separator="," index="index"> <foreach collection="pictureIds" open="(" close=")" item="item" separator="," index="index">

Loading…
Cancel
Save