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

Reviewed-on: #28

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureMybatisDao.java

@@ -5,10 +5,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
 * 数据持久化
 */
 @Mapper
 public interface OcrPictureMybatisDao extends BaseMapper<OcrPicture> {
     OcrPicture getPackagePictureInfo(@Param("packageId") String packageId, @Param("pictureId") String pictureId);
+
+    List<OcrPicture> getPictureNodeStatesList(@Param("pictureIds") List<String> pictureIds, @Param("userNodeType") String userNodeType);
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java

@@ -359,6 +359,10 @@ public class OcrPicture implements BaseDto, java.io.Serializable {
     @TableField(value = "photo_date_timestamp")
     private Long photoDateTimestamp;
 
+    @ApiModelProperty(value = "节点状态")
+    @TableField(exist = false)
+    private Integer historyStates;
+
     //保存当前登录用户的数据权限范围的搜索条件
     @TableField(exist = false)
     @JsonIgnore

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureService.java

@@ -70,6 +70,14 @@ public interface OcrPictureService extends BaseService<OcrPicture>  {
 
     OcrPicture getPackagePictureInfo(String packageId, String pictureId);
 
+    /**
+     * 根据图片id查询图片节点状态
+     * @param pictureIds
+     * @param nodeType
+     * @return
+     */
+    List<OcrPicture> getPictureNodeStatesList(List<String> pictureIds,Integer nodeType);
+
 //    Long getPhotoDateTime(OcrPicture picture);
 
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java

@@ -3,6 +3,7 @@ package cn.jyjz.xiaoyao.ocr.service.impl;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.jyjz.flowable.common.ProcessConstant;
 import cn.jyjz.flowable.service.IFlowInstanceService;
 import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
 import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil;
@@ -333,6 +334,13 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
         return pictureMybatisDao.getPackagePictureInfo(checkDuplicateId,pictureId);
     }
 
+    @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) {

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java

@@ -682,9 +682,9 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
             }
             if (orderValue.equals("similarityScore")) {
                 if ("desc".equals(orderType)) {
-                    taskChildPictures.sort(Comparator.comparing(OcrTaskChildPictureVo::getSimilarityScore).thenComparing(OcrTaskChildPictureVo::getCreateDate).reversed());
+                    taskChildPictures.sort(Comparator.comparing(OcrTaskChildPictureVo::getSimilarityScore).thenComparing(OcrTaskChildPictureVo::getSubmitDateTimestamp).reversed());
                 } else {
-                    taskChildPictures.sort(Comparator.comparing(OcrTaskChildPictureVo::getSimilarityScore).thenComparing(OcrTaskChildPictureVo::getCreateDate));
+                    taskChildPictures.sort(Comparator.comparing(OcrTaskChildPictureVo::getSimilarityScore).thenComparing(OcrTaskChildPictureVo::getSubmitDateTimestamp));
                 }
             } else {
                 if ("desc".equals(orderType)) {

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

@@ -235,4 +235,17 @@
         ORDER BY t1.max_similarity desc, t2.create_time DESC
         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>

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

@@ -3,15 +3,22 @@
 <mapper namespace="cn.jyjz.xiaoyao.ocr.dataDao.OcrTaskPackageMapper">
 
     <select id="getPackageList" resultType="java.util.Map">
-        SELECT t1.id, t1.name,t1.check_duplicate_id checkDuplicateId,t1.create_time createTime,t1.update_time updateTime,t2.picture_count pictureCount,
-               t2.searching_json search,t3.USERNAME createName
+        SELECT t1.id,
+               t1.name,
+               t1.check_duplicate_id checkDuplicateId,
+               t1.create_time        createTime,
+               t1.update_time        updateTime,
+               t2.picture_count      pictureCount,
+               t2.searching_json     search,
+               t3.USERNAME           createName
         FROM ocr_task_package t1
                  LEFT JOIN ocr_check_duplicate t2 ON t1.check_duplicate_id = t2.id
-        left join s_user_t t3 on t1.create_by = t3.ID
+                 left join s_user_t t3 on t1.create_by = t3.ID
         <where>
-            t1.tenant_id = #{tenantId}
+                t1.tenant_id = #{tenantId} and t1.is_delete = 0
             <if test="packageName != null and packageName != ''">
-                and (t1.name like concat('%', #{packageName}, '%') or T3.USERNAME like concat('%', #{packageName}, '%'))
+                and t1.name like concat('%', #{packageName}, '%')
+                   or T3.USERNAME like concat('%', #{packageName}, '%')
             </if>
         </where>
         ORDER BY T1.create_time desc