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

Merge pull request 'fix: 修改相似度列表' (#114) from feat/updateFlow-20240415 into test

Browse Source 
Reviewed-on: #114
pull/115/head
sunchenliang 1 year ago
parent 5de080f0d3 2743383f17
commit 43dd74c1b2
2 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File

5
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java
Unescape View File

@ -129,9 +129,10 @@ public class PrevailCloudApiImpl implements PrevailCloudApi {
@Override @Override
public void sendFlowTaskResult(String tenantId, String data) throws Exception { public void sendFlowTaskResult(String tenantId, String data) throws Exception {
RequestData requestData = ApiHelper.buildRequest(tenantId, apiConfig.getAccessKey(), apiConfig.getAccessCode(),data);//组装请求参数 ResultData<String> stringResultData = ApiHelper.buildResponse(apiConfig.getAccessCode(), data);
// RequestData requestData = ApiHelper.buildRequest(tenantId, apiConfig.getAccessKey(), apiConfig.getAccessCode(),data);//组装请求参数
String url = apiConfig.getInterfaceDomain()+sendResultUrl; String url = apiConfig.getInterfaceDomain()+sendResultUrl;
String requestBodyJson = JSONObject.toJSONString(requestData); String requestBodyJson = JSONObject.toJSONString(stringResultData);
//入参 //入参
System.out.println("入参数据:"+requestBodyJson); System.out.println("入参数据:"+requestBodyJson);
HttpParamers httpParamers = new HttpParamers(HttpMethod.POST); HttpParamers httpParamers = new HttpParamers(HttpMethod.POST);

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

@ -729,48 +729,48 @@
</select> </select>
<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,
COALESCE( IF(EXISTS (SELECT STATSHIS FROM oa_userapprove_t WHERE FORMID = t2.ID and STATSHIS = 3), 3,
(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 = (SELECT TASKNODE and t3.TASKINDEX =
FROM ocr_taskchild_picture (SELECT TASKNODE
WHERE PICTUREID = #{pictureId}) FROM ocr_taskchild_picture
LIMIT 1), WHERE PICTUREID = #{pictureId})
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

Write Preview
Loading…
Cancel
Save