Merge pull request 'sunchenliang' (#59) from sunchenliang into test

Reviewed-on: #59

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

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

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

@@ -68,6 +68,7 @@
 		<result column="photo_date_timestamp" property="photoDateTimestamp" jdbcType="VARCHAR"/>
 		<result column="suspiciousfile" property="suspiciousfile" jdbcType="INTEGER"/>
 		<result column="STATES" property="states" jdbcType="INTEGER"/>
+		<result column="TASKID" property="taskId" jdbcType="VARCHAR"/>
 		<result column="historyStates" property="historyStates" jdbcType="INTEGER"/>
 
 		<association property="pictureInfo" javaType="cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureInfo">
@@ -224,7 +225,7 @@
 	</sql>
 
 	<select id="getPackagePictureInfo" resultMap="BaseResultMap">
-        SELECT t2.*,t3.*,ifnull(t5.STATSHIS, 1)  historyStates,T4.STATES
+        SELECT t2.*,t3.*,ifnull(t5.STATSHIS, 1)  historyStates,t4.STATES,t4.TASKID
         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
@@ -234,7 +235,7 @@
 		<if test="pictureId != null and pictureId != ''">
 			and t1.picture_id = #{pictureId}
 		</if>
-        ORDER BY t1.max_similarity desc,t1.similarity_group_order asc, t2.create_time DESC
+        ORDER BY t1.max_similarity desc,t1.similarity_group_order asc, t2.submit_date_timestamp DESC
         LIMIT 1
     </select>
 

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}
         </if>
         <if test="oderName == 'createdate'">
-            order by t2.create_time ${oderType}
+            order by t2.submit_date_timestamp ${oderType}
         </if>
     </select>