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 4aaa606c..88247176 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
@@ -383,10 +383,10 @@ public class FlowTaskController extends BaseController {
                                                        @RequestParam(name = "izstatus", defaultValue = "", required = false) String izstatus,
                                                        @RequestParam(name = "iztaskrrom", defaultValue = "", required = false) String iztaskrrom,
                                                        @RequestParam(name = "izuptime", defaultValue = "", required = false) String izuptime,
+                                                       @RequestParam(name = "isFail", defaultValue = "false", required = false) String isFail,
                                                        HttpServletRequest request) {
         SearchQuery searchQuery = new SearchQuery();
         if (org.springframework.util.StringUtils.hasText(izupuser)) {
-//            searchQuery.addEqual("fromuserid",izupuser);
             if (izupuser.contains(",")) {
                 String[] userIds = izupuser.split(",");
                 List<String> arrayData = Arrays.asList(userIds);
@@ -422,17 +422,22 @@ public class FlowTaskController extends BaseController {
             if (izstatus.contains(",")) {
                 String[] statusIds = izstatus.split(","); // 以逗号拆分字符串
                 List<String> arrayData = Arrays.asList(statusIds);
-                SearchQueryForm searchQueryForm = new SearchQueryForm();
                 searchQuery.addIn("states", arrayData);
             } else {
                 searchQuery.addEqual("states", izstatus);
             }
+        }else{
+            if(Boolean.parseBoolean(isFail)){
+                searchQuery.addEqual("isFail","1");
+                searchQuery.addIn("states", Arrays.asList("2","3","5"));
+            }else{
+                searchQuery.addIn("states", Arrays.asList("2","3"));
+            }
         }
         if (org.springframework.util.StringUtils.hasText(iztaskrrom)) {
             if (iztaskrrom.contains(",")) {
                 String[] taskrromIds = iztaskrrom.split(","); // 以逗号拆分字符串
                 List<String> arrayData = Arrays.asList(taskrromIds);
-                SearchQueryForm searchQueryForm = new SearchQueryForm();
                 searchQuery.addIn("fromsourceid", arrayData);
             } else {
                 searchQuery.addEqual("fromsourceid", iztaskrrom);
@@ -474,7 +479,7 @@ public class FlowTaskController extends BaseController {
         User user = this.userService.getSessionUser(request);
         if (user.isUserIsSys(xiaoyaoConfig.getWebconfig().getSysLoginUser().split(","))) {
         } else {
-            searchQuery.addEqual("thisLoginUserid", user.getId().toString());
+            searchQuery.addEqual("thisLoginUserid", user.getLoginname());
             searchQuery.addEqual("tenantid", tenantId);
         }
         String searchId = request.getParameter("searchId");
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 251afd20..ca77406f 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
@@ -500,6 +500,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         } else {
             //判断节点上的描述字段，是否伟finale_judgment,如果是，记录到终审表中，如果终审表已经存在，不再重复记录
             if (StringUtils.isNotBlank(taskData.getDescription()) && taskData.getDescription().equals(SystemConstantsOa.OA_TASK_COMPLETE_FINALE_FORM)) {
+                childPicture.setIsFinal(1);
                 User user = userService.findByLoginname(formData.getAssignee());
                 userFinalService.save(user.getId().toString(), formId);
             }
@@ -545,6 +546,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         executions.forEach(execution -> executionIds.add(execution.getId()));
         OcrTaskchildPicture taskchildPicture = ocrTaskchildPictureService.getById(Long.parseLong(formId));
         taskchildPicture.setFinishtime(System.currentTimeMillis());
+        taskchildPicture.setIsFinal(1);
         ocrTaskchildPictureService.updateById(taskchildPicture);
         OcrPicture picture = ocrPictureService.getById(taskchildPicture.getPictureid());
         ocrTaskchildPictureService.sendFlowTaskResult(taskchildPicture, picture, approve);
@@ -982,6 +984,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         ParamterPage paramterPage = new ParamterPage();
         paramterPage.setStart((pageUtils.getCurrPage() - 1) * pageUtils.getPageSize());
         paramterPage.setPagesize(pageUtils.getPageSize());
+        Page<OcrTaskchildPicture> page = new Page<>();
 
         if (StringUtils.isNotBlank(pageUtils.getSortname())) {
             paramterPage.setSortname(pageUtils.getSortname());
@@ -995,97 +998,96 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             paramterPage.setSortorder("DESC");
         }
 
-        Long count = ocrTaskchildPictureService.listFinalCount(query);
-
         query.put("page", paramterPage);
+        Long count = ocrTaskchildPictureService.listFinalCount(query);
         List<OcrTaskchildPicture> list = ocrTaskchildPictureService.listFinal(query);
 
-        for (OcrTaskchildPicture taskchildPicture : list) {
-            //查询对应的流程分类
-            Category category = categoryService.selectDtoById(taskchildPicture.getCategoryid());
-            taskchildPicture.setCategoryDto(category);
-
-            if (StringUtils.isNotBlank(taskchildPicture.getProcessdefinitionid())) {
-
-                List<Task> taskList = this.nowRunTask(taskchildPicture.getProcessinstanceid(), taskchildPicture.getProcessdefinitionid());
-                if (null != taskList && !taskList.isEmpty()) {
-                    taskchildPicture.setTaskId(taskList.get(0).getId());
-
-                    Task tasknow = taskService.createTaskQuery().taskId(taskchildPicture.getTaskId()).singleResult();
-                    BpmnModel bpmnModel = repositoryService.getBpmnModel(tasknow.getProcessDefinitionId());
-                    // 获取节点定义id
-                    String taskDefinitionKey = tasknow.getTaskDefinitionKey();
-                    // 根据节点定义id获取节点元素
-                    FlowElement flowElement = bpmnModel.getFlowElement(taskDefinitionKey);
-                    if (flowElement instanceof UserTask) {
-                        UserTask userTask = (UserTask) flowElement;
-
-                        taskchildPicture.setDocumentation(userTask.getDocumentation());
-                    }
-                }
-
-                //查询历史
-                List<HistoricTaskInstanceDto> historicTaskInstanceDtos = new ArrayList<>();
-                // 查询当前任务的流转信息
-                List<HistoricTaskInstance> taskHiInstances = historyService.createHistoricTaskInstanceQuery()
-                        .processInstanceId(taskchildPicture.getProcessinstanceid())
-                        .includeProcessVariables()
-                        .orderByHistoricTaskInstanceStartTime()
-                        .asc()
-                        .list();
-                for (HistoricTaskInstance taskHiInstance : taskHiInstances) {
-                    HistoricTaskInstanceDto dto = new HistoricTaskInstanceDto();
-                    dto.setTaskId(taskHiInstance.getId());
-                    dto.setTaskName(taskHiInstance.getName());
-                    dto.setFinishTime(taskHiInstance.getEndTime());
-                    if (taskHiInstance.getDurationInMillis() != null) {
-                        dto.setDuration(taskHiInstance.getDurationInMillis() / 1000 + "秒");
-                    }
-                    dto.setTaskDefKey(taskHiInstance.getTaskDefinitionKey());
-
-                    //Map<String,Object> variables = taskHiInstance.getTaskLocalVariables();
-
-                    Map<String, Object> variables = taskHiInstance.getProcessVariables();
-
-                    if (null != variables && null != variables.get("approvd")) {
-                        dto.setState(variables.get("approvd").toString());
-                    }
-
-                    if (StringUtils.isNotBlank(taskHiInstance.getAssignee())) {
-                        if (SystemConstantsOa.OA_TASK_SKIP_ASSIGINE.equals(taskHiInstance.getAssignee())) {
-                            dto.setAssigneeName(taskHiInstance.getAssignee());
-                        } else {
-                            User user1 = userService.findByLoginname(taskHiInstance.getAssignee());
-
-                            dto.setAssigneeName(user1.getUsername());
-                        }
-
-                    }
-
-                    BpmnModel bpmnModel = repositoryService.getBpmnModel(taskchildPicture.getProcessdefinitionid());
-
-//                // 根据节点定义id获取节点元素
-                    FlowElement flowElement = bpmnModel.getFlowElement(taskHiInstance.getTaskDefinitionKey());
-                    if (flowElement instanceof UserTask) {
-                        UserTask userTask = (UserTask) flowElement;
-
-                        taskchildPicture.setDocumentation(userTask.getDocumentation());
-                    }
-                    // 还需要根据 HistoricTaskInstance 找到对应的 审批意见
-                    List<Comment> processInstanceComments = taskService.getProcessInstanceComments(taskchildPicture.getProcessinstanceid());
-                    for (Comment comment : processInstanceComments) {
-
-                        if (comment.getTaskId().equals(taskHiInstance.getId())) {
-                            // 审批意见
-                            String fullMessage = comment.getFullMessage();
-                            dto.setComment(fullMessage);
-                        }
-                    }
-                    historicTaskInstanceDtos.add(dto);
-                }
-                taskchildPicture.setTransferRecords(historicTaskInstanceDtos);
-            }
-        }
+//        for (OcrTaskchildPicture taskchildPicture : list) {
+//            //查询对应的流程分类
+//            Category category = categoryService.selectDtoById(taskchildPicture.getCategoryid());
+//            taskchildPicture.setCategoryDto(category);
+//
+//            if (StringUtils.isNotBlank(taskchildPicture.getProcessdefinitionid())) {
+//
+//                List<Task> taskList = this.nowRunTask(taskchildPicture.getProcessinstanceid(), taskchildPicture.getProcessdefinitionid());
+//                if (null != taskList && !taskList.isEmpty()) {
+//                    taskchildPicture.setTaskId(taskList.get(0).getId());
+//
+//                    Task tasknow = taskService.createTaskQuery().taskId(taskchildPicture.getTaskId()).singleResult();
+//                    BpmnModel bpmnModel = repositoryService.getBpmnModel(tasknow.getProcessDefinitionId());
+//                    // 获取节点定义id
+//                    String taskDefinitionKey = tasknow.getTaskDefinitionKey();
+//                    // 根据节点定义id获取节点元素
+//                    FlowElement flowElement = bpmnModel.getFlowElement(taskDefinitionKey);
+//                    if (flowElement instanceof UserTask) {
+//                        UserTask userTask = (UserTask) flowElement;
+//
+//                        taskchildPicture.setDocumentation(userTask.getDocumentation());
+//                    }
+//                }
+//
+//                //查询历史
+//                List<HistoricTaskInstanceDto> historicTaskInstanceDtos = new ArrayList<>();
+//                // 查询当前任务的流转信息
+//                List<HistoricTaskInstance> taskHiInstances = historyService.createHistoricTaskInstanceQuery()
+//                        .processInstanceId(taskchildPicture.getProcessinstanceid())
+//                        .includeProcessVariables()
+//                        .orderByHistoricTaskInstanceStartTime()
+//                        .asc()
+//                        .list();
+//                for (HistoricTaskInstance taskHiInstance : taskHiInstances) {
+//                    HistoricTaskInstanceDto dto = new HistoricTaskInstanceDto();
+//                    dto.setTaskId(taskHiInstance.getId());
+//                    dto.setTaskName(taskHiInstance.getName());
+//                    dto.setFinishTime(taskHiInstance.getEndTime());
+//                    if (taskHiInstance.getDurationInMillis() != null) {
+//                        dto.setDuration(taskHiInstance.getDurationInMillis() / 1000 + "秒");
+//                    }
+//                    dto.setTaskDefKey(taskHiInstance.getTaskDefinitionKey());
+//
+//                    //Map<String,Object> variables = taskHiInstance.getTaskLocalVariables();
+//
+//                    Map<String, Object> variables = taskHiInstance.getProcessVariables();
+//
+//                    if (null != variables && null != variables.get("approvd")) {
+//                        dto.setState(variables.get("approvd").toString());
+//                    }
+//
+//                    if (StringUtils.isNotBlank(taskHiInstance.getAssignee())) {
+//                        if (SystemConstantsOa.OA_TASK_SKIP_ASSIGINE.equals(taskHiInstance.getAssignee())) {
+//                            dto.setAssigneeName(taskHiInstance.getAssignee());
+//                        } else {
+//                            User user1 = userService.findByLoginname(taskHiInstance.getAssignee());
+//
+//                            dto.setAssigneeName(user1.getUsername());
+//                        }
+//
+//                    }
+//
+//                    BpmnModel bpmnModel = repositoryService.getBpmnModel(taskchildPicture.getProcessdefinitionid());
+//
+////                // 根据节点定义id获取节点元素
+//                    FlowElement flowElement = bpmnModel.getFlowElement(taskHiInstance.getTaskDefinitionKey());
+//                    if (flowElement instanceof UserTask) {
+//                        UserTask userTask = (UserTask) flowElement;
+//
+//                        taskchildPicture.setDocumentation(userTask.getDocumentation());
+//                    }
+//                    // 还需要根据 HistoricTaskInstance 找到对应的 审批意见
+//                    List<Comment> processInstanceComments = taskService.getProcessInstanceComments(taskchildPicture.getProcessinstanceid());
+//                    for (Comment comment : processInstanceComments) {
+//
+//                        if (comment.getTaskId().equals(taskHiInstance.getId())) {
+//                            // 审批意见
+//                            String fullMessage = comment.getFullMessage();
+//                            dto.setComment(fullMessage);
+//                        }
+//                    }
+//                    historicTaskInstanceDtos.add(dto);
+//                }
+//                taskchildPicture.setTransferRecords(historicTaskInstanceDtos);
+//            }
+//        }
 
         pageUtils.setTotalCount(count.intValue());
         pageUtils.setList(list);
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/impl/UserapproveServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/impl/UserapproveServiceImpl.java
index 2274baca..ebae4e76 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/impl/UserapproveServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/impl/UserapproveServiceImpl.java
@@ -9,6 +9,7 @@ import cn.jyjz.xiaoyao.oa.from.dataobject.Userapprove;
 import cn.jyjz.xiaoyao.oa.from.service.UserapproveService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.flowable.task.api.Task;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -29,10 +30,11 @@ public class UserapproveServiceImpl extends BaseServiceImpl<UserapproveMybatisDa
         userapprove.setFormid(Long.parseLong(formId));
         userapprove.setTaskname(taskd.getName());
         userapprove.setTaskcomment(approve.getComment());
+        userapprove.setTaskindex(StringUtils.isBlank(taskd.getDescription()) ?0:Integer.parseInt(taskd.getDescription()));
         userapprove.setCreatedate(System.currentTimeMillis());
         userapprove.setUsername(userToken.getUsername());
         userapprove.setReason(approve.getFailCauseName());
-        userapprove.setReason(approve.getDisposeType());
+        userapprove.setProcessMethod(approve.getDisposeType());
         if (approve.getResult()) {
             userapprove.setStatshis(2);
         } else {
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/utils/ApiConfig.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/utils/ApiConfig.java
index 2eea963e..9407bf57 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/utils/ApiConfig.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/utils/ApiConfig.java
@@ -46,7 +46,6 @@ public class ApiConfig {
      */
     private Integer readTimeout = 60000;
 
-    @Value("${ocr.api.wly.localImagePath}")
     private String localImagePath;
 
     /**
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java
index fbeb607d..116c58b0 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java
@@ -401,10 +401,8 @@ public class OcrTaskchildPictureController extends BaseController {
             @RequestParam(name = "orderType") String orderType,
             @RequestParam(name = "orderName") String orderName,
             @RequestParam(name = "checkDuplicateId") String checkDuplicateId,
-            @RequestParam(name = "pictureId") String pictureId,
-            HttpServletRequest request) {
-        UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
-        Page<OcrTaskChildPictureVo> result = ocrTaskchildPictureService.getPackageSimilarityList(pageNo, pageSize, orderType, orderName, checkDuplicateId, pictureId,userToken);
+            @RequestParam(name = "pictureId") String pictureId) {
+        Page<OcrTaskChildPictureVo> result = ocrTaskchildPictureService.getPackageSimilarityList(pageNo, pageSize, orderType, orderName, checkDuplicateId, pictureId);
         return ResultVoUtil.success(result);
 
     }
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureMybatisDao.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureMybatisDao.java
index 6a52b59c..e1789885 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureMybatisDao.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureMybatisDao.java
@@ -12,7 +12,5 @@ import java.util.List;
 */
 @Mapper
 public interface OcrPictureMybatisDao extends BaseMapper<OcrPicture> {
-    OcrPicture getPackagePictureInfo(@Param("packageId") String packageId, @Param("pictureId") String pictureId, @Param("userNodeType") String userNodeType);
-
-    List<OcrPicture> getPictureNodeStatesList(@Param("pictureIds") List<String> pictureIds, @Param("userNodeType") String userNodeType);
+    OcrPicture getPackagePictureInfo(@Param("packageId") String packageId, @Param("pictureId") String pictureId);
 }
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskchildPictureMybatisDao.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskchildPictureMybatisDao.java
index 7d8025da..de555ec9 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskchildPictureMybatisDao.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskchildPictureMybatisDao.java
@@ -17,14 +17,17 @@ import java.util.Map;
 */
 @Mapper
 public interface OcrTaskchildPictureMybatisDao extends BaseMapper<OcrTaskchildPicture> {
-    
+
     /**
      * 查询所有业务表集合
      * @param query
      * @return
      */
     public List<OcrTaskchildPicture> listFinal(Map<String, Object> query);
-    
+
+    List<OcrTaskchildPicture> listFinalTask(Map<String, Object> query);
+
+
     /**
      * 查询所有业务表数量
      * @param query
@@ -48,10 +51,13 @@ 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> getPictureHistoryList(@Param("pictureIds") List<String> pictureIds, @Param("pictureId") String pictureId);
     List<OcrTaskChildPictureVo> getDubiousfileList(@Param("pictureIds") List<String> pictureIds, @Param("taskname") String taskname);
 
     PictureDetailVo getPictureDetail(String pictureId);
 
-    Page<OcrTaskChildPictureVo> getPackageSimilarityList(Page<OcrTaskChildPictureVo> page, @Param("checkDuplicateId") String checkDuplicateId, @Param("pictureId") String pictureId, @Param("oderType") String oderType, @Param("oderName") String oderName, @Param("taskname") String taskname);
+    Page<OcrTaskChildPictureVo> getPackageSimilarityList(Page<OcrTaskChildPictureVo> page, @Param("checkDuplicateId") String checkDuplicateId, @Param("pictureId") String pictureId, @Param("oderType") String oderType, @Param("oderName") String oderName);
+
+    List<OcrTaskChildPictureVo> getSimilarityList(@Param("pictureIds") List<String> pictureIds);
+
 }
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java
index c440d7f2..95428f9a 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java
@@ -195,6 +195,10 @@ public class OcrTaskchildPicture implements BaseDto, java.io.Serializable {
     @TableField(value = "TASKNAME")
     private String taskname;
 
+    @Schema(description = "当前节点名称")
+    @TableField(value = "TASKNODE")
+    private String taskNode;
+
     @Schema(description = "当前节点id")
     @TableField(value = "TASKID")
     private String taskId;
@@ -203,6 +207,10 @@ public class OcrTaskchildPicture implements BaseDto, java.io.Serializable {
     @TableField(value = "FINISHTIME")
     private Long finishtime;
 
+    @Schema(description = "是否终审")
+    @TableField(value = "ISFINAIL")
+    private Integer isFinal;
+
     @Schema(description = "是否小结重复,1重复，0不重复")
     @TableField(value = "is_repeated_nodules")
     private Integer isRepeatedNodules;
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureService.java
index aad2f72e..9640b47a 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureService.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureService.java
@@ -71,14 +71,6 @@ public interface OcrPictureService extends BaseService<OcrPicture>  {
 
     OcrPicture getPackagePictureInfo(String packageId, String pictureId, UserToken userToken);
 
-    /**
-     * 根据图片id查询图片节点状态
-     * @param pictureIds
-     * @param nodeType
-     * @return
-     */
-    List<OcrPicture> getPictureNodeStatesList(List<String> pictureIds,Integer nodeType);
-
 //    Long getPhotoDateTime(OcrPicture picture);
 
 }
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrTaskchildPictureService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrTaskchildPictureService.java
index 2a7e3059..864642da 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrTaskchildPictureService.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrTaskchildPictureService.java
@@ -1,6 +1,5 @@
 package cn.jyjz.xiaoyao.ocr.service;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -17,6 +16,7 @@ import cn.jyjz.xiaoyao.ocr.vo.PictureDetailVo;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
 
 /**
 * 业务层
@@ -110,9 +110,11 @@ public interface OcrTaskchildPictureService extends BaseService<OcrTaskchildPict
      * @param packageid 任务包主键
      */
     public OcrTaskchildPicture create(OcrPicture ocrPicture, String tenantId , UserToken sysUser, Long packageid,String buessinessno);
-    
+
     /**
      * 查询所有业务表集合
+     *
+     * @param page
      * @param query
      * @return
      */
@@ -147,7 +149,7 @@ public interface OcrTaskchildPictureService extends BaseService<OcrTaskchildPict
 
     Page<OcrTaskChildPictureVo> getSimilarityList(Integer pageNo, Integer pageSize, String pictureId, String orderType, String orderValue, UserToken userToken);
 
-    Page<OcrTaskChildPictureVo> getPackageSimilarityList(Integer pageNo, Integer pageSize, String oderType, String oderName, String checkDuplicateId, String pictureId, UserToken userToken);
+    Page<OcrTaskChildPictureVo> getPackageSimilarityList(Integer pageNo, Integer pageSize, String oderType, String oderName, String checkDuplicateId, String pictureId);
 
     void sendFlowTaskResult(OcrTaskchildPicture taskchildPicture, OcrPicture picture, FlowApprove flowApprove) throws Exception;
 
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java
index d441d670..3a175a3d 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java
@@ -328,22 +328,11 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
 
     @Override
     public OcrPicture getPackagePictureInfo(String checkDuplicateId, String pictureId, UserToken userToken) {
-        String userNodeType = ProcessConstant.userNodeType.getOrDefault(userToken.getNodeType(), "一级审批");
-
-        OcrPicture ocrPicture = pictureMybatisDao.getPackagePictureInfo(checkDuplicateId,pictureId,userNodeType);
-
+        OcrPicture ocrPicture = pictureMybatisDao.getPackagePictureInfo(checkDuplicateId,pictureId);
         ocrPicture.getPictureInfo().setCreateTime(ocrPicture.getPhotoDateTimestamp());
         return ocrPicture;
     }
 
-    @Override
-    public List<OcrPicture> getPictureNodeStatesList(List<String> pictureIds, Integer nodeType) {
-        String userNodeType = ProcessConstant.userNodeType.getOrDefault(nodeType, "一级审批");
-
-        return pictureMybatisDao.getPictureNodeStatesList(pictureIds,userNodeType);
-    }
-
-
 //    @Override
 //    public Long getPhotoDateTime(OcrPicture picture) {
 //        long timestamp = 0L;
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 e95e47fe..debdea5d 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
@@ -218,8 +218,7 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
         List<String> approvedList = new ArrayList<>(); // 存储通过的pictureId集合
         List<String> failedList = new ArrayList<>(); // 存储不通过的pictureId集合
         if(pictureIds.size()!=0){
-            String userNodeType = ProcessConstant.userNodeType.getOrDefault(nodeType, "一级审批");
-            List<OcrTaskChildPictureVo> failedPictureIds = taskchildPictureMybatisDao.getPictureHistoryList(pictureIds, userNodeType);
+            List<OcrTaskChildPictureVo> failedPictureIds = taskchildPictureMybatisDao.getSimilarityList(pictureIds);
             for (OcrTaskChildPictureVo picture : failedPictureIds) {
                 if (picture.getHistoryStates() == 3) {
                     failedList.add(picture.getId());
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 20997d09..4b077ee1 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
@@ -8,6 +8,8 @@ import cn.jyjz.flowable.entity.FlowApprove;
 import cn.jyjz.flowable.service.IFlowInstanceService;
 import cn.jyjz.flowable.service.IFlowTaskService;
 import cn.jyjz.flowable.service.IFormCustomService;
+import cn.jyjz.xiaoyao.admin.dataobject.Department;
+import cn.jyjz.xiaoyao.admin.service.DepartmentService;
 import cn.jyjz.xiaoyao.common.base.param.ParamterPage;
 import cn.jyjz.xiaoyao.common.base.util.SpringUtils;
 import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
@@ -47,6 +49,8 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.task.api.Task;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.stereotype.Service;
@@ -55,13 +59,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -101,6 +99,9 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
     @Resource
     private PrevailCloudApi prevailCloudApi;
 
+    @Autowired
+    private DepartmentService departmentService;
+
     /**
      * 图片真假设置
      *
@@ -326,8 +327,8 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
                     //TODO 没有对应项目，返回提示信息
                     continue;
                 }
-                Category category = categoryService.getById(ocrPicture.getCategoryid());
-                if (null == category || StringUtils.isBlank(category.getProcessdefinitionid())) {
+                Department department = departmentService.getOne(new LambdaQueryWrapper<Department>().eq(Department::getDeptno, tenantId));
+                if (null == department || StringUtils.isBlank(department.getProcessdefinitionid())) {
                     continue;
                 }
                 //创建工单,如果创建成功，增加标志，用于过滤条件使用
@@ -337,13 +338,13 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
                     RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
                     //发起流程
                     flowInstanceService.startProcessInstanceById(
-                            category.getProcessdefinitionid(),
+                            department.getProcessdefinitionid(),
                             null,
                             request,
                             ocrTaskchildPicture.getId().toString(),
-                            category.getServicename()
+                            department.getServicename()
                     );
-                    IFormCustomService iFormCustomService = SpringUtils.getBean(category.getServicename());
+                    IFormCustomService iFormCustomService = SpringUtils.getBean(department.getServicename());
                     FlowModelVO formData = iFormCustomService.getForm(ocrTaskchildPicture.getId().toString());
                     List<Task> taskList = iFlowTaskService.nowRunTask(formData.getProcessInstanceId(), ocrTaskchildPicture.getProcessdefinitionid());
                     Task taskData = null;
@@ -610,12 +611,13 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
     /**
      * 查询所有业务表集合
      *
+     * @param page
      * @param query
      * @return
      */
     public List<OcrTaskchildPicture> listFinal(Map<String, Object> query) {
 
-        return this.ocrtaskchildpicturemybatisdao.listFinal(query);
+            return this.ocrtaskchildpicturemybatisdao.listFinalTask(query);
     }
 
 
@@ -662,8 +664,8 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
     }
 
     @Override
-    public List<OcrTaskChildPictureVo> getPictureHistoryList(List<String> pictureIds, String taskname) {
-        return ocrtaskchildpicturemybatisdao.getPictureHistoryList(pictureIds, taskname);
+    public List<OcrTaskChildPictureVo> getPictureHistoryList(List<String> pictureIds, String pictureId) {
+        return ocrtaskchildpicturemybatisdao.getPictureHistoryList(pictureIds, pictureId);
     }
 
     @Override
@@ -686,10 +688,9 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
         OcrPictureDuplicateHis duplicateHis = pictureDuplicateHisService.getOne(new LambdaQueryWrapper<OcrPictureDuplicateHis>().eq(OcrPictureDuplicateHis::getPictureId, pictureId));
         Page<OcrTaskChildPictureVo> objectPage = new Page<>();
         if (ObjectUtils.isNotEmpty(duplicateHis) && org.apache.commons.lang3.StringUtils.isNotBlank(duplicateHis.getCheckDuplicateResultHisJson())) {
-            String userNodeType = ProcessConstant.userNodeType.getOrDefault(userToken.getNodeType(), "一级审批");
             JSONObject jsonObject = JSONObject.parseObject(duplicateHis.getCheckDuplicateResultHisJson());
             Set<String> pictureIds = jsonObject.keySet();
-            List<OcrTaskChildPictureVo> taskChildPicturesOld = this.getPictureHistoryList(new ArrayList<>(pictureIds), userNodeType);
+            List<OcrTaskChildPictureVo> taskChildPicturesOld = this.getPictureHistoryList(new ArrayList<>(pictureIds), pictureId);
             List<OcrTaskChildPictureVo> taskChildPictures = new ArrayList<>();
             for (OcrTaskChildPictureVo taskChildPicture : taskChildPicturesOld) {
                 if(taskChildPicture.getPictureId()!=null){
@@ -727,11 +728,9 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
     }
 
     @Override
-    public Page<OcrTaskChildPictureVo> getPackageSimilarityList(Integer pageNo, Integer pageSize, String oderType, String oderName, String checkDuplicateId, String pictureId, UserToken userToken) {
+    public Page<OcrTaskChildPictureVo> getPackageSimilarityList(Integer pageNo, Integer pageSize, String oderType, String oderName, String checkDuplicateId, String pictureId) {
         Page<OcrTaskChildPictureVo> page = new Page<>(pageNo, pageSize);
-        String userNodeType = ProcessConstant.userNodeType.getOrDefault(userToken.getNodeType(), "一级审批");
-
-        return ocrtaskchildpicturemybatisdao.getPackageSimilarityList(page, checkDuplicateId, pictureId, oderType, oderName, userNodeType);
+        return ocrtaskchildpicturemybatisdao.getPackageSimilarityList(page, checkDuplicateId, pictureId, oderType, oderName);
     }
 
     @Override
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/TaskchildPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/TaskchildPictureServiceImpl.java
index ddd6d970..6489b38d 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/TaskchildPictureServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/TaskchildPictureServiceImpl.java
@@ -252,7 +252,7 @@ public class TaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchildPic
                 //iFlowFormMessageService.sendMsg(user.getLoginname(),model.getUsername() + SystemMessage.SYS_OA_TYPE_LEAVE + SystemMessage.SYS_OA_TO_DO,taskId,processInstanceId,fromid, CacheQyweixinConstants.OA_DISTIONARY_TYPE_MSG_SHENPI,model.getCategoryid().toString());
             }
             model.setAssigneename(stringBuffer.toString());
-
+            model.setTaskNode(task.getDescription());
             return this.ocrTaskchildPictureService.updateById(model);
         }
         return false;
diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml
index 3f436d16..7c9805ca 100644
--- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml
+++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml
@@ -226,30 +226,29 @@
 	</sql>
 
 	<select id="getPackagePictureInfo" resultMap="BaseResultMap">
-        SELECT t2.*,t3.*,ifnull(t5.STATSHIS, 1)  historyStates,t4.STATES,t4.TASKID,t4.ID taskchildId
+        SELECT t2.*,
+               t3.*,
+               t4.STATES,
+               t4.TASKID,
+               t4.ID         taskchildId,
+               COALESCE(
+                       (SELECT t5.STATSHIS
+                        FROM oa_userapprove_t t5
+                        WHERE t5.FORMID = t4.ID
+                        ORDER BY t5.CREATEDATE DESC
+                        LIMIT 1),
+                       1) AS historyStates
         FROM ocr_check_duplicate_result t1
                  LEFT JOIN ocr_picture t2 ON t1.picture_id = t2.ID
-		left join ocr_picture_info t3 on t2.ID=t3.picture_id
-		left join ocr_taskchild_picture t4 on t2.ID=t4.PICTUREID
-		left join oa_userapprove_t t5 on t4.ID=t5.FORMID and t5.TASKNAME = '${userNodeType}'
+                 left join ocr_picture_info t3 on t2.ID = t3.picture_id
+                 left join ocr_taskchild_picture t4 on t2.ID = t4.PICTUREID
         where t1.check_duplicate_id = #{packageId}
-		<if test="pictureId != null and pictureId != ''">
-			and t1.picture_id = #{pictureId}
-		</if>
-        ORDER BY t1.max_similarity desc,t1.similarity_group_order asc, t2.submit_date_timestamp asc
+          and t2.suspiciousfile = 0
+        <if test="pictureId != null and pictureId != ''">
+            and t1.picture_id = #{pictureId}
+        </if>
+        ORDER BY t1.max_similarity desc, t1.similarity_group_order asc, t2.submit_date_timestamp asc
         LIMIT 1
     </select>
 
-	<select id="getPictureNodeStatesList" resultType="cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture">
-		SELECT t1.*,
-		ifnull(t3.STATSHIS, 1)   historyStates
-		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 = '${userNodeType}'
-		where t1.ID in
-		<foreach collection="pictureIds" open="(" close=")" item="item" separator="," index="index">
-			#{item}
-		</foreach>
-    </select>
 </mapper>
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 c1d9a2a0..f419908b 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
@@ -186,6 +186,8 @@
 
 
 
+
+
                      and OCPICTUREID ${ocpictureid.dataOp} ${ocpictureid.likestar}#{ocpictureid.value}${ocpictureid.likeend}
                 </if>
                 <if test="pictureresult != null">
@@ -307,8 +309,6 @@
                 </if>
                 <if test="ocpictureid != null">
 
-
-
                      and tcp.OCPICTUREID ${ocpictureid.dataOp} ${ocpictureid.likestar}#{ocpictureid.value}${ocpictureid.likeend}
                 </if>
                 <if test="pictureresult != null">
@@ -525,21 +525,22 @@
                     </if>
                     ${izproject.likeend}
                 </if>
-<!--                <if test="izuptime != null">-->
-<!--                    ${izuptime.rulesOp} tcp.FROMUPTIME ${izuptime.dataOp} ${izuptime.likestar}#{izuptime.value}${izuptime.likeend}-->
-<!--                </if>-->
-<!--                <if test="izuptimeStart != null">-->
-<!--                    and tcp.FROMUPTIME &gt;= '${izuptimeStart.value}'-->
-<!--                </if>-->
-<!--                <if test="izuptimeEnd != null">-->
-<!--                    and tcp.FROMUPTIME &lt;= '${izuptimeEnd.value}'-->
-<!--                </if>-->
+                <!--                <if test="izuptime != null">-->
+                <!--                    ${izuptime.rulesOp} tcp.FROMUPTIME ${izuptime.dataOp} ${izuptime.likestar}#{izuptime.value}${izuptime.likeend}-->
+                <!--                </if>-->
+                <!--                <if test="izuptimeStart != null">-->
+                <!--                    and tcp.FROMUPTIME &gt;= '${izuptimeStart.value}'-->
+                <!--                </if>-->
+                <!--                <if test="izuptimeEnd != null">-->
+                <!--                    and tcp.FROMUPTIME &lt;= '${izuptimeEnd.value}'-->
+                <!--                </if>-->
                 <if test="izuptimeStart != null">
                     <!-- 如果 izuptimeStart.dataOp 的值为 "<"，则使用 "or" 连接 -->
                     <choose>
-                        <when test="izuptimeStart.rulesOp == 'or' || izuptimeEnd.rulesOp=='or'">
+                        <when test="izuptimeStart.rulesOp == 'or' || izuptimeEnd.rulesOp == 'or'">
                             <if test="izuptimeEnd != null">
-                                and (tcp.FROMUPTIME ${izuptimeStart.dataOp} '${izuptimeStart.value}' or tcp.FROMUPTIME ${izuptimeEnd.dataOp} '${izuptimeEnd.value}')
+                                and (tcp.FROMUPTIME ${izuptimeStart.dataOp} '${izuptimeStart.value}'
+                                 or tcp.FROMUPTIME ${izuptimeEnd.dataOp} '${izuptimeEnd.value}')
                             </if>
                         </when>
                         <otherwise>
@@ -594,28 +595,22 @@
         </if>
     </select>
     <select id="listFinalCount" resultType="java.lang.Long" parameterType="java.util.Map">
-        select count(tcp.ID) from (
-        select tc.*
-        from ocr_taskchild_picture tc,
-             OA_USERFINAL_T uf,
-             ocr_picture p
-        where tc.ID = uf.FORMID
-          and p.ID = tc.PICTUREID
-          and p.suspiciousfile = 0
-        <if test="thisLoginUserid != null">
-            and uf.USERID ${thisLoginUserid.dataOp} ${thisLoginUserid.likestar}#{thisLoginUserid.value}${thisLoginUserid.likeend}
-        </if>
-        UNION
-        select
-        tc.*
-        from ocr_taskchild_picture tc
-        where tc.STATES = 5
-        ) as tcp
+        select count(1)
+        from ocr_taskchild_picture tcp
         left join ocr_picture pic
         on tcp.PICTUREID = pic.ID
         <include refid="Base_Where_union">
         </include>
+        and tcp.ISFINAIL = 1
         and pic.suspiciousfile = 0
+        <if test="thisLoginUserid != null and isFail ==null">
+            and tcp.ASSIGNEE ${thisLoginUserid.dataOp} ${thisLoginUserid.likestar}#{thisLoginUserid.value}${thisLoginUserid.likeend}
+        </if>
+        <if test="thisLoginUserid != null and isFail !=null">
+            and (tcp.ASSIGNEE ${thisLoginUserid.dataOp} ${thisLoginUserid.likestar}#{thisLoginUserid.value}${thisLoginUserid.likeend}
+            or tcp.STATES = 5)
+        </if>
+
         <if test="fromuptimeStart != null">
             and tcp.fromuptime &gt;= ${fromuptimeStart.value}
         </if>
@@ -628,56 +623,43 @@
             parameterType="java.util.Map">
         select tcp.* from (
         select tc.*,
-        uf.COMMENTHIS,
-        uf.TASKNAME as TASKNAMEHIS,
-        uf.STATSHIS,
-        uf.TASKINDEX,
-        uf.TASKNO,
+               uf.COMMENTHIS,
+               uf.TASKNAME    as TASKNAMEHIS,
+               uf.STATSHIS,
+               uf.TASKNO,
 
-               op.field6 as fromCustomerLevel,
+               op.field6      as fromCustomerLevel,
                op.releaseArea as fromCity,
                op.is_repeat,
         tc.is_repeated_nodules as isRepeatedNodules
         from ocr_taskchild_picture tc
-        LEFT JOIN OA_USERAPPROVE_T uf ON tc.ID = uf.ID
-        left join ocr_picture op on tc.PICTUREID = op.ID
+                 LEFT JOIN OA_USERAPPROVE_T uf ON tc.ID = uf.ID
+                 left join ocr_picture op on tc.PICTUREID = op.ID
         where tc.ASSIGNEE = #{searchassignee}
-        and tc.TENANTID = #{searchtenantid}
-        and tc.STATES = 2
-        and op.suspiciousfile = 0
-        <if test="izApprovalStatus != null ">
+          and tc.TENANTID = #{searchtenantid}
+          and tc.STATES = 2
+          and op.suspiciousfile = 0
+        <if test="izApprovalStatus != null">
             ${izApprovalStatus.rulesOp}
-            (
-            #{izApprovalStatus.value} ${izApprovalStatus.dataOp} COALESCE(uf.STATSHIS, 1)
-            )
+            ( #{izApprovalStatus.value} ${izApprovalStatus.dataOp} COALESCE (uf.STATSHIS
+                                                                            , 1)
+                )
         </if>
         UNION
-        select tc.*,
-        uf.COMMENTHIS,
-        uf.TASKNAME as TASKNAMEHIS,
-        uf.STATSHIS,
-        uf.TASKINDEX,
-        uf.TASKNO,
-
-               op.field6 as fromCustomerLevel,
-               op.releaseArea as fromCity,
-               op.is_repeat,
-        tc.is_repeated_nodules as isRepeatedNodules
-        from ocr_taskchild_picture tc,
-        OA_USERAPPROVE_T uf,
-        ocr_picture op
+        select tc.*, uf.COMMENTHIS, uf.TASKNAME as TASKNAMEHIS, uf.STATSHIS, uf.TASKNO, op.field6 as fromCustomerLevel, op.releaseArea as fromCity, op.is_repeat
+        from ocr_taskchild_picture tc, OA_USERAPPROVE_T uf, ocr_picture op
         where tc.ID = uf.FORMID
-        and tc.PICTUREID = op.ID
-        and op.suspiciousfile = 0
-        and tc.TENANTID = #{searchtenantid}
+          and tc.PICTUREID = op.ID
+          and op.suspiciousfile = 0
+          and tc.TENANTID = #{searchtenantid}
         <if test="thisLoginUserid != null">
             and uf.USERID = #{thisLoginUserid}
         </if>
-        <if test="izApprovalStatus != null ">
+        <if test="izApprovalStatus != null">
             ${izApprovalStatus.rulesOp}
-            (
-             #{izApprovalStatus.value} ${izApprovalStatus.dataOp} COALESCE(uf.STATSHIS, 1)
-            )
+                ( #{izApprovalStatus.value} ${izApprovalStatus.dataOp} COALESCE (uf.STATSHIS
+                , 1)
+                )
         </if>
         ) as tcp
         <include refid="Base_Where_union">
@@ -692,25 +674,42 @@
         </if>
     </select>
     <select id="listmytaskCount" resultType="java.lang.Long" parameterType="java.util.Map">
-        select count(tcp.ID) from (
-        select tc.*
+        select count(1) from (
+        select tc.*,
+        uf.COMMENTHIS,
+        uf.TASKNAME    as TASKNAMEHIS,
+        uf.STATSHIS,
+        uf.TASKNO,
+        op.field6      as fromCustomerLevel,
+        op.releaseArea as fromCity,
+        op.is_repeat
         from ocr_taskchild_picture tc
+        LEFT JOIN OA_USERAPPROVE_T uf ON tc.ID = uf.ID
+        left join ocr_picture op on tc.PICTUREID = op.ID
         where tc.ASSIGNEE = #{searchassignee}
         and tc.TENANTID = #{searchtenantid}
         and tc.STATES = 2
+        and op.suspiciousfile = 0
+        <if test="izApprovalStatus != null">
+            ${izApprovalStatus.rulesOp}
+            ( #{izApprovalStatus.value} ${izApprovalStatus.dataOp} COALESCE (uf.STATSHIS
+            , 1)
+            )
+        </if>
         UNION
-        select tc.*
-        from ocr_taskchild_picture tc,
-        OA_USERAPPROVE_T uf
+        select tc.*, uf.COMMENTHIS, uf.TASKNAME as TASKNAMEHIS, uf.STATSHIS, uf.TASKNO, op.field6 as fromCustomerLevel, op.releaseArea as fromCity, op.is_repeat
+        from ocr_taskchild_picture tc, OA_USERAPPROVE_T uf, ocr_picture op
         where tc.ID = uf.FORMID
+        and tc.PICTUREID = op.ID
+        and op.suspiciousfile = 0
         and tc.TENANTID = #{searchtenantid}
         <if test="thisLoginUserid != null">
             and uf.USERID = #{thisLoginUserid}
         </if>
         <if test="izApprovalStatus != null ">
             ${izApprovalStatus.rulesOp}
-            (
-            #{izApprovalStatus.value} ${izApprovalStatus.dataOp} COALESCE(uf.STATSHIS, 1)
+            ( #{izApprovalStatus.value} ${izApprovalStatus.dataOp} COALESCE (uf.STATSHIS
+            , 1)
             )
         </if>
         ) as tcp
@@ -759,15 +758,22 @@
                         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,
-                        t1.server_thumbnail_url  serverThumbnailUrl
+                        t1.server_thumbnail_url  serverThumbnailUrl,
+                        COALESCE(
+                                (SELECT t3.STATSHIS
+                                 FROM oa_userapprove_t t3
+                                 WHERE t3.FORMID = t2.ID
+                                   AND t3.TASKINDEX = (SELECT TASKNODE
+                                                       FROM ocr_taskchild_picture
+                                                       WHERE PICTUREID = #{pictureId})
+                                 LIMIT 1),
+                                1) AS            historyStates
         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.suspiciousfile = 0
           and t1.ID in
         <foreach collection="pictureIds" open="(" close=")" item="item" separator="," index="index">
@@ -839,40 +845,45 @@
 
     <select id="getPackageSimilarityList" resultType="cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo">
         SELECT distinct t3.ID                    id,
-               t3.PICTUREID             pictureId,
-               t3.STATES                states,
-               t3.PROCESSINSTANCEID     processInstanceId,
-               t3.PROCESSDEFINITIONID   processDefinitionId,
-               t3.DEPLOYMENTID          deploymentId,
-               t3.ASSIGNEENAME          assigneeName,
-               t3.ASSIGNEE              assignee,
-               t3.FILEANNEX             fileAnnex,
-               t3.GUIDANG               guiDang,
-               t3.CREATEUSER            createUser,
-               t3.CREATEUSERNAME        createUserName,
-               t3.CREATEDATE            createDate,
-               t3.USERID                userId,
-               t3.USERNAME              userName,
-               t3.FROMTASKID            fromTaskId,
-               t3.FROMTASKNAME          fromTaskName,
-               t3.FROMUSERID            fromUserId,
-               t3.FROMPROJECTID         fromProjectId,
-               t3.FROMPLANID            fromPlanId,
-               t3.FROMUPTIME            fromupTime,
-               t3.FROMSOURCEID          fromSourceId,
-               t3.HAVEPOINTS            havePoints,
-               t3.TASKNAME              taskName,
-               t3.FROMUSERNAME          fromUserName,
-               t3.FROMPROJECTNAME       fromProjectName,
-               t3.FINISHTIME            finishTime,
-               t3.TASKID                taskId,
-               t2.imgUrl,
-               t2.submit_date_timestamp submitDateTimestamp,
-               t2.photo_date_timestamp  photoDateTimestamp,
-               t2.server_thumbnail_url  serverThumbnailUrl,
-               t1.max_similarity        maxSimilarity,
-               ifnull(t4.STATSHIS, 1)   historyStates,
-               t1.check_duplicate_id
+                        t3.PICTUREID             pictureId,
+                        t3.STATES                states,
+                        t3.PROCESSINSTANCEID     processInstanceId,
+                        t3.PROCESSDEFINITIONID   processDefinitionId,
+                        t3.DEPLOYMENTID          deploymentId,
+                        t3.ASSIGNEENAME          assigneeName,
+                        t3.ASSIGNEE              assignee,
+                        t3.FILEANNEX             fileAnnex,
+                        t3.GUIDANG               guiDang,
+                        t3.CREATEUSER            createUser,
+                        t3.CREATEUSERNAME        createUserName,
+                        t3.CREATEDATE            createDate,
+                        t3.USERID                userId,
+                        t3.USERNAME              userName,
+                        t3.FROMTASKID            fromTaskId,
+                        t3.FROMTASKNAME          fromTaskName,
+                        t3.FROMUSERID            fromUserId,
+                        t3.FROMPROJECTID         fromProjectId,
+                        t3.FROMPLANID            fromPlanId,
+                        t3.FROMUPTIME            fromupTime,
+                        t3.FROMSOURCEID          fromSourceId,
+                        t3.HAVEPOINTS            havePoints,
+                        t3.TASKNAME              taskName,
+                        t3.FROMUSERNAME          fromUserName,
+                        t3.FROMPROJECTNAME       fromProjectName,
+                        t3.FINISHTIME            finishTime,
+                        t3.TASKID                taskId,
+                        t2.imgUrl,
+                        t2.submit_date_timestamp submitDateTimestamp,
+                        t2.photo_date_timestamp  photoDateTimestamp,
+                        t2.server_thumbnail_url  serverThumbnailUrl,
+                        t1.max_similarity        maxSimilarity,
+                        COALESCE(
+                                (SELECT t4.STATSHIS
+                                 FROM oa_userapprove_t t4
+                                 WHERE t4.FORMID = t3.ID
+                                 ORDER BY t4.CREATEDATE DESC
+                                 LIMIT 1), 1) AS historyStates,
+                        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
@@ -934,4 +945,91 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="listFinalTask" resultType="cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture"
+            parameterType="java.util.Map">
+        select tcp.*, pic.field11 reporttime, pic.similarity_score similarityscore,pic.server_thumbnail_url serverThumbnailUrl
+        from ocr_taskchild_picture tcp
+                 left join ocr_picture pic
+                           on tcp.PICTUREID = pic.ID
+        <include refid="Base_Where_union">
+        </include>
+        and tcp.ISFINAIL = 1
+        and pic.suspiciousfile = 0
+        <if test="thisLoginUserid != null and isFail ==null">
+            and tcp.ASSIGNEE ${thisLoginUserid.dataOp} ${thisLoginUserid.likestar}#{thisLoginUserid.value}${thisLoginUserid.likeend}
+        </if>
+        <if test="thisLoginUserid != null and isFail !=null">
+            and (tcp.ASSIGNEE ${thisLoginUserid.dataOp} ${thisLoginUserid.likestar}#{thisLoginUserid.value}${thisLoginUserid.likeend}
+            or tcp.STATES = 5)
+        </if>
+
+        <if test="fromuptimeStart != null">
+            and tcp.fromuptime &gt;= ${fromuptimeStart.value}
+        </if>
+        <if test="fromuptimeEnd != null">
+            and tcp.fromuptime &lt;= ${fromuptimeEnd.value}
+        </if>
+        <if test="page != null">
+            <if test="page.sortname != null">
+                <if test="page.sortname == 'states'">
+                    order by tcp.${page.sortname} ${page.sortorder}
+                </if>
+                <if test="page.sortname != 'states'">
+                    order by pic.${page.sortname} ${page.sortorder}
+                </if>
+            </if>
+            limit ${page.start}, ${page.Pagesize}
+        </if>
+    </select>
+
+    <select id="getSimilarityList" resultType="cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo">
+        SELECT distinct t3.ID                    id,
+        t3.PICTUREID             pictureId,
+        t3.STATES                states,
+        t3.PROCESSINSTANCEID     processInstanceId,
+        t3.PROCESSDEFINITIONID   processDefinitionId,
+        t3.DEPLOYMENTID          deploymentId,
+        t3.ASSIGNEENAME          assigneeName,
+        t3.ASSIGNEE              assignee,
+        t3.FILEANNEX             fileAnnex,
+        t3.GUIDANG               guiDang,
+        t3.CREATEUSER            createUser,
+        t3.CREATEUSERNAME        createUserName,
+        t3.CREATEDATE            createDate,
+        t3.USERID                userId,
+        t3.USERNAME              userName,
+        t3.FROMTASKID            fromTaskId,
+        t3.FROMTASKNAME          fromTaskName,
+        t3.FROMUSERID            fromUserId,
+        t3.FROMPROJECTID         fromProjectId,
+        t3.FROMPLANID            fromPlanId,
+        t3.FROMUPTIME            fromupTime,
+        t3.FROMSOURCEID          fromSourceId,
+        t3.HAVEPOINTS            havePoints,
+        t3.TASKNAME              taskName,
+        t3.FROMUSERNAME          fromUserName,
+        t3.FROMPROJECTNAME       fromProjectName,
+        t3.FINISHTIME            finishTime,
+        t3.TASKID                taskId,
+        t2.imgUrl,
+        t2.submit_date_timestamp submitDateTimestamp,
+        t2.photo_date_timestamp  photoDateTimestamp,
+        t2.server_thumbnail_url  serverThumbnailUrl,
+        t2.similarity_score        maxSimilarity,
+        COALESCE(
+        (SELECT t4.STATSHIS
+        FROM oa_userapprove_t t4
+        WHERE t4.FORMID = t3.ID
+        ORDER BY t4.CREATEDATE DESC
+        LIMIT 1), 1) AS historyStates
+        from ocr_picture t2
+        LEFT JOIN ocr_taskchild_picture t3 ON t2.ID = t3.PICTUREID
+        left join ocr_picture_info t5 on t2.ID = t5.picture_id
+        WHERE t2.suspiciousfile = 0
+        and t2.ID in
+        <foreach collection="pictureIds" open="(" close=")" item="item" separator="," index="index">
+            #{item}
+        </foreach>
+    </select>
 </mapper>
diff --git a/runstart/src/main/resources/application-dev.yml b/runstart/src/main/resources/application-dev.yml
index b297e84c..ee6744ba 100644
--- a/runstart/src/main/resources/application-dev.yml
+++ b/runstart/src/main/resources/application-dev.yml
@@ -160,15 +160,15 @@ mybatis-plus:
 xiaoyao:
   web:
     #上传文件路径
-    uploadPath: E:/ZJWorkSpace/ocr/htmlweb/upload
+    uploadPath: D:/Java/idea/IdeaWorkSpace/ocr/htmlweb/upload
     #页面根路径
-    frontPath: E:/ZJWorkSpace/ocr/htmlweb
+    frontPath: D:/Java/idea/IdeaWorkSpace/ocr/htmlweb
     #js、css、图片存放路径
-    staticPath: E:/ZJWorkSpace/ocr/htmlweb/static
+    staticPath: D:/Java/idea/IdeaWorkSpace/ocr/htmlweb/static
     #页面模版路径
-    webPath: E:/ZJWorkSpace/ocr/htmlweb/web
+    webPath: D:/Java/idea/IdeaWorkSpace/ocr/htmlweb/web
     #Lucene索引路径
-    lucenePath: E:/ZJWorkSpace/ocr/htmlweb/lucene/indexDir
+    lucenePath: D:/Java/idea/IdeaWorkSpace/ocr/htmlweb/lucene/indexDir
     #是否开启flowable
     haveFlowable: true
   webconfig:
@@ -272,17 +272,7 @@ springfox:
       enabled: true
 # 是否启用swagger,postman调试
 debugger_tools: true
-#无量云api配置信息
-ocr:
-  api:
-    wly:
-      interface-domain: https://b-test.prevailcloud.com #接口域名
-      accessKey: 7390F0221A1A73D8E13F8C8BB96F33B0 #秘钥
-      accessCode: ED6F7B39768AF95E87AEA8ACCCC71A6F #秘钥编码
-      connectTimeout: 5000 #请求超时时间 毫秒
-      readTimeout: 60000 #接收超时时间 毫秒
-      localImagePath: /server/data/images #图片本地存储地址
-      data-url: https://b-test.prevailcloud.com/pangu/jingwei/thirdclient/command/pb/approval/result
+#图片查重模型
 image:
   similarityPath: http://47.93.59.251/ai/api/similarity/
   classifyPath: http://47.93.59.251/api/classify/
diff --git a/runstart/src/main/resources/application-pro.yml b/runstart/src/main/resources/application-pro.yml
index 0766abfc..96db8265 100644
--- a/runstart/src/main/resources/application-pro.yml
+++ b/runstart/src/main/resources/application-pro.yml
@@ -275,18 +275,7 @@ springfox:
       enabled: true
 # 是否启用swagger,postman调试
 debugger_tools: true
-
-#无量云api配置信息
-ocr:
-  api:
-    wly:
-      interface-domain: https://b-test.prevailcloud.com  #接口域名
-      accessKey: 7390F0221A1A73D8E13F8C8BB96F33B0 #秘钥
-      accessCode: ED6F7B39768AF95E87AEA8ACCCC71A6F #秘钥编码
-      connectTimeout: 5000 #请求超时时间 毫秒
-      readTimeout: 60000 #接收超时时间 毫秒
-      localImagePath: /server/data/images #图片本地存储地址
-      data-url: https://b-test.prevailcloud.com/pangu/jingwei/thirdclient/command/pb/approval/result
+#图片查重模型
 image:
   similarityPath: http://127.0.0.1:8000/api/similarity/
   classifyPath: http://127.0.0.1:8000/api/classify/
diff --git a/runstart/src/main/resources/application.yml b/runstart/src/main/resources/application.yml
index a8b9b215..3d7808a0 100644
--- a/runstart/src/main/resources/application.yml
+++ b/runstart/src/main/resources/application.yml
@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: pro
+    active: dev