From 9975fe7cb79396ba01ba998612c3e836dc985f02 Mon Sep 17 00:00:00 2001 From: sunchenliang <2532527871@qq.com> Date: Sun, 17 Mar 2024 19:24:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E7=9B=B8=E4=BC=BC=E5=BA=A6=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- runstart/src/main/resources/application-dev.yml | 2 +- runstart/src/main/resources/application-pro.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runstart/src/main/resources/application-dev.yml b/runstart/src/main/resources/application-dev.yml index 3d0a9a1e..e18ed2d7 100644 --- a/runstart/src/main/resources/application-dev.yml +++ b/runstart/src/main/resources/application-dev.yml @@ -283,4 +283,4 @@ ocr: readTimeout: 60000 #接收超时时间 毫秒 localImagePath: /server/data/images #图片本地存储地址 image: - similarityPath: http://127.0.0.1:8000/api/classify/ \ No newline at end of file + similarityPath: http://47.93.59.251/ai/api/similarity/ \ No newline at end of file diff --git a/runstart/src/main/resources/application-pro.yml b/runstart/src/main/resources/application-pro.yml index 6503a177..047a3cc7 100644 --- a/runstart/src/main/resources/application-pro.yml +++ b/runstart/src/main/resources/application-pro.yml @@ -287,4 +287,4 @@ ocr: readTimeout: 60000 #接收超时时间 毫秒 localImagePath: /server/data/images #图片本地存储地址 image: - similarityPath: http://127.0.0.1:8000/api/classify/ \ No newline at end of file + similarityPath: http://47.93.59.251/ai/api/similarity/ \ No newline at end of file From 4ac99767b13a3ceb82060bd8d3c3c45810a81721 Mon Sep 17 00:00:00 2001 From: sunchenliang <2532527871@qq.com> Date: Sun, 17 Mar 2024 19:46:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=8C=85=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OcrTaskchildPictureController.java | 9 +- .../impl/OcrTaskchildPictureServiceImpl.java | 791 +++++++++--------- 2 files changed, 409 insertions(+), 391 deletions(-) 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 fae8abcc..3c007c35 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 @@ -93,8 +93,9 @@ public class OcrTaskchildPictureController extends BaseController{ QueryWrapper queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrtaskchildpicture); queryWrapper.eq("TENANTID",tenantId); - queryWrapper.eq("PACKAGEID",packageid); - + if(StringUtils.isNotBlank(packageid)){ + queryWrapper.eq("PACKAGEID",packageid); + } IPage page = this.ocrTaskchildPictureService.selectSearchListPage(paramterPage,queryWrapper); QueryWrapper 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 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 c9321364..689aaa4a 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 @@ -30,37 +30,39 @@ import java.util.*; import java.util.stream.Collectors; /** -* 业务层实现 -*/ + * 业务层实现 + */ @Service("ocrTaskchildPictureService") @Slf4j -public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl implements OcrTaskchildPictureService { - @Resource - private OcrTaskchildPictureMybatisDao ocrtaskchildpicturemybatisdao; +public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl implements OcrTaskchildPictureService { + @Resource + private OcrTaskchildPictureMybatisDao ocrtaskchildpicturemybatisdao; - @Resource - private OcrPictureService ocrPictureService; + @Resource + private OcrPictureService ocrPictureService; - @Resource - IFlowTaskService iFlowTaskService; - /** - * 图片真假设置 - * @param childpictureids - * @return - */ - public ResultVo trueorfalse(String childpictureids, String packageid, String iztrueorfalse, String judgeid, String judgedesc){ + @Resource + IFlowTaskService iFlowTaskService; - String[] cps = childpictureids.split(","); + /** + * 图片真假设置 + * + * @param childpictureids + * @return + */ + public ResultVo trueorfalse(String childpictureids, String packageid, String iztrueorfalse, String judgeid, String judgedesc) { - List saveList =new ArrayList<>(); + String[] cps = childpictureids.split(","); - StringBuffer historyPname = new StringBuffer(); + List saveList = new ArrayList<>(); - StringBuffer taskType = new StringBuffer(); - for(String childpictureid:cps){ - OcrTaskchildPicture old = this.listPicturePackageId(childpictureid,Long.parseLong(packageid)); + StringBuffer historyPname = new StringBuffer(); - //如果是历史图片，不允许进行设置 + StringBuffer taskType = new StringBuffer(); + for (String childpictureid : cps) { + OcrTaskchildPicture old = this.listPicturePackageId(childpictureid, Long.parseLong(packageid)); + + //如果是历史图片，不允许进行设置 // if(old.isIzHistory()){ // if(historyPname.length() > 0){ // historyPname.append("," + old.getOcrPicture().getImgname()); @@ -76,14 +78,14 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl saveList =new ArrayList<>(); + List saveList = new ArrayList<>(); - StringBuffer historyPname = new StringBuffer(); + StringBuffer historyPname = new StringBuffer(); - StringBuffer taskType = new StringBuffer(); - for(String childpictureid:cps){ - OcrTaskchildPicture old = this.listPicturePackageId(childpictureid,Long.parseLong(packageid)); + StringBuffer taskType = new StringBuffer(); + for (String childpictureid : cps) { + OcrTaskchildPicture old = this.listPicturePackageId(childpictureid, Long.parseLong(packageid)); - //如果是历史图片，不允许进行设置 + //如果是历史图片，不允许进行设置 // if(old.isIzHistory()){ // if(historyPname.length() > 0){ // historyPname.append("," + old.getOcrPicture().getImgname()); @@ -122,14 +124,14 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl list = this.ocrtaskchildpicturemybatisdao.selectList(queryWrapper); - - //目前没有做其他信息返回，如果需要再做修改 - for(OcrTaskchildPicture ocrTaskchildPicture:list){ - //判断审批人是否为当前登录用户 - if(userToken.getLoginname().equals(ocrTaskchildPicture.getAssignee())){ - - }else{ - return false; - } - } - return true; - } - - /** - * 判断任务是否已经审批 - * @param formid 任务主键 - * @return - */ - public boolean validateApprove(String[] formid){ - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.in("ID",formid); - List list = this.ocrtaskchildpicturemybatisdao.selectList(queryWrapper); - - //目前没有做其他信息返回，如果需要再做修改 - for(OcrTaskchildPicture ocrTaskchildPicture:list){ - //判断当前审批状态为拒绝或者通过的，不允许再做审批 - if(ocrTaskchildPicture.getStates().intValue() == SystemConstantsOa.OA_STATUS_TYPE_END - || ocrTaskchildPicture.getStates().intValue() == SystemConstantsOa.OA_STATUS_TYPE_REFUSE ){ - return false; - }else{ - - } - } - return true; - } - - - /** - * 判断任务是否已经审批 - * - * @param formid 任务主键 - * @return - */ - public boolean validateBoole(String[] formid) { - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.in("ID", formid); - List list = this.ocrtaskchildpicturemybatisdao.selectList(queryWrapper); - List pictures = ocrPictureService.list(new LambdaQueryWrapper().eq(OcrPicture::getId, list.stream().map(OcrTaskchildPicture::getPictureid).collect(Collectors.toList())).isNull(OcrPicture::getIztrueorfalse)); - if (pictures.size() > 1) { - return false; - } - return true; - } - - @Override - public List listAll(String tenantId, String createUser, QueryWrapper queryWrapper){ - - - long count = this.count(queryWrapper); - - Page page = new Page<>(1, count); - page.setMaxLimit(count); - - IPage iPage = this.page(page,queryWrapper); - - return iPage.getRecords(); - } - - /** - * 批量标记当前任务相似度为百分之百 - * @param taskids 任务主键 - * @return - */ - public boolean markPoint(List taskids){ - UpdateWrapper updateWrapper = new UpdateWrapper(); - updateWrapper.set("HAVEPOINTS",1); - updateWrapper.in("ID",taskids); - - return this.update(updateWrapper); - } - - /** - * 查询智能识别 - * @param packageid 任务包主键 - * @return - */ - public List markpoint(String packageid){ - QueryWrapper queryWrapperNew = new QueryWrapper<>(); - queryWrapperNew.eq("HAVEPOINTS","1"); - queryWrapperNew.eq("PACKAGEID",packageid); - - List list = this.ocrtaskchildpicturemybatisdao.selectList(queryWrapperNew); - this.formatTask(list,packageid); - - return list; - } - - /** - * 根据主键，查询图片详情 - * @param fromid 任务主键 - * @return - */ - public OcrTaskchildPicture listPicturePackageId(String fromid,Long packageid){ - OcrTaskchildPicture ocrTaskchildPicture = this.getById(fromid); - //查询图片对象 - OcrPicture ocrPicture = this.ocrPictureService.selectDtoById(ocrTaskchildPicture.getPictureid()); + old.setUpdatetime(System.currentTimeMillis()); + + return this.updateById(old); + } + + /** + * 判断当前用户是否可以审批 + * + * @param formid 任务主键 + * @param userToken + * @return + */ + public boolean validateAssignee(String[] formid, UserToken userToken) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.in("ID", formid); + List list = this.ocrtaskchildpicturemybatisdao.selectList(queryWrapper); + + //目前没有做其他信息返回，如果需要再做修改 + for (OcrTaskchildPicture ocrTaskchildPicture : list) { + //判断审批人是否为当前登录用户 + if (userToken.getLoginname().equals(ocrTaskchildPicture.getAssignee())) { + + } else { + return false; + } + } + return true; + } + + /** + * 判断任务是否已经审批 + * + * @param formid 任务主键 + * @return + */ + public boolean validateApprove(String[] formid) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.in("ID", formid); + List list = this.ocrtaskchildpicturemybatisdao.selectList(queryWrapper); + + //目前没有做其他信息返回，如果需要再做修改 + for (OcrTaskchildPicture ocrTaskchildPicture : list) { + //判断当前审批状态为拒绝或者通过的，不允许再做审批 + if (ocrTaskchildPicture.getStates().intValue() == SystemConstantsOa.OA_STATUS_TYPE_END + || ocrTaskchildPicture.getStates().intValue() == SystemConstantsOa.OA_STATUS_TYPE_REFUSE) { + return false; + } else { + + } + } + return true; + } + + + /** + * 判断任务是否已经审批 + * + * @param formid 任务主键 + * @return + */ + public boolean validateBoole(String[] formid) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.in("ID", formid); + List list = this.ocrtaskchildpicturemybatisdao.selectList(queryWrapper); + List pictures = ocrPictureService.list(new LambdaQueryWrapper().eq(OcrPicture::getId, list.stream().map(OcrTaskchildPicture::getPictureid).collect(Collectors.toList())).isNull(OcrPicture::getIztrueorfalse)); + if (pictures.size() > 1) { + return false; + } + return true; + } + + @Override + public List listAll(String tenantId, String createUser, QueryWrapper queryWrapper) { + + + long count = this.count(queryWrapper); + + Page page = new Page<>(1, count); + page.setMaxLimit(count); + + IPage iPage = this.page(page, queryWrapper); + + return iPage.getRecords(); + } + + /** + * 批量标记当前任务相似度为百分之百 + * + * @param taskids 任务主键 + * @return + */ + public boolean markPoint(List taskids) { + UpdateWrapper updateWrapper = new UpdateWrapper(); + updateWrapper.set("HAVEPOINTS", 1); + updateWrapper.in("ID", taskids); + + return this.update(updateWrapper); + } + + /** + * 查询智能识别 + * + * @param packageid 任务包主键 + * @return + */ + public List markpoint(String packageid) { + QueryWrapper queryWrapperNew = new QueryWrapper<>(); + queryWrapperNew.eq("HAVEPOINTS", "1"); + queryWrapperNew.eq("PACKAGEID", packageid); + + List list = this.ocrtaskchildpicturemybatisdao.selectList(queryWrapperNew); + this.formatTask(list, packageid); + + return list; + } + + /** + * 根据主键，查询图片详情 + * + * @param fromid 任务主键 + * @return + */ + public OcrTaskchildPicture listPicturePackageId(String fromid, Long packageid) { + OcrTaskchildPicture ocrTaskchildPicture = this.getById(fromid); + //查询图片对象 + OcrPicture ocrPicture = this.ocrPictureService.selectDtoById(ocrTaskchildPicture.getPictureid()); // String pictureids = ocrTaskchildPicture.getPicturecompare(); // String[] splitPictureids = pictureids.split(","); @@ -293,103 +301,106 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl taskList = iFlowTaskService.nowRunTask(ocrTaskchildPicture.getProcessinstanceid(),ocrTaskchildPicture.getProcessdefinitionid()); - if(null != taskList && !taskList.isEmpty()) { - ocrTaskchildPicture.setTaskId(taskList.get(0).getId()); - } - - //获取当前真假标记 - ocrTaskchildPicture.setIztrueorfalse(ocrPicture.getIztrueorfalse()); - //是否已经审批 - ocrTaskchildPicture.setWorkStatus(ocrPicture.getWorkStatus()); - - - ocrTaskchildPicture.setOcrPicture(ocrPicture); - - return ocrTaskchildPicture; - } - /** - * 根据任务包主键，查询对应的任务信息 - * @param taskchildpictureid 当前显示的任务主键 - * @param queryWrapper - * @return - */ - public IPage listByPackageId(String taskchildpictureid, ParamterPage paramterPage,QueryWrapper queryWrapper,String orderbyname,String orderbyvalue,String packageid,String tenantId ){ - Page page = new Page<>(paramterPage.getStart(), paramterPage.getPagesize()); - - //当前显示的任务对象 - OcrTaskchildPicture mainOcrTaskchildPicture = this.getById(taskchildpictureid); - - //判断当前图片是否为历史图片 - if(!packageid.equals(mainOcrTaskchildPicture.getPackageid().toString())){ - - QueryWrapper queryWrapperNew = new QueryWrapper<>(); - queryWrapperNew.eq("TENANTID",tenantId); - queryWrapperNew.eq("PACKAGEID",packageid); - - //查询非历史图片存在的集合 - IPage pageNew = this.selectSearchListPage(paramterPage,queryWrapperNew); - - //如果是历史图片，从非历史图片存在的集合中随机选取一个 - if(!pageNew.getRecords().isEmpty()){ - mainOcrTaskchildPicture = pageNew.getRecords().get(0); - } - - } - - //不包含当前选中的图片 - queryWrapper.ne("ID",taskchildpictureid); - - queryWrapper.eq("TENANTID",tenantId); - if(StringUtils.isNotBlank(orderbyname) && orderbyname.equals("asc")){ - if(StringUtils.isNotBlank(orderbyvalue) && orderbyvalue.equals("pictureResult")){ - queryWrapper.orderByAsc("FIELD(PICTUREID,"+ mainOcrTaskchildPicture.getOcpictureid() +")"); - }else if(StringUtils.isNotBlank(orderbyvalue) && orderbyvalue.equals("fromuptime")){ - queryWrapper.orderByAsc("FROMUPTIME"); - } - - }else if(StringUtils.isNotBlank(orderbyname) && orderbyname.equals("desc")){ - - if(StringUtils.isNotBlank(orderbyvalue) && orderbyvalue.equals("pictureResult")){ - queryWrapper.orderByDesc("FIELD(PICTUREID,"+ mainOcrTaskchildPicture.getOcpictureid() +")"); - }else if(StringUtils.isNotBlank(orderbyvalue) && orderbyvalue.equals("fromuptime")){ - queryWrapper.orderByDesc("FROMUPTIME"); - } - - } - queryWrapper.in("PICTUREID",mainOcrTaskchildPicture.getOcpictureid().split(",")); - - - - IPage iPage = this.page(page,queryWrapper); - - this.formatTask(iPage.getRecords(),packageid); - - - return iPage; - } - - /** - * 格式化显示数据 - * @param list - * @param packageid - */ - private void formatTask(List list,String packageid){ - for(OcrTaskchildPicture ocrTaskchildPicture:list){ - - //查询审批流节点信息 - List taskList = iFlowTaskService.nowRunTask(ocrTaskchildPicture.getProcessinstanceid(),ocrTaskchildPicture.getProcessdefinitionid()); - if(null != taskList && !taskList.isEmpty()) { - ocrTaskchildPicture.setTaskId(taskList.get(0).getId()); - } + //如果当前任务的任务包主键一致，说明不是历史数据，如果不一致，说明是历史数据 + if (null != packageid && packageid.toString().equals(ocrTaskchildPicture.getPackageid().toString())) { + ocrTaskchildPicture.setIzHistory(false); + } else { + ocrTaskchildPicture.setIzHistory(true); + } + + //查询审批流节点信息 + List taskList = iFlowTaskService.nowRunTask(ocrTaskchildPicture.getProcessinstanceid(), ocrTaskchildPicture.getProcessdefinitionid()); + if (null != taskList && !taskList.isEmpty()) { + ocrTaskchildPicture.setTaskId(taskList.get(0).getId()); + } + + //获取当前真假标记 + ocrTaskchildPicture.setIztrueorfalse(ocrPicture.getIztrueorfalse()); + //是否已经审批 + ocrTaskchildPicture.setWorkStatus(ocrPicture.getWorkStatus()); + + + ocrTaskchildPicture.setOcrPicture(ocrPicture); + + return ocrTaskchildPicture; + } + + /** + * 根据任务包主键，查询对应的任务信息 + * + * @param taskchildpictureid 当前显示的任务主键 + * @param queryWrapper + * @return + */ + public IPage listByPackageId(String taskchildpictureid, ParamterPage paramterPage, QueryWrapper queryWrapper, String orderbyname, String orderbyvalue, String packageid, String tenantId) { + Page page = new Page<>(paramterPage.getStart(), paramterPage.getPagesize()); + + //当前显示的任务对象 + OcrTaskchildPicture mainOcrTaskchildPicture = this.getById(taskchildpictureid); + + //判断当前图片是否为历史图片 + if (null != packageid && !packageid.equals(mainOcrTaskchildPicture.getPackageid().toString())) { + + QueryWrapper queryWrapperNew = new QueryWrapper<>(); + queryWrapperNew.eq("TENANTID", tenantId); + if (StringUtils.isNotBlank(packageid)) { + queryWrapperNew.eq("PACKAGEID", packageid); + } + //查询非历史图片存在的集合 + IPage pageNew = this.selectSearchListPage(paramterPage, queryWrapperNew); + + //如果是历史图片，从非历史图片存在的集合中随机选取一个 + if (!pageNew.getRecords().isEmpty()) { + mainOcrTaskchildPicture = pageNew.getRecords().get(0); + } + + } + + //不包含当前选中的图片 + queryWrapper.ne("ID", taskchildpictureid); + + queryWrapper.eq("TENANTID", tenantId); + if (StringUtils.isNotBlank(orderbyname) && orderbyname.equals("asc")) { + if (StringUtils.isNotBlank(orderbyvalue) && orderbyvalue.equals("pictureResult")) { + queryWrapper.orderByAsc("FIELD(PICTUREID," + mainOcrTaskchildPicture.getOcpictureid() + ")"); + } else if (StringUtils.isNotBlank(orderbyvalue) && orderbyvalue.equals("fromuptime")) { + queryWrapper.orderByAsc("FROMUPTIME"); + } + + } else if (StringUtils.isNotBlank(orderbyname) && orderbyname.equals("desc")) { + + if (StringUtils.isNotBlank(orderbyvalue) && orderbyvalue.equals("pictureResult")) { + queryWrapper.orderByDesc("FIELD(PICTUREID," + mainOcrTaskchildPicture.getOcpictureid() + ")"); + } else if (StringUtils.isNotBlank(orderbyvalue) && orderbyvalue.equals("fromuptime")) { + queryWrapper.orderByDesc("FROMUPTIME"); + } + + } + queryWrapper.in("PICTUREID", mainOcrTaskchildPicture.getOcpictureid().split(",")); + + + IPage iPage = this.page(page, queryWrapper); + + this.formatTask(iPage.getRecords(), packageid); + + + return iPage; + } + + /** + * 格式化显示数据 + * + * @param list + * @param packageid + */ + private void formatTask(List list, String packageid) { + for (OcrTaskchildPicture ocrTaskchildPicture : list) { + + //查询审批流节点信息 + List taskList = iFlowTaskService.nowRunTask(ocrTaskchildPicture.getProcessinstanceid(), ocrTaskchildPicture.getProcessdefinitionid()); + if (null != taskList && !taskList.isEmpty()) { + ocrTaskchildPicture.setTaskId(taskList.get(0).getId()); + } // //非历史图片主键集合 // String pictureids = ocrTaskchildPicture.getPicturecompare(); // String[] splitPictureids = pictureids.split(","); @@ -397,63 +408,65 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl listFinal(Map query){ - - return this.ocrtaskchildpicturemybatisdao.listFinal(query); - } - - - /** - * 根据任务\工单主键查询图片对象 - * @param taskchildid - * @return - */ - public OcrPicture findOcrPictureByTaskchildid(String taskchildid){ - OcrTaskchildPicture ocrTaskchildPicture = this.ocrtaskchildpicturemybatisdao.selectById(taskchildid); - - if(null == ocrTaskchildPicture){ - return null; - } - - OcrPicture ocrPicture = ocrPictureService.selectDtoById(ocrTaskchildPicture.getPictureid()); - - return ocrPicture; - } - - /** - * 查询所有业务表数量 - * @param query - * @return - */ - public Long listFinalCount(Map query){ - return this.ocrtaskchildpicturemybatisdao.listFinalCount(query); - } - - /** - * 查询所有业务表集合 - * @param query - * @return - */ - public List listmytask(Map query){ - return this.ocrtaskchildpicturemybatisdao.listmytask(query); - } - - public Long listmytaskCount(Map query){ - return this.ocrtaskchildpicturemybatisdao.listmytaskCount(query); - } + return this.save(ocrTaskchildPicture) ? ocrTaskchildPicture : null; + } + + /** + * 查询所有业务表集合 + * + * @param query + * @return + */ + public List listFinal(Map query) { + + return this.ocrtaskchildpicturemybatisdao.listFinal(query); + } + + + /** + * 根据任务\工单主键查询图片对象 + * + * @param taskchildid + * @return + */ + public OcrPicture findOcrPictureByTaskchildid(String taskchildid) { + OcrTaskchildPicture ocrTaskchildPicture = this.ocrtaskchildpicturemybatisdao.selectById(taskchildid); + + if (null == ocrTaskchildPicture) { + return null; + } + + OcrPicture ocrPicture = ocrPictureService.selectDtoById(ocrTaskchildPicture.getPictureid()); + + return ocrPicture; + } + + /** + * 查询所有业务表数量 + * + * @param query + * @return + */ + public Long listFinalCount(Map query) { + return this.ocrtaskchildpicturemybatisdao.listFinalCount(query); + } + + /** + * 查询所有业务表集合 + * + * @param query + * @return + */ + public List listmytask(Map query) { + return this.ocrtaskchildpicturemybatisdao.listmytask(query); + } + + public Long listmytaskCount(Map query) { + return this.ocrtaskchildpicturemybatisdao.listmytaskCount(query); + } }