Merge pull request 'fix/dubious_file_2897' (#46) from fix/dubious_file_2897 into test

Reviewed-on: #46

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java

@@ -62,7 +62,7 @@ public class OcrTaskchildDubiousFileController  {
     public ResultVo dubiousfilelist(HttpServletRequest request,
                                   @RequestParam(value = "pageNo", required = false, defaultValue = "0") Integer pageNo,
                                   @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
-                                    @RequestParam(value = "orderbyname", required = true, defaultValue = "desc") String orderbyname) {
+                                    @RequestParam(value = "orderbyname", required = true, defaultValue = "asc") String orderbyname) {
 
 
         String tenantId = request.getHeader("X-Tenant-Id");
@@ -72,28 +72,27 @@ public class OcrTaskchildDubiousFileController  {
 
         UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
 
-        QueryWrapper<OcrTaskchildDubiousFile> dubiouswrapper = new QueryWrapper<>();
-        dubiouswrapper.eq("userid",userToken.getUserid());
-        List<OcrTaskchildDubiousFile> list = ocrTaskchildDubiousFileService.list(dubiouswrapper);
-        if(list.size()==0){
-            return ResultVoUtil.success();
-        }
-        IPage<OcrPicture> iPage = new Page<>(Integer.valueOf(pageNo),Integer.valueOf(pageSize));
-
-        QueryWrapper<OcrPicture> wrapper = new QueryWrapper<>();
-        wrapper.in("ID",list.stream().map(i->i.getPictureId()).collect(Collectors.toList()));
-
-
-        if(orderbyname.equals("desc")){
-            wrapper.orderByDesc("create_time");
-        }else {
-            wrapper.orderByAsc("create_time");
-        }
-
-        IPage<OcrPicture> page = ocrpictureservice.page(iPage, wrapper);
-
-        //TODO
-        //Page<OcrTaskChildPictureVo>  page = ocrTaskchildDubiousFileService.dubiousfilelist(pageNo,pageSize,orderbyname,userToken,tenantId);
+//        QueryWrapper<OcrTaskchildDubiousFile> dubiouswrapper = new QueryWrapper<>();
+//        dubiouswrapper.eq("userid",userToken.getUserid());
+//        List<OcrTaskchildDubiousFile> list = ocrTaskchildDubiousFileService.list(dubiouswrapper);
+//        if(list.size()==0){
+//            return ResultVoUtil.success();
+//        }
+//        IPage<OcrPicture> iPage = new Page<>(Integer.valueOf(pageNo),Integer.valueOf(pageSize));
+//
+//        QueryWrapper<OcrPicture> wrapper = new QueryWrapper<>();
+//        wrapper.in("ID",list.stream().map(i->i.getPictureId()).collect(Collectors.toList()));
+//
+//
+//        if(orderbyname.equals("desc")){
+//            wrapper.orderByDesc("create_time");
+//        }else {
+//            wrapper.orderByAsc("create_time");
+//        }
+//
+//        //IPage<OcrPicture> page = ocrpictureservice.page(iPage, wrapper);
+
+        Page<OcrTaskChildPictureVo>  page = ocrTaskchildDubiousFileService.dubiousfilelist(pageNo,pageSize,orderbyname,userToken,tenantId);
 
         return ResultVoUtil.success(page);
     }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskchildPictureMybatisDao.java

@@ -49,6 +49,7 @@ public interface OcrTaskchildPictureMybatisDao extends BaseMapper<OcrTaskchildPi
     String selectocpicture(@Param("tenantid")String tenantid,@Param("packageid")String packageid,@Param("id")String id);
 
     List<OcrTaskChildPictureVo> getPictureHistoryList(@Param("pictureIds") List<String> pictureIds, @Param("taskname") String taskname);
+    List<OcrTaskChildPictureVo> getDubiousfileList(@Param("pictureIds") List<String> pictureIds, @Param("taskname") String taskname);
 
     PictureDetailVo getPictureDetail(String pictureId);
 

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrTaskchildPictureService.java

@@ -1,5 +1,6 @@
 package cn.jyjz.xiaoyao.ocr.service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -150,4 +151,5 @@ public interface OcrTaskchildPictureService extends BaseService<OcrTaskchildPict
 
     void sendFlowTaskResult(OcrTaskchildPicture taskchildPicture, OcrPicture picture, FlowApprove flowApprove);
 
+    List<OcrTaskChildPictureVo> getDubiousfileList(List<String> pictureIds, String userNodeType);
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildDubiousFileServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.jyjz.xiaoyao.ocr.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.jyjz.flowable.common.ProcessConstant;
 import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
 import cn.jyjz.xiaoyao.common.base.vo.UserToken;
@@ -60,37 +61,33 @@ public class OcrTaskchildDubiousFileServiceImpl extends ServiceImpl<OcrTaskchild
         dubiouswrapper.eq("tenantid",tenantId);
         List<OcrTaskchildDubiousFile> list = this.list(dubiouswrapper);
         if(list.size()==0){
-            return new Page<>();
+            return objectPage;
         }
 
         //提取可疑图片列表id
         List<String> pictureIdList = list.stream().map(i -> String.valueOf(i.getPictureId())).collect(Collectors.toList());
 
-        //获取图片历史对比表数据
+        //确定用户审批节点对应阶段的图片审核状态
         String userNodeType = ProcessConstant.userNodeType.getOrDefault(userToken.getNodeType(), "一级审批");
-        List<OcrTaskChildPictureVo> taskChildPictures = ocrTaskchildPictureService.getPictureHistoryList(new ArrayList<>(pictureIdList), userNodeType);
+        List<OcrTaskChildPictureVo> taskChildPictures = ocrTaskchildPictureService.getDubiousfileList(new ArrayList<>(pictureIdList), userNodeType);
 
+        if(CollUtil.isNotEmpty(taskChildPictures)){
+            //按时间字段排序
+            if("desc".equals(orderbyname)){
+                taskChildPictures.sort(Comparator.comparing(OcrTaskChildPictureVo::getSubmitDateTimestamp).reversed());
+            }else{
+                taskChildPictures.sort(Comparator.comparing(OcrTaskChildPictureVo::getSubmitDateTimestamp));
+            }
 
-//        //获取图片比对结果分数，状态
-//        for (OcrTaskChildPictureVo taskChildPicture : taskChildPictures) {
-////            taskChildPicture.setSimilarityScore(Integer.parseInt(jsonObject.getString(taskChildPicture.getPictureId().toString())));
-//        }
-
-        //按时间字段排序
-        if("desc".equals(orderbyname)){
-            taskChildPictures.stream().sorted(Comparator.comparing(OcrTaskChildPictureVo::getCreateDate).reversed()).collect(Collectors.toList());
-        }else {
-            taskChildPictures.stream().sorted(Comparator.comparing(OcrTaskChildPictureVo::getCreateDate)).collect(Collectors.toList());
-        }
-
-        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);
+            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());
         }
 
-        objectPage.setRecords(records);
-        objectPage.setTotal(taskChildPictures.size());
         return objectPage;
     }
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java

@@ -736,6 +736,11 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
 
     }
 
+    @Override
+    public List<OcrTaskChildPictureVo> getDubiousfileList(List<String> pictureIds, String taskname) {
+        return ocrtaskchildpicturemybatisdao.getDubiousfileList(pictureIds, taskname);
+    }
+
     private static ApproveNodeDto getApproveNodeDto(Userapprove userApprove) {
         ApproveNodeDto approveNode = new ApproveNodeDto();
         approveNode.setApproveRemark(userApprove.getTaskcomment());

jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml

@@ -768,4 +768,48 @@
             order by t2.create_time ${oderType}
         </if>
     </select>
+
+    <select id="getDubiousfileList" resultType="cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo">
+        SELECT t2.ID                    id,
+        t2.PICTUREID             pictureId,
+        t2.STATES                states,
+        t2.PROCESSINSTANCEID     processInstanceId,
+        t2.PROCESSDEFINITIONID   processDefinitionId,
+        t2.DEPLOYMENTID          deploymentId,
+        t2.ASSIGNEENAME          assigneeName,
+        t2.ASSIGNEE              assignee,
+        t2.FILEANNEX             fileAnnex,
+        t2.GUIDANG               guiDang,
+        t2.CREATEUSER            createUser,
+        t2.CREATEUSERNAME        createUserName,
+        t2.CREATEDATE            createDate,
+        t2.USERID                userId,
+        t2.USERNAME              userName,
+        t2.FROMTASKID            fromTaskId,
+        t2.FROMTASKNAME          fromTaskName,
+        t2.FROMUSERID            fromUserId,
+        t2.FROMPROJECTID         fromProjectId,
+        t2.FROMPLANID            fromPlanId,
+        t2.FROMUPTIME            fromupTime,
+        t2.FROMSOURCEID          fromSourceId,
+        t2.HAVEPOINTS            havePoints,
+        t2.TASKNAME              taskName,
+        t2.TASKID                taskId,
+        t2.FROMUSERNAME          fromUserName,
+        t2.FROMPROJECTNAME       fromProjectName,
+        t2.FINISHTIME            finishTime,
+        t1.imgUrl,
+        ifnull(t3.STATSHIS, 1)   historyStates,
+        t1.submit_date_timestamp submitDateTimestamp,
+        t1.photo_date_timestamp  photoDateTimestamp,
+        t1.similarity_score similarityScore
+        FROM ocr_picture t1
+        LEFT JOIN ocr_taskchild_picture t2
+        on t1.ID = t2.PICTUREID
+        LEFT JOIN oa_userapprove_t t3 on t2.ID = t3.FORMID and t3.TASKNAME = '${taskname}'
+        where t1.ID in
+        <foreach collection="pictureIds" open="(" close=")" item="item" separator="," index="index">
+            #{item}
+        </foreach>
+    </select>
 </mapper>