From 3221541f582a873c4b7c67014f32ebb50910683a Mon Sep 17 00:00:00 2001 From: DELL Date: Sun, 31 Mar 2024 18:18:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E4=B8=80=E9=94=AE?= =?UTF-8?q?=E6=9F=A5=E9=87=8D=E5=92=8C=E5=9B=BE=E5=AE=A1=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocr/controller/OcrAiApprovalTools.java | 2 +- .../ocr/dataDao/OcrSearchHistoryMapper.java | 4 +- .../ocr/service/IOcrSearchHistoryService.java | 2 +- .../impl/OcrSearchHistoryServiceImpl.java | 47 +++++++++++++------ .../mapper/oa/OcrSearchHistoryMapper.xml | 13 +++-- 5 files changed, 48 insertions(+), 20 deletions(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrAiApprovalTools.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrAiApprovalTools.java index 5da0a6a6..aa3720d8 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrAiApprovalTools.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrAiApprovalTools.java @@ -52,7 +52,7 @@ public class OcrAiApprovalTools { UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); - ResultVo toolscount = iocrsearchhistoryservice.toolscount(tenantId); + ResultVo toolscount = iocrsearchhistoryservice.toolscount(tenantId,userToken.getUserid()); return toolscount; } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java index 9284480c..ee45c32e 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java @@ -27,7 +27,9 @@ public interface OcrSearchHistoryMapper extends BaseMapper { - Map toolscount(@Param("tenantid")String tenantid); +// Map toolscount(@Param("tenantid")String tenantid); + + Map toolscount(@Param("userId")String userId); Map selectaisp(@Param("id")String id); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrSearchHistoryService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrSearchHistoryService.java index 70bb0c88..82e991e3 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrSearchHistoryService.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrSearchHistoryService.java @@ -19,7 +19,7 @@ import java.util.Map; public interface IOcrSearchHistoryService extends IService { Map>> selectsearch(String search, String assignee, String userId, String tenantId); - ResultVo toolscount(String tenantid); + ResultVo toolscount(String tenantid,String userId); Map selectaisp(String userid,String id,Integer nodeType); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java index 6afb6b9b..c287e517 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java @@ -1,8 +1,11 @@ package cn.jyjz.xiaoyao.ocr.service.impl; import cn.jyjz.xiaoyao.admin.dataobject.User; +import cn.jyjz.xiaoyao.common.base.service.UserTokenService; +import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil; import cn.jyjz.xiaoyao.common.base.vo.ResultVo; 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.dataobject.OcrPicture; @@ -62,18 +65,18 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl toolscount = ocrsearchhistorymapper.toolscount(tenantid); + Map toolscount = ocrsearchhistorymapper.toolscount(userId); return ResultVoUtil.success(toolscount); } @@ -121,25 +124,41 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl pictureIds = new ArrayList<>(); // 存储所有的pictureId + List pictureIds = new ArrayList<>(); // 存储所有的pictureId for (Map selectaisp : resultList) { Object pictureResult = selectaisp.get("pictureResult"); String pictureResultStr = pictureResult.toString(); if ("100.0".equals(pictureResultStr)) { similarComplete++; + Long pictureId = (Long) selectaisp.get("pictureId"); + if (pictureId != null) { + pictureIds.add(String.valueOf(pictureId)); // 转换为String + } } - Object pictureId = selectaisp.get("pictureId"); - if (pictureId != null) { - pictureIds.add(pictureId); + } + if(similarComplete==0){ + return Collections.emptyMap(); + } + List pendingApprovalList = new ArrayList<>(); // 存储待审批的pictureId集合 + List approvedList = new ArrayList<>(); // 存储通过的pictureId集合 + List failedList = new ArrayList<>(); // 存储不通过的pictureId集合 + List failedPictureIds = ocrPictureService.getPictureNodeStatesList(pictureIds, nodeType); + for (OcrPicture picture : failedPictureIds) { + if (picture.getHistoryStates() == 3) { + failedList.add(picture.getPictureid()); + } else if (picture.getHistoryStates() == 1) { + pendingApprovalList.add(picture.getPictureid()); + } else if (picture.getHistoryStates() == 2) { + approvedList.add(picture.getPictureid()); } } -// List failedPictureIds = fakeInterface.getFailedPictureIds(pictureIds,nodeType); // 假的接口，根据pictureId集合获取不通过的pictureId列表 -// int passedCount = pictureIds.size() - failedPictureIds.size(); // 通过的数量 -// int failedCount = failedPictureIds.size(); // 不通过的数量 + + int pendingApprovaCount = pendingApprovalList.size(); // 待审批的数量 + int passCount = approvedList.size(); // 通过的数量 mappedResults.put("similarComplete", similarComplete); -// mappedResults.put("passedCount", passedCount); -// mappedResults.put("failedCount", failedCount); -// mappedResults.put("failedPictureIds", failedPictureIds); + mappedResults.put("passCount", passCount); + mappedResults.put("pendingApprovaCount", pendingApprovaCount); + mappedResults.put("pictureIdList", pendingApprovalList); return mappedResults; } diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml index 60723532..5a91ecc4 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml @@ -59,11 +59,18 @@ + + + + + + +