From 22c7810274a3286a05f16611bcf12403f2c97674 Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Sat, 30 Mar 2024 15:09:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E7=9B=91=E5=90=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jyjz/flowable/service/impl/FlowTaskServiceImpl.java   | 2 --
 .../ocr/service/impl/OcrTaskchildPictureServiceImpl.java  | 8 ++++----
 .../jyjz/xiaoyao/ocr/vo/OcrTaskchildPictureApproVo.java   | 3 +++
 3 files changed, 7 insertions(+), 6 deletions(-)

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 477859bc..bd27eb2f 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
@@ -538,12 +538,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         }
         //1、获取终止节点
         List<EndEvent> endNodes = findEndFlowElement(task.getProcessDefinitionId());
-        String endId = endNodes.get(0).getId();
         //2、执行终止
         List<Execution> executions = runtimeService.createExecutionQuery().parentId(task.getProcessInstanceId()).list();
         List<String> executionIds = new ArrayList<>();
         executions.forEach(execution -> executionIds.add(execution.getId()));
-        runtimeService.createChangeActivityStateBuilder().moveExecutionsToSingleActivityId(executionIds, endId).processVariables(variables).changeState();
         OcrTaskchildPicture taskchildPicture = ocrTaskchildPictureService.getById(Long.parseLong(formId));
         taskchildPicture.setFinishtime(System.currentTimeMillis());
         ocrTaskchildPictureService.updateById(taskchildPicture);
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 fbc1a1bc..cc993d70 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
@@ -667,15 +667,15 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
             }
             if (orderValue.equals("similarityScore")) {
                 if ("desc".equals(orderType)) {
-                    taskChildPictures.sort(Comparator.comparing(OcrTaskChildPictureVo::getSimilarityScore).reversed());
+                    taskChildPictures.sort(Comparator.comparing(OcrTaskChildPictureVo::getSimilarityScore).thenComparing(OcrTaskChildPictureVo::getCreateDate).reversed());
                 } else {
-                    taskChildPictures.sort(Comparator.comparing(OcrTaskChildPictureVo::getSimilarityScore));
+                    taskChildPictures.sort(Comparator.comparing(OcrTaskChildPictureVo::getSimilarityScore).thenComparing(OcrTaskChildPictureVo::getCreateDate));
                 }
             } else {
                 if ("desc".equals(orderType)) {
-                    taskChildPictures.sort(Comparator.comparing(OcrTaskChildPictureVo::getCreateDate).reversed());
+                    taskChildPictures.sort(Comparator.comparing(OcrTaskChildPictureVo::getFromupTime).reversed());
                 } else {
-                    taskChildPictures.sort(Comparator.comparing(OcrTaskChildPictureVo::getCreateDate));
+                    taskChildPictures.sort(Comparator.comparing(OcrTaskChildPictureVo::getFromupTime));
                 }
             }
             List<OcrTaskChildPictureVo> collect = taskChildPictures.stream().skip((pageNo - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskchildPictureApproVo.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskchildPictureApproVo.java
index a77390d3..7d2af00e 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskchildPictureApproVo.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskchildPictureApproVo.java
@@ -1,8 +1,10 @@
 package cn.jyjz.xiaoyao.ocr.vo;
 
 import cn.jyjz.flowable.domain.dto.HistoricTaskInstanceDto;
+import cn.jyjz.xiaoyao.common.base.jsonDomain.DateSerializer;
 import cn.jyjz.xiaoyao.oa.from.dataobject.Category;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -36,6 +38,7 @@ public class OcrTaskchildPictureApproVo implements java.io.Serializable {
 
 	@ApiModelProperty(value = "提交时间")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@JsonSerialize(using = DateSerializer.class)
 	private Long finishTime;
 
 	@ApiModelProperty(value =  "拜访地区")
-- 
2.39.3