Merge pull request 'fix: 修改任务审批监听' (#11) from sunchenliang into test

Reviewed-on: #11

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);

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());

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 =  "拜访地区")