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

fix: ai审批列表及相似度列表返回查重信息

Browse Source
pull/47/head^2
sunchenliang 1 year ago
parent 17a467d3f6
commit 3c40ab3da8
10 changed files with 56 additions and 66 deletions
Show Stats Download Patch File Download Diff File

2
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java
Unescape View File

@ -678,7 +678,7 @@ public class FlowTaskController extends BaseController {
@ResponseBody
public ResultVo repetitionTaskList(@RequestParam(name = "pageNo") Integer pageNo,
@RequestParam(name = "pageSize") Integer pageSize) {
IPage<OcrTaskchildPicture> result = flowTaskService.repetitionTaskList(pageNo, pageSize);
Page<OcrTaskchildPicture> result = flowTaskService.repetitionTaskList(pageNo, pageSize);
return ResultVoUtil.success(result);
}
}

2
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/IFlowTaskService.java
Unescape View File

@ -179,5 +179,5 @@ public interface IFlowTaskService {
*/
ResultVo repetitionTask();
IPage<OcrTaskchildPicture> repetitionTaskList(Integer pageNo, Integer pageSize);
Page<OcrTaskchildPicture> repetitionTaskList(Integer pageNo, Integer pageSize);
}

9
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java
Unescape View File

@ -1815,13 +1815,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
}
@Override
public IPage<OcrTaskchildPicture> repetitionTaskList(Integer pageNo, Integer pageSize) {
public Page<OcrTaskchildPicture> repetitionTaskList(Integer pageNo, Integer pageSize) {
Page<OcrTaskchildPicture> page = new Page<>(pageNo, pageSize);
List<OcrTaskchildPicture> result = flowableccMybatisDao.repetitionTaskList();
List<OcrTaskchildPicture> collect = result.stream().skip((pageNo - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
page.setRecords(collect);
page.setTotal(result.size());
return page;
Page<OcrTaskchildPicture> result = flowableccMybatisDao.repetitionTaskList(page);
return result;
}
/**

4
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/dataDao/FlowableccMybatisDao.java
Unescape View File

@ -3,10 +3,8 @@ package cn.jyjz.xiaoyao.oa.from.dataDao;
import cn.jyjz.xiaoyao.oa.from.dataobject.Flowablecc;
import cn.jyjz.xiaoyao.oa.from.vo.FlowUnionVo;
import cn.jyjz.xiaoyao.oa.from.vo.RepeatedContentVo;
import cn.jyjz.xiaoyao.oa.from.vo.RepeatedTaskVo;
import cn.jyjz.xiaoyao.oa.from.vo.UserDistionaryVo;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture;
import cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Mapper;
@ -43,5 +41,5 @@ public interface FlowableccMybatisDao extends BaseMapper<Flowablecc> {
List<RepeatedContentVo> repetitionTask();
List<OcrTaskchildPicture> repetitionTaskList();
Page<OcrTaskchildPicture> repetitionTaskList(Page<OcrTaskchildPicture> page);
}

26
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java
Unescape View File

@ -1,6 +1,8 @@
package cn.jyjz.xiaoyao.ocr.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.jyjz.flowable.common.ProcessConstant;
import cn.jyjz.flowable.entity.FlowTaskInfo;
import cn.jyjz.flowable.service.IFlowTaskService;
import cn.jyjz.flowable.utils.PageUtils;
import cn.jyjz.xiaoyao.admin.dataobject.SFrontmenuT;
@ -16,12 +18,15 @@ import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
import cn.jyjz.xiaoyao.common.base.vo.UserToken;
import cn.jyjz.xiaoyao.common.redis.cache.ICacheManager;
import cn.jyjz.xiaoyao.common.redis.cache.constants.CacheConstants;
import cn.jyjz.xiaoyao.ocr.dataDao.OcrTaskchildPictureMybatisDao;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrSearchHistory;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPictureAppro;
import cn.jyjz.xiaoyao.ocr.service.IOcrSearchHistoryService;
import cn.jyjz.xiaoyao.ocr.service.OcrPictureService;
import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService;
import cn.jyjz.xiaoyao.ocr.util.FrontMenuEnum;
import cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -57,6 +62,8 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
@Resource
private OcrPictureService ocrPictureService;
@Resource
private OcrTaskchildPictureMybatisDao taskchildPictureMybatisDao;
@Resource
private UserService userService;
@ -191,18 +198,23 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
}
}
List<String> pendingApprovalList = new ArrayList<>(); // 存储待审批的pictureId集合
List<FlowTaskInfo> pendingApprovalList = new ArrayList<>(); // 存储待审批的pictureId集合
List<String> approvedList = new ArrayList<>(); // 存储通过的pictureId集合
List<String> failedList = new ArrayList<>(); // 存储不通过的pictureId集合
if(pictureIds.size()!=0){
List<OcrPicture> failedPictureIds = ocrPictureService.getPictureNodeStatesList(pictureIds, nodeType);
for (OcrPicture picture : failedPictureIds) {
String userNodeType = ProcessConstant.userNodeType.getOrDefault(nodeType, "一级审批");
List<OcrTaskChildPictureVo> failedPictureIds = taskchildPictureMybatisDao.getPictureHistoryList(pictureIds, userNodeType);
for (OcrTaskChildPictureVo picture : failedPictureIds) {
if (picture.getHistoryStates() == 3) {
failedList.add(picture.getRemark());
failedList.add(picture.getId());
} else if (picture.getHistoryStates() == 1) {
pendingApprovalList.add(picture.getRemark());
FlowTaskInfo flowTaskInfo = new FlowTaskInfo();
flowTaskInfo.setFormId(picture.getId());
flowTaskInfo.setTaskId(picture.getTaskId());
flowTaskInfo.setTaskName(picture.getTaskName());
pendingApprovalList.add(flowTaskInfo);
} else if (picture.getHistoryStates() == 2) {
approvedList.add(picture.getRemark());
approvedList.add(picture.getId());
}
}
}
@ -212,7 +224,7 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
mappedResults.put("similarComplete", similarComplete);
mappedResults.put("passCount", passCount);
mappedResults.put("pendingApprovaCount", pendingApprovaCount);
mappedResults.put("taskIdList", pendingApprovalList);
mappedResults.put("flowTaskInfoList", pendingApprovalList);
return mappedResults;
}

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

@ -84,11 +84,6 @@ public class OcrTaskchildDubiousFileServiceImpl extends ServiceImpl<OcrTaskchild
}
List<OcrTaskChildPictureVo> records = taskChildPictures.stream().skip((pageNo - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
for (OcrTaskChildPictureVo ocrTaskChildPictureVo : records) {
OcrPictureInfo one = pictureInfoService.getOne(new LambdaQueryWrapper<OcrPictureInfo>().eq(OcrPictureInfo::getPictureId, ocrTaskChildPictureVo.getId()));
ocrTaskChildPictureVo.setPictureInfo(one);
}
objectPage.setRecords(records);
objectPage.setTotal(taskChildPictures.size());
return objectPage;

4
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java
Unescape View File

@ -693,10 +693,6 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
}
}
List<OcrTaskChildPictureVo> collect = taskChildPictures.stream().skip((pageNo - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
for (OcrTaskChildPictureVo ocrTaskChildPictureVo : collect) {
OcrPictureInfo one = pictureInfoService.getOne(new LambdaQueryWrapper<OcrPictureInfo>().eq(OcrPictureInfo::getPictureId, ocrTaskChildPictureVo.getId()));
ocrTaskChildPictureVo.setPictureInfo(one);
}
objectPage.setRecords(collect);
objectPage.setTotal(taskChildPictures.size());
return objectPage;

3
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskChildPictureVo.java
Unescape View File

@ -168,6 +168,7 @@ public class OcrTaskChildPictureVo implements java.io.Serializable {
@ApiModelProperty(value = "拍照时间")
private String photoDateTimestamp;
private OcrPictureInfo pictureInfo;
@ApiModelProperty(value = "查重id")
private String checkDuplicateId;
}

63
jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml
Unescape View File

@ -201,48 +201,39 @@
</select>
<select id="repetitionTask" resultMap="resultMap">
SELECT t1.count,
t1.content,
t1.id,
t1.imgUrl,
t3.similarity_score similarityScore,
t2.STATES,
t3.remark fromTaskId,
t3.taskName,
t2.TASKNAME nodeName,
t2.FROMUPTIME fromTime,
t2.UPDATETIME updateTime,
SELECT t1.count,
t1.content,
t1.id,
t1.imgUrl,
t3.similarity_score similarityScore,
t2.STATES,
t3.remark fromTaskId,
t3.taskName,
t2.TASKNAME nodeName,
t2.FROMUPTIME fromTime,
t2.UPDATETIME updateTime,
t2.TASKID taskId,
t2.ID formId
from (select count(field8) count, field8 content, ID id, imgUrl
FROM ocr_picture
where ID in (select child.PICTUREID from oa_userfinal_t final left join ocr_taskchild_picture child on final.FORMID = child.ID)
GROUP BY field8
HAVING count(field8) > 1) t1
LEFT JOIN ocr_taskchild_picture t2 ON t1.ID = t2.PICTUREID
LEFT JOIN ocr_picture t3 on t1.content = t3.field8
</select>
<select id="repetitionTaskList" resultType="cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture">
SELECT t2.*
<!-- t1.content,-->
<!-- t1.id,-->
<!-- t1.imgUrl,-->
<!-- t3.similarity_score similarityScore,-->
<!-- t2.STATES,-->
<!-- t3.remark fromTaskId,-->
<!-- t3.taskName,-->
<!-- t2.TASKNAME nodeName,-->
<!-- t2.FROMUPTIME fromTime,-->
<!-- t2.UPDATETIME updateTime,-->
<!-- t2.TASKID taskId,-->
<!-- t2.ID formId-->
from (select field8 content, ID id, imgUrl
from (select count(field8) count, field8 content, ID id, imgUrl
FROM ocr_picture
where ID in (select child.PICTUREID from oa_userfinal_t final left join ocr_taskchild_picture child on final.FORMID = child.ID)
GROUP BY field8
HAVING count(field8) > 1) t1
LEFT JOIN ocr_taskchild_picture t2 ON t1.ID = t2.PICTUREID
LEFT JOIN ocr_picture t3 on t1.content = t3.field8
LEFT JOIN ocr_picture t3 on t1.id = t3.ID
</select>
<select id="repetitionTaskList" resultType="cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture">
SELECT t2.*
FROM oa_userfinal_t t1
LEFT JOIN ocr_taskchild_picture t2 ON t2.ID = t1.FORMID
LEFT JOIN ocr_picture t3 ON t2.PICTUREID = t3.ID
WHERE t3.field8 IN (SELECT t3.field8
FROM oa_userfinal_t t1
LEFT JOIN
ocr_taskchild_picture t2 on t1.FORMID = t2.ID
LEFT JOIN ocr_picture t3 on t2.PICTUREID = t3.ID
GROUP BY t3.field8
HAVING count(t3.field8) > 1)
</select>
</mapper>

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

@ -715,7 +715,7 @@
and t1.suspiciousfile = 0
</select>
<select id="getPackageSimilarityList" resultMap="taskResultMap">
<select id="getPackageSimilarityList" resultType="cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo">
SELECT t3.ID id,
t3.PICTUREID pictureId,
t3.STATES states,
@ -750,7 +750,7 @@
t2.server_thumbnail_url serverThumbnailUrl,
t1.max_similarity maxSimilarity,
ifnull(t4.STATSHIS, 1) historyStates,
t5.*
t1.check_duplicate_id
FROM ocr_check_duplicate_result t1
LEFT JOIN ocr_picture t2 ON t1.picture_id = t2.ID
LEFT JOIN ocr_taskchild_picture t3 ON t2.ID = t3.PICTUREID

Write Preview
Loading…
Cancel
Save