From 467582ca297d3d134907baa5e166a235220adc08 Mon Sep 17 00:00:00 2001 From: sunchenliang <2532527871@qq.com> Date: Thu, 9 May 2024 13:37:27 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=9B=9E?= =?UTF-8?q?=E4=BC=A0=E6=97=A0=E9=87=8F=E4=BA=91=E7=A7=9F=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OcrTaskchildPictureServiceImpl.java | 8 ++++---- runstart/src/main/resources/application-dev.yml | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java index e0ca6214..b9c885e8 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java @@ -731,7 +731,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl ocrPictureInfoLambdaQueryWrapper = new LambdaQueryWrapper<>(); - ocrPictureInfoLambdaQueryWrapper.eq(OcrPictureInfo::getPictureId,taskChildPictureVo.getPictureId()); + ocrPictureInfoLambdaQueryWrapper.eq(OcrPictureInfo::getPictureId, taskChildPictureVo.getPictureId()); OcrPictureInfo ocrPictureInfo = ocrPictureInfoService.getOne(ocrPictureInfoLambdaQueryWrapper); if (ocrPictureInfo != null && ocrPictureInfo.getImgMeasure() != null) { String[] dimensions = ocrPictureInfo.getImgMeasure().split("x"); @@ -757,12 +757,12 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl().eq(Department::getDeptno, picture.getTenantId())); - if(1==dept.getTypedept()){ + if (1 == dept.getTypedept()) { dept = departmentService.getOne(new LambdaQueryWrapper().eq(Department::getDeptno, dept.getParentid())); } FlowResultDto flowResultDto = new FlowResultDto(); - flowResultDto.setTenantNo(Long.valueOf(dept.getDeptno())); - flowResultDto.setAccountNo(Long.parseLong(picture.getTenantId().toString())); + flowResultDto.setTenantNo(dept == null ? picture.getTenantId() : Long.valueOf(dept.getDeptno())); + flowResultDto.setAccountNo(picture.getTenantId()); flowResultDto.setTaskNo(Long.parseLong(picture.getRemark())); flowResultDto.setPictureMatchDegree(BigDecimal.valueOf(picture.getSimilarityscore())); flowResultDto.setIsPictureRepeat(picture.getField14() == null ? 0 : Integer.valueOf(picture.getField14())); diff --git a/runstart/src/main/resources/application-dev.yml b/runstart/src/main/resources/application-dev.yml index e0119470..8a5892e1 100644 --- a/runstart/src/main/resources/application-dev.yml +++ b/runstart/src/main/resources/application-dev.yml @@ -160,15 +160,15 @@ mybatis-plus: xiaoyao: web: #上传文件路径 - uploadPath: D:/ideaWork/jeecg/ocr/htmlweb/upload + uploadPath: /Users/sunchenliang/IdeaProjects/ocr/htmlweb/upload #页面根路径 - frontPath: D:/ideaWork/jeecg/ocr/htmlweb + frontPath: /Users/sunchenliang/IdeaProjects/ocr/htmlweb #js、css、图片存放路径 - staticPath: D:/ideaWork/jeecg/ocr/htmlweb/static + staticPath: /Users/sunchenliang/IdeaProjects/ocr/htmlweb/static #页面模版路径 - webPath: D:/ideaWork/jeecg/ocr/htmlweb/web + webPath: /Users/sunchenliang/IdeaProjects/ocr/htmlweb/web #Lucene索引路径 - lucenePath: D:/ideaWork/jeecg/ocr/htmlweb/lucene/indexDir + lucenePath: /Users/sunchenliang/IdeaProjects/ocr/htmlweb/lucene/indexDir #是否开启flowable haveFlowable: true webconfig: