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 c4b7735d..be787e23 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
@@ -564,6 +564,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
jsonObject.put("sendTime", System.currentTimeMillis());
jsonObject.put("fromId", model.getId().toString());
jsonObject.put("taskName", model.getFromtaskname());
+ jsonObject.put("pictureId", model.getPictureid());
jsonObject.put("packageId", model.getPackageid());
msg.setBusJson(jsonObject.toJSONString());
msg.setCreateBy(Long.valueOf(userToken.getUserid()));
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java
index 69b54030..e266f691 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java
@@ -363,6 +363,10 @@ public class OcrPicture implements BaseDto, java.io.Serializable {
@TableField(exist = false)
private Integer historyStates;
+ @ApiModelProperty(value = "节点状态")
+ @TableField(exist = false)
+ private String taskId;
+
//保存当前登录用户的数据权限范围的搜索条件
@TableField(exist = false)
@JsonIgnore
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 bcee1f1e..a07d7083 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
@@ -68,6 +68,7 @@
+
@@ -224,7 +225,7 @@
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 6c9c4995..d8e77a62 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
@@ -641,7 +641,8 @@
ifnull(t3.STATSHIS, 1) historyStates,
t1.submit_date_timestamp submitDateTimestamp,
t1.photo_date_timestamp photoDateTimestamp,
- t1.similarity_score similarityScore
+ t1.similarity_score similarityScore,
+ t1.server_thumbnail_url serverThumbnailUrl
FROM ocr_picture t1
LEFT JOIN ocr_taskchild_picture t2
on t1.ID = t2.PICTUREID
@@ -765,7 +766,7 @@
order by t1.max_similarity ${oderType},t1.similarity_group_order asc,t2.submit_date_timestamp ${oderType}
- order by t2.create_time ${oderType}
+ order by t2.submit_date_timestamp ${oderType}