From 193ab52f0269bc041f7b9c1d3efc084f74815ecb Mon Sep 17 00:00:00 2001 From: sunchenliang <2532527871@qq.com> Date: Mon, 1 Apr 2024 21:52:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20ai=E5=AE=A1=E6=89=B9=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=8F=8A=E7=9B=B8=E4=BC=BC=E5=BA=A6=E5=88=97=E8=A1=A8=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=9F=A5=E9=87=8D=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FlowTaskController.java | 2 +- .../flowable/service/IFlowTaskService.java | 2 +- .../service/impl/FlowTaskServiceImpl.java | 9 +-- .../oa/from/dataDao/FlowableccMybatisDao.java | 4 +- .../impl/OcrSearchHistoryServiceImpl.java | 26 +++++--- .../OcrTaskchildDubiousFileServiceImpl.java | 12 +--- .../impl/OcrTaskchildPictureServiceImpl.java | 4 -- .../xiaoyao/ocr/vo/OcrTaskChildPictureVo.java | 3 +- .../resources/mapper/oa/FlowableccMapper.xml | 63 ++++++++----------- .../mapper/oa/OcrTaskchildPictureMapper.xml | 4 +- 10 files changed, 59 insertions(+), 70 deletions(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java index 6955fe28..f9502c2f 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java @@ -678,7 +678,7 @@ public class FlowTaskController extends BaseController { @ResponseBody public ResultVo repetitionTaskList(@RequestParam(name = "pageNo") Integer pageNo, @RequestParam(name = "pageSize") Integer pageSize) { - IPage result = flowTaskService.repetitionTaskList(pageNo, pageSize); + Page result = flowTaskService.repetitionTaskList(pageNo, pageSize); return ResultVoUtil.success(result); } } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/IFlowTaskService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/IFlowTaskService.java index ed0fe759..f5759811 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/IFlowTaskService.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/IFlowTaskService.java @@ -179,5 +179,5 @@ public interface IFlowTaskService { */ ResultVo repetitionTask(); - IPage repetitionTaskList(Integer pageNo, Integer pageSize); + Page repetitionTaskList(Integer pageNo, Integer pageSize); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java index 7fa97212..4cfb3bde 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java @@ -1815,13 +1815,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask } @Override - public IPage repetitionTaskList(Integer pageNo, Integer pageSize) { + public Page repetitionTaskList(Integer pageNo, Integer pageSize) { Page page = new Page<>(pageNo, pageSize); - List result = flowableccMybatisDao.repetitionTaskList(); - List collect = result.stream().skip((pageNo - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); - page.setRecords(collect); - page.setTotal(result.size()); - return page; + Page result = flowableccMybatisDao.repetitionTaskList(page); + return result; } /** diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/dataDao/FlowableccMybatisDao.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/dataDao/FlowableccMybatisDao.java index 305d5315..0529ae1d 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/dataDao/FlowableccMybatisDao.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/dataDao/FlowableccMybatisDao.java @@ -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 { List repetitionTask(); - List repetitionTaskList(); + Page repetitionTaskList(Page page); } 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 8af318b2..d3eb782c 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,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 pendingApprovalList = new ArrayList<>(); // 存储待审批的pictureId集合 + List pendingApprovalList = new ArrayList<>(); // 存储待审批的pictureId集合 List approvedList = new ArrayList<>(); // 存储通过的pictureId集合 List failedList = new ArrayList<>(); // 存储不通过的pictureId集合 if(pictureIds.size()!=0){ - List failedPictureIds = ocrPictureService.getPictureNodeStatesList(pictureIds, nodeType); - for (OcrPicture picture : failedPictureIds) { + String userNodeType = ProcessConstant.userNodeType.getOrDefault(nodeType, "一级审批"); + List 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 records = taskChildPictures.stream().skip((pageNo - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); - for (OcrTaskChildPictureVo ocrTaskChildPictureVo : records) { - OcrPictureInfo one = pictureInfoService.getOne(new LambdaQueryWrapper().eq(OcrPictureInfo::getPictureId, ocrTaskChildPictureVo.getId())); - ocrTaskChildPictureVo.setPictureInfo(one); - } - objectPage.setRecords(records); - objectPage.setTotal(taskChildPictures.size()); - } - + List records = taskChildPictures.stream().skip((pageNo - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); + objectPage.setRecords(records); + objectPage.setTotal(taskChildPictures.size()); return objectPage; } } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java index 7e50a9bc..ec251a5c 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java @@ -693,10 +693,6 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl collect = taskChildPictures.stream().skip((pageNo - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); - for (OcrTaskChildPictureVo ocrTaskChildPictureVo : collect) { - OcrPictureInfo one = pictureInfoService.getOne(new LambdaQueryWrapper().eq(OcrPictureInfo::getPictureId, ocrTaskChildPictureVo.getId())); - ocrTaskChildPictureVo.setPictureInfo(one); - } objectPage.setRecords(collect); objectPage.setTotal(taskChildPictures.size()); return objectPage; diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskChildPictureVo.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskChildPictureVo.java index b869cdfb..cd777e4c 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskChildPictureVo.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskChildPictureVo.java @@ -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; } diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml index 4edb1b66..2b03280b 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml @@ -201,48 +201,39 @@ - - + + diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml index b8d4b346..6c9c4995 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml @@ -715,7 +715,7 @@ and t1.suspiciousfile = 0 - 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