|
|
@ -731,7 +731,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
|
|
|
|
for (OcrTaskChildPictureVo taskChildPictureVo : collect) {
|
|
|
|
for (OcrTaskChildPictureVo taskChildPictureVo : collect) {
|
|
|
|
//赋值宽高
|
|
|
|
//赋值宽高
|
|
|
|
LambdaQueryWrapper<OcrPictureInfo> ocrPictureInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
|
LambdaQueryWrapper<OcrPictureInfo> ocrPictureInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
|
ocrPictureInfoLambdaQueryWrapper.eq(OcrPictureInfo::getPictureId,taskChildPictureVo.getPictureId());
|
|
|
|
ocrPictureInfoLambdaQueryWrapper.eq(OcrPictureInfo::getPictureId, taskChildPictureVo.getPictureId());
|
|
|
|
OcrPictureInfo ocrPictureInfo = ocrPictureInfoService.getOne(ocrPictureInfoLambdaQueryWrapper);
|
|
|
|
OcrPictureInfo ocrPictureInfo = ocrPictureInfoService.getOne(ocrPictureInfoLambdaQueryWrapper);
|
|
|
|
if (ocrPictureInfo != null && ocrPictureInfo.getImgMeasure() != null) {
|
|
|
|
if (ocrPictureInfo != null && ocrPictureInfo.getImgMeasure() != null) {
|
|
|
|
String[] dimensions = ocrPictureInfo.getImgMeasure().split("x");
|
|
|
|
String[] dimensions = ocrPictureInfo.getImgMeasure().split("x");
|
|
|
@ -757,12 +757,12 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public Boolean sendFlowTaskResult(OcrTaskchildPicture taskchildPicture, OcrPicture picture, FlowApprove flowApprove) throws Exception {
|
|
|
|
public Boolean sendFlowTaskResult(OcrTaskchildPicture taskchildPicture, OcrPicture picture, FlowApprove flowApprove) throws Exception {
|
|
|
|
Department dept = departmentService.getOne(new LambdaQueryWrapper<Department>().eq(Department::getDeptno, picture.getTenantId()));
|
|
|
|
Department dept = departmentService.getOne(new LambdaQueryWrapper<Department>().eq(Department::getDeptno, picture.getTenantId()));
|
|
|
|
if(1==dept.getTypedept()){
|
|
|
|
if (1 == dept.getTypedept()) {
|
|
|
|
dept = departmentService.getOne(new LambdaQueryWrapper<Department>().eq(Department::getDeptno, dept.getParentid()));
|
|
|
|
dept = departmentService.getOne(new LambdaQueryWrapper<Department>().eq(Department::getDeptno, dept.getParentid()));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
FlowResultDto flowResultDto = new FlowResultDto();
|
|
|
|
FlowResultDto flowResultDto = new FlowResultDto();
|
|
|
|
flowResultDto.setTenantNo(Long.valueOf(dept.getDeptno()));
|
|
|
|
flowResultDto.setTenantNo(dept == null ? picture.getTenantId() : Long.valueOf(dept.getDeptno()));
|
|
|
|
flowResultDto.setAccountNo(Long.parseLong(picture.getTenantId().toString()));
|
|
|
|
flowResultDto.setAccountNo(picture.getTenantId());
|
|
|
|
flowResultDto.setTaskNo(Long.parseLong(picture.getRemark()));
|
|
|
|
flowResultDto.setTaskNo(Long.parseLong(picture.getRemark()));
|
|
|
|
flowResultDto.setPictureMatchDegree(BigDecimal.valueOf(picture.getSimilarityscore()));
|
|
|
|
flowResultDto.setPictureMatchDegree(BigDecimal.valueOf(picture.getSimilarityscore()));
|
|
|
|
flowResultDto.setIsPictureRepeat(picture.getField14() == null ? 0 : Integer.valueOf(picture.getField14()));
|
|
|
|
flowResultDto.setIsPictureRepeat(picture.getField14() == null ? 0 : Integer.valueOf(picture.getField14()));
|
|
|
|