fix: 修改任务审批筛选

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java

@@ -305,17 +305,20 @@ public class FlowTaskController extends BaseController {
     @ResponseBody
     public ResultVo listAlldata(PageUtils pageUtils, HttpServletRequest request) {
         SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_");
-
         //租户主键，由前端页面传送
         String tenantId = request.getHeader("X-Tenant-Id");
 
+        String taskName = request.getParameter("keyword");
+
         if (org.apache.commons.lang3.StringUtils.isBlank(tenantId)) {
             return ResultVoUtil.error("租户主键不能为空");
         }
+        if(org.apache.commons.lang3.StringUtils.isNotBlank(taskName)){
+            searchQuery.addLike("fromtaskname",taskName);
+        }
 
         User user = this.userService.getSessionUser(request);
         if (user.isUserIsSys(xiaoyaoConfig.getWebconfig().getSysLoginUser().split(","))) {
-
             flowTaskService.getMyProcessInstances(searchQuery.getQuery(), pageUtils);
         } else {
 

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java

@@ -402,7 +402,8 @@ public class OcrPictureController extends BaseController {
     public ResultVo getPackagePictureInfo(@RequestParam(name = "checkDuplicateId") String checkDuplicateId,
                                           @RequestParam(name = "pictureId", required = false) String pictureId,
                                           HttpServletRequest req) {
-        OcrPicture result = ocrPictureService.getPackagePictureInfo(checkDuplicateId, pictureId);
+        UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(req));
+        OcrPicture result = ocrPictureService.getPackagePictureInfo(checkDuplicateId, pictureId,userToken);
         return ResultVoUtil.success(result);
     }
 

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

@@ -12,7 +12,7 @@ import java.util.List;
 */
 @Mapper
 public interface OcrPictureMybatisDao extends BaseMapper<OcrPicture> {
-    OcrPicture getPackagePictureInfo(@Param("packageId") String packageId, @Param("pictureId") String pictureId);
+    OcrPicture getPackagePictureInfo(@Param("packageId") String packageId, @Param("pictureId") String pictureId, @Param("userNodeType") String userNodeType);
 
     List<OcrPicture> getPictureNodeStatesList(@Param("pictureIds") List<String> pictureIds, @Param("userNodeType") String userNodeType);
 }

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

@@ -6,7 +6,6 @@ import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
 import cn.jyjz.xiaoyao.common.base.vo.UserToken;
 import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture;
-import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -68,7 +67,7 @@ public interface OcrPictureService extends BaseService<OcrPicture>  {
 
     String getServerUrl();
 
-    OcrPicture getPackagePictureInfo(String packageId, String pictureId);
+    OcrPicture getPackagePictureInfo(String packageId, String pictureId, UserToken userToken);
 
     /**
      * 根据图片id查询图片节点状态

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

@@ -17,9 +17,7 @@ import cn.jyjz.xiaoyao.ocr.dataobject.*;
 import cn.jyjz.xiaoyao.ocr.service.*;
 import cn.jyjz.xiaoyao.ocr.thread.TaskQueue;
 import cn.jyjz.xiaoyao.ocr.thread.entity.PictureImgToLocalEntity;
-import cn.jyjz.xiaoyao.ocr.thread.tasks.PictureImgToLocalTask;
 import cn.jyjz.xiaoyao.ocr.util.*;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -29,17 +27,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -55,8 +42,6 @@ import java.io.IOException;
 import java.math.BigDecimal;
 import java.net.URL;
 import java.net.URLConnection;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -329,9 +314,10 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
     }
 
     @Override
-    public OcrPicture getPackagePictureInfo(String checkDuplicateId, String pictureId) {
+    public OcrPicture getPackagePictureInfo(String checkDuplicateId, String pictureId, UserToken userToken) {
+        String userNodeType = ProcessConstant.userNodeType.getOrDefault(userToken.getNodeType(), "一级审批");
 
-        return pictureMybatisDao.getPackagePictureInfo(checkDuplicateId,pictureId);
+        return pictureMybatisDao.getPackagePictureInfo(checkDuplicateId,pictureId,userNodeType);
     }
 
     @Override

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="states" property="states" jdbcType="INTEGER"/>
 
 		<association property="pictureInfo" javaType="cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureInfo">
 			<result column="pictureid" property="pictureId"/>
@@ -223,11 +224,12 @@
 	</sql>
 
 	<select id="getPackagePictureInfo" resultMap="BaseResultMap">
-        SELECT t2.*,t3.*,t4.STATES
+        SELECT t2.*,t3.*,ifnull(t4.STATES, 1)   historyStates
         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
 		left join ocr_taskchild_picture t4 on t2.ID=t4.PICTUREID
+		left join oa_userapprove_t t5 on t4.ID=t5.FORMID and t5.TASKNAME = '${userNodeType}'
         where t1.check_duplicate_id = #{packageId}
 		<if test="pictureId != null and pictureId != ''">
 			and t1.picture_id = #{pictureId}

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

@@ -702,7 +702,7 @@
             and t1.picture_id != #{pictureId}
         </if>
         <if test="oderName == 'similarityScore'">
-            order by t1.max_similarity ${oderType}
+            order by t1.max_similarity ${oderType},t2.submit_date_timestamp ${oderType}
         </if>
         <if test="oderName == 'createdate'">
             order by t2.create_time ${oderType}