guoxiangbin
/
ocr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	runstart/src/main/resources/application-dev.yml
#	runstart/src/main/resources/application-pro.yml
pull/1/head
shuliYao 1 year ago
parent 82ce94e50b 4ac99767b1
commit 70349a55b9
2 changed files with 409 additions and 391 deletions
Show Stats Download Patch File Download Diff File

7
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java
Unescape View File

@ -93,8 +93,9 @@ public class OcrTaskchildPictureController extends BaseController{
QueryWrapper<OcrTaskchildPicture> queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrtaskchildpicture);
queryWrapper.eq("TENANTID",tenantId);
if(StringUtils.isNotBlank(packageid)){
queryWrapper.eq("PACKAGEID",packageid);
}
IPage<OcrTaskchildPicture> page = this.ocrTaskchildPictureService.selectSearchListPage(paramterPage,queryWrapper);
QueryWrapper<OcrTaskchildPicture> queryWrapperNex = SearchQueryFormat.queryStringFormat(searchQuery,ocrtaskchildpicture);
@ -113,7 +114,7 @@ public class OcrTaskchildPictureController extends BaseController{
@ApiOperation(value="ocr_任务包下的当前图片比对的集合列表", notes="ocr_任务包下的当前图片比对的集合列表")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true),
@ApiImplicitParam(paramType = "path",name = "packageid", value = "任务包主键", required = true),
@ApiImplicitParam(paramType = "path",name = "packageid", value = "任务包主键"),
@ApiImplicitParam(paramType = "path",name = "taskchildpictureid", value = "当前选中的任务主键", required = true)
})
@GetMapping("/listbypictureid/{packageid}/{taskchildpictureid}")
@ -237,7 +238,7 @@ public class OcrTaskchildPictureController extends BaseController{
@ApiOperation(value="ocr_任务包下的当前展示的任务对象", notes="ocr_任务包下的当前展示的任务对象")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "path",name = "id", value = "当前选中的任务主键", required = true),
@ApiImplicitParam(paramType = "path",name = "packageid", value = "任务包主键，注意不是当前任务关联的packageid，而是当前选中的任务包主键", required = true)
@ApiImplicitParam(paramType = "path",name = "packageid", value = "任务包主键，注意不是当前任务关联的packageid，而是当前选中的任务包主键")
})
@GetMapping("/getdata/{id}/{packageid}")
@ResponseBody

25
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java
Unescape View File

@ -43,8 +43,10 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
@Resource
IFlowTaskService iFlowTaskService;
/**
* 图片真假设置
*
* @param childpictureids
* @return
*/
@ -143,6 +145,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
/**
* 图片是否合格设置
*
* @param childpictureid
* @return
*/
@ -172,6 +175,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
/**
* 判断当前用户是否可以审批
*
* @param formid 任务主键
* @param userToken
* @return
@ -195,6 +199,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
/**
* 判断任务是否已经审批
*
* @param formid 任务主键
* @return
*/
@ -250,6 +255,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
/**
* 批量标记当前任务相似度为百分之百
*
* @param taskids 任务主键
* @return
*/
@ -263,6 +269,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
/**
* 查询智能识别
*
* @param packageid 任务包主键
* @return
*/
@ -279,6 +286,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
/**
* 根据主键，查询图片详情
*
* @param fromid 任务主键
* @return
*/
@ -294,7 +302,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
// ocrTaskchildPicture.setIzHistory(listPictureids.contains(ocrPicture.getPictureid())?false:true);
//如果当前任务的任务包主键一致，说明不是历史数据，如果不一致，说明是历史数据
if(packageid.toString().equals(ocrTaskchildPicture.getPackageid().toString())){
if (null != packageid && packageid.toString().equals(ocrTaskchildPicture.getPackageid().toString())) {
ocrTaskchildPicture.setIzHistory(false);
} else {
ocrTaskchildPicture.setIzHistory(true);
@ -316,8 +324,10 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
return ocrTaskchildPicture;
}
/**
* 根据任务包主键，查询对应的任务信息
*
* @param taskchildpictureid 当前显示的任务主键
* @param queryWrapper
* @return
@ -329,12 +339,13 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
OcrTaskchildPicture mainOcrTaskchildPicture = this.getById(taskchildpictureid);
//判断当前图片是否为历史图片
if(!packageid.equals(mainOcrTaskchildPicture.getPackageid().toString())){
if (null != packageid && !packageid.equals(mainOcrTaskchildPicture.getPackageid().toString())) {
QueryWrapper<OcrTaskchildPicture> queryWrapperNew = new QueryWrapper<>();
queryWrapperNew.eq("TENANTID", tenantId);
if (StringUtils.isNotBlank(packageid)) {
queryWrapperNew.eq("PACKAGEID", packageid);
}
//查询非历史图片存在的集合
IPage<OcrTaskchildPicture> pageNew = this.selectSearchListPage(paramterPage, queryWrapperNew);
@ -368,7 +379,6 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
queryWrapper.in("PICTUREID", mainOcrTaskchildPicture.getOcpictureid().split(","));
IPage<OcrTaskchildPicture> iPage = this.page(page, queryWrapper);
this.formatTask(iPage.getRecords(), packageid);
@ -379,6 +389,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
/**
* 格式化显示数据
*
* @param list
* @param packageid
*/
@ -417,6 +428,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
/**
* 关闭工单
*
* @param id
* @return
*/
@ -431,6 +443,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
/**
* 生成工单
*
* @param ocrPicture 源图
* @param tenantId 公司主键
* @param sysUser 当前登录用户
@ -476,6 +489,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
/**
* 查询所有业务表集合
*
* @param query
* @return
*/
@ -487,6 +501,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
/**
* 根据任务\工单主键查询图片对象
*
* @param taskchildid
* @return
*/
@ -504,6 +519,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
/**
* 查询所有业务表数量
*
* @param query
* @return
*/
@ -513,6 +529,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
/**
* 查询所有业务表集合
*
* @param query
* @return
*/

Write Preview
Loading…
Cancel
Save