refactor(修改任务包列表):修改任务包列表增加全量筛选项

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

@@ -413,7 +413,7 @@ public class OcrTaskchildPictureController extends BaseController {
             @RequestParam(name = "orderType") String orderType,
             @RequestParam(name = "orderName") String orderName,
             @RequestParam(name = "checkDuplicateId") String checkDuplicateId,
-            @RequestParam(name = "pictureId", required = false) String pictureId,
+            @RequestParam(name = "pictureId") String pictureId,
             HttpServletRequest req) {
         Page<OcrTaskChildPictureVo> result = ocrTaskchildPictureService.getPackageSimilarityList(pageNo, pageSize, orderType, orderName, checkDuplicateId, pictureId);
         return ResultVoUtil.success(result);

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

@@ -1,6 +1,5 @@
 package cn.jyjz.xiaoyao.ocr.dataDao;
 
-import cn.jyjz.xiaoyao.oa.from.vo.FlowUnionVo;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPictureAppro;
 import cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo;
@@ -53,5 +52,5 @@ public interface OcrTaskchildPictureMybatisDao extends BaseMapper<OcrTaskchildPi
 
     PictureDetailVo getPictureDetail(String pictureId);
 
-    Page<OcrTaskChildPictureVo> getPackageSimilarityList(Page<OcrTaskChildPictureVo> page, @Param("checkDuplicateId") String checkDuplicateId, @Param("pictureId") String pictureId, @Param("oderType") String oderType, @Param("oderName") String oderName);
+    Page<OcrTaskChildPictureVo> getPackageSimilarityList(Page<OcrTaskChildPictureVo> page, @Param("checkDuplicateId") String checkDuplicateId, @Param("pictureId") String pictureId, @Param("oderType") String oderType, @Param("oderName") String oderName, @Param("taskname") String taskname);
 }

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

@@ -9,6 +9,7 @@ import cn.jyjz.xiaoyao.ocr.dto.OcrTaskPackageDto;
 import cn.jyjz.xiaoyao.ocr.service.*;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -20,6 +21,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -38,6 +40,8 @@ public class OcrTaskPackageServiceImpl extends ServiceImpl<OcrTaskPackageMapper,
 
     @Resource
     private OcrTaskPackageMapper taskPackageMapper;
+    @Resource
+    private OcrFieldService fieldService;
 
     @Override
     public ResultVo saveTaskPackage(OcrTaskPackageDto ocrTaskPackage) {
@@ -59,16 +63,22 @@ public class OcrTaskPackageServiceImpl extends ServiceImpl<OcrTaskPackageMapper,
     public Page<Map<String, Object>> getPackageList(Integer pageNo, Integer pageSize, String packageName) {
         Page<Map<String, Object>> page = new Page<>(pageNo, pageSize);
         Page<Map<String, Object>> result = taskPackageMapper.getPackageList(page, packageName);
-        if(CollectionUtils.isNotEmpty(result.getRecords())){
+        if (CollectionUtils.isNotEmpty(result.getRecords())) {
+            List<OcrField> list = fieldService.list(new LambdaQueryWrapper<OcrField>().eq(OcrField::getReviewType, 1));
             List<Map<String, Object>> records = result.getRecords();
+            List<String> fieldName = list.stream().map(OcrField::getName).collect(Collectors.toList());
             for (Map<String, Object> record : records) {
-                record.put("id",record.get("id").toString());
-                record.put("checkDuplicateId",record.get("checkDuplicateId").toString());
+                record.put("id", record.get("id").toString());
+                record.put("checkDuplicateId", record.get("checkDuplicateId").toString());
                 Object search = record.getOrDefault("search", null);
-                if(search!=null){
+                if (search != null) {
                     Map map = JSONObject.parseObject(search.toString(), Map.class);
+                    for (String field : fieldName) {
+                        if (!map.containsKey(field)) {
+                            map.put(field, "");
+                        }
+                    }
                     record.putAll(map);
-                    record.put("searchTime",map.getOrDefault("submit_date_timestamp","").toString());
                 }
             }
         }

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

@@ -685,8 +685,9 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
     @Override
     public Page<OcrTaskChildPictureVo> getPackageSimilarityList(Integer pageNo, Integer pageSize, String oderType, String oderName, String checkDuplicateId, String pictureId) {
         Page<OcrTaskChildPictureVo> page = new Page<>(pageNo, pageSize);
+        OcrTaskchildPicture one = this.getOne(new LambdaQueryWrapper<OcrTaskchildPicture>().eq(OcrTaskchildPicture::getPictureid, pictureId));
 
-        return ocrtaskchildpicturemybatisdao.getPackageSimilarityList(page, checkDuplicateId, pictureId, oderType, oderName);
+        return ocrtaskchildpicturemybatisdao.getPackageSimilarityList(page, checkDuplicateId, pictureId, oderType, oderName,one.getTaskname());
     }
 
     @Override

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

@@ -696,7 +696,7 @@
         FROM ocr_check_duplicate_result t1
                  LEFT JOIN ocr_picture t2 ON t1.picture_id = t2.ID
                  LEFT JOIN ocr_taskchild_picture t3 ON t2.ID = t3.PICTUREID
-                 LEFT JOIN oa_userapprove_t t4 ON t3.ID = t4.FORMID
+                 LEFT JOIN oa_userapprove_t t4 ON t3.ID = t4.FORMID and t4.TASKNAME = '${taskname}'
         WHERE t1.check_duplicate_id = #{checkDuplicateId}
         <if test="pictureId != null and pictureId != ''">
             and t1.picture_id != #{pictureId}