diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java index 1e1a286e..ec45cd91 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java @@ -409,12 +409,12 @@ public class OcrTaskchildPictureController extends BaseController { public ResultVo getPictureSimilarityList( @RequestParam(name = "pageNo") Integer pageNo, @RequestParam(name = "pageSize") Integer pageSize, - @RequestParam(name = "oderType") String oderType, - @RequestParam(name = "oderName") String oderName, + @RequestParam(name = "oderType") String orderType, + @RequestParam(name = "orderName") String orderName, @RequestParam(name = "checkDuplicateId") String checkDuplicateId, @RequestParam(name = "pictureId", required = false) String pictureId, HttpServletRequest req) { - Page result = ocrTaskchildPictureService.getPackageSimilarityList(pageNo, pageSize, oderType, oderName, checkDuplicateId, pictureId); + Page result = ocrTaskchildPictureService.getPackageSimilarityList(pageNo, pageSize, orderType, orderName, checkDuplicateId, pictureId); return ResultVoUtil.success(result); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskPackageServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskPackageServiceImpl.java index 0719dae3..576fca32 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskPackageServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskPackageServiceImpl.java @@ -63,6 +63,7 @@ public class OcrTaskPackageServiceImpl extends ServiceImpl> records = result.getRecords(); for (Map record : records) { record.put("id",record.get("id").toString()); + record.put("checkDuplicateId",record.get("checkDuplicateId").toString()); Object search = record.getOrDefault("search", null); if(search!=null){ Map map = JSONObject.parseObject(search.toString(), Map.class); diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskPackageMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskPackageMapper.xml index 66b08a32..729b88b4 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskPackageMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskPackageMapper.xml @@ -3,7 +3,7 @@