diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java index 29890f4..03a8189 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java @@ -168,6 +168,10 @@ public class FlowTaskController extends BaseController { if(!this.ocrTaskchildPictureService.validateApprove(formid)){ return ResultVoUtil.error("存在已经审批的任务。"); } + + if(!this.ocrTaskchildPictureService.validateBoole(formid)){ + return ResultVoUtil.error("存在未判真假数据。"); + } //TODO 判断taskid是否为非法，空置、taskid是否存在 @@ -248,11 +252,30 @@ public class FlowTaskController extends BaseController { //租户主键，由前端页面传送 String tenantId = request.getHeader("X-Tenant-Id"); - + String taskid = request.getParameter("taskid"); + String states = request.getParameter("states"); + String fromprojectid = request.getParameter("fromprojectid"); + String fromuserid = request.getParameter("fromuserid"); + String fromplanid = request.getParameter("fromplanid"); + if(org.apache.commons.lang3.StringUtils.isBlank(tenantId)){ return ResultVoUtil.error("租户主键不能为空"); } - + if(StringUtils.isNotBlank(taskid)){ + searchQuery.addEqual("taskid",taskid); + } + if(StringUtils.isNotBlank(states)){ + searchQuery.addEqual("states",states); + } + if(StringUtils.isNotBlank(fromprojectid)){ + searchQuery.addEqual("fromprojectid",fromprojectid); + } + if(StringUtils.isNotBlank(fromuserid)){ + searchQuery.addEqual("fromuserid",fromuserid); + } + if(StringUtils.isNotBlank(fromplanid)){ + searchQuery.addEqual("fromplanid",fromplanid); + } User user = this.userService.getSessionUser(request); if(user.isUserIsSys(xiaoyaoConfig.getWebconfig().getSysLoginUser().split(","))){ @@ -262,7 +285,7 @@ public class FlowTaskController extends BaseController { //如果assigneeId 为空查询发起流程，否则查询待办流程 if(StringUtils.isNotBlank(assigneeId) && assigneeId.equals(user.getId().toString())){ searchQuery.addEqual("assignee",user.getLoginname()); - searchQuery.addEqual("states",SystemConstantsOa.OA_STATUS_TYPE_ING.toString()); +// searchQuery.addEqual("states",SystemConstantsOa.OA_STATUS_TYPE_ING.toString()); }else{ searchQuery.addEqual("createuser",user.getLoginname()); } @@ -450,4 +473,23 @@ public class FlowTaskController extends BaseController { //return ResultVoUtil.success(); } + + /** + * 审批历史记录 + * @return + */ + @ApiOperation(value="重置流程流程", notes="重置流程流程") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true), + @ApiImplicitParam(paramType = "path",name = "buessinessno", value = "业务编码", required = true) + }) + @GetMapping("/historyTask") + @ResponseBody + public ResultVo historyTask(HttpServletRequest request){ + String fromid = request.getParameter("fromid"); + String taskid = request.getParameter("buessinessno"); + return flowTaskService.removeTask(fromid,taskid); + + //return ResultVoUtil.success(); + } } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPackagetaskController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPackagetaskController.java index bc00c8b..3fc5dd3 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPackagetaskController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPackagetaskController.java @@ -97,12 +97,16 @@ public class OcrPackagetaskController extends BaseController{ if(StringUtils.isBlank(tenantId)){ return ResultVoUtil.error("租户主键不能为空"); } - + String packageName = request.getParameter("packagename"); + //获取当前登录人 UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("tenant_id",tenantId); + if(StringUtils.isNotBlank(packageName)){ + queryWrapper.like("packagename",packageName); + } Page page = new Page(pageNo, pageSize); IPage pageList = ocrPackagetaskService.page(page, queryWrapper); return ResultVoUtil.success(pageList); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrTaskchildPictureService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrTaskchildPictureService.java index 4c21546..3268fa7 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrTaskchildPictureService.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrTaskchildPictureService.java @@ -40,6 +40,8 @@ public interface OcrTaskchildPictureService extends BaseService implements OcrTaskchildPictureService { - @Resource - private OcrTaskchildPictureMybatisDao ocrtaskchildpicturemybatisdao; - - @Resource - private OcrPictureService ocrPictureService; - - @Resource - IFlowTaskService iFlowTaskService; - /** - * 图片真假设置 - * @param childpictureids - * @return - */ - public ResultVo trueorfalse(String childpictureids, String packageid, String iztrueorfalse, String judgeid, String judgedesc){ - - String[] cps = childpictureids.split(","); - - List saveList =new ArrayList<>(); - - 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()); - }else{ - historyPname.append(old.getOcrPicture().getImgname()); - } - } - if(old.getStates().intValue() == 3 || old.getStates().intValue() == 5) { - if(taskType.length() > 0){ - taskType.append("," + old.getOcrPicture().getImgname()); - }else{ - taskType.append(old.getOcrPicture().getImgname()); - } - } - - OcrPicture ocrPicture = old.getOcrPicture(); - ocrPicture.setJudgeid(Long.parseLong(judgeid)); - ocrPicture.setJudgedesc(judgedesc); - ocrPicture.setIztrueorfalse(Integer.parseInt(iztrueorfalse)); - ocrPicture.setUpdateTime(System.currentTimeMillis()); - - saveList.add(ocrPicture); - } - - if(StringUtils.isNotBlank(historyPname.toString())){ - return ResultVoUtil.error(historyPname.toString() + "为历史数据，不能标记。"); - } - else if(StringUtils.isNotBlank(taskType.toString())){ - return ResultVoUtil.error( taskType.toString() + "已经审批，不能标记。"); - } - - return this.ocrPictureService.updateBatchById(saveList)?ResultVoUtil.success():ResultVoUtil.error(); - } - - public ResultVo clearmark(String childpictureids, String packageid){ - String[] cps = childpictureids.split(","); - - List saveList =new ArrayList<>(); - - 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()); - }else{ - historyPname.append(old.getOcrPicture().getImgname()); - } - } - if(old.getStates().intValue() == 3 || old.getStates().intValue() == 5) { - if(taskType.length() > 0){ - taskType.append("," + old.getOcrPicture().getImgname()); - }else{ - taskType.append(old.getOcrPicture().getImgname()); - } - } - - OcrPicture ocrPicture = old.getOcrPicture(); - ocrPicture.setJudgeid(null); - ocrPicture.setJudgedesc(null); - ocrPicture.setIztrueorfalse(null); - ocrPicture.setUpdateTime(System.currentTimeMillis()); - - saveList.add(ocrPicture); - } - - if(StringUtils.isNotBlank(historyPname.toString())){ - return ResultVoUtil.error(historyPname.toString() + "为历史数据，不能清除标记。"); - } - else if(StringUtils.isNotBlank(taskType.toString())){ - return ResultVoUtil.error( taskType.toString() + "已经审批，不能清除标记。"); - } - - return this.ocrPictureService.updateBatchById(saveList)?ResultVoUtil.success():ResultVoUtil.error(); - } - - /** - * 图片是否合格设置 - * @param childpictureid - * @return - */ - public boolean pass(String childpictureid,OcrTaskchildPicture ocrTaskchildPicture){ - OcrTaskchildPicture old = this.getById(childpictureid); - - //判断当前图片是否在任务包中，如果不在任务保重，不允许设置图片真假 - if(!old.getPackageid().equals(ocrTaskchildPicture.getPackageid())){ - return false; - } +public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl implements OcrTaskchildPictureService { + @Resource + private OcrTaskchildPictureMybatisDao ocrtaskchildpicturemybatisdao; + + @Resource + private OcrPictureService ocrPictureService; + + @Resource + IFlowTaskService iFlowTaskService; + + /** + * 图片真假设置 + * + * @param childpictureids + * @return + */ + public ResultVo trueorfalse(String childpictureids, String packageid, String iztrueorfalse, String judgeid, String judgedesc) { + + String[] cps = childpictureids.split(","); + + List saveList = new ArrayList<>(); + + 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()); + } else { + historyPname.append(old.getOcrPicture().getImgname()); + } + } + if (old.getStates().intValue() == 3 || old.getStates().intValue() == 5) { + if (taskType.length() > 0) { + taskType.append("," + old.getOcrPicture().getImgname()); + } else { + taskType.append(old.getOcrPicture().getImgname()); + } + } + + OcrPicture ocrPicture = old.getOcrPicture(); + ocrPicture.setJudgeid(Long.parseLong(judgeid)); + ocrPicture.setJudgedesc(judgedesc); + ocrPicture.setIztrueorfalse(Integer.parseInt(iztrueorfalse)); + ocrPicture.setUpdateTime(System.currentTimeMillis()); + + saveList.add(ocrPicture); + } + + if (StringUtils.isNotBlank(historyPname.toString())) { + return ResultVoUtil.error(historyPname.toString() + "为历史数据，不能标记。"); + } else if (StringUtils.isNotBlank(taskType.toString())) { + return ResultVoUtil.error(taskType.toString() + "已经审批，不能标记。"); + } + + return this.ocrPictureService.updateBatchById(saveList) ? ResultVoUtil.success() : ResultVoUtil.error(); + } + + public ResultVo clearmark(String childpictureids, String packageid) { + String[] cps = childpictureids.split(","); + + List saveList = new ArrayList<>(); + + 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()); + } else { + historyPname.append(old.getOcrPicture().getImgname()); + } + } + if (old.getStates().intValue() == 3 || old.getStates().intValue() == 5) { + if (taskType.length() > 0) { + taskType.append("," + old.getOcrPicture().getImgname()); + } else { + taskType.append(old.getOcrPicture().getImgname()); + } + } + + OcrPicture ocrPicture = old.getOcrPicture(); + ocrPicture.setJudgeid(null); + ocrPicture.setJudgedesc(null); + ocrPicture.setIztrueorfalse(null); + ocrPicture.setUpdateTime(System.currentTimeMillis()); + + saveList.add(ocrPicture); + } + + if (StringUtils.isNotBlank(historyPname.toString())) { + return ResultVoUtil.error(historyPname.toString() + "为历史数据，不能清除标记。"); + } else if (StringUtils.isNotBlank(taskType.toString())) { + return ResultVoUtil.error(taskType.toString() + "已经审批，不能清除标记。"); + } + + return this.ocrPictureService.updateBatchById(saveList) ? ResultVoUtil.success() : ResultVoUtil.error(); + } + + /** + * 图片是否合格设置 + * + * @param childpictureid + * @return + */ + public boolean pass(String childpictureid, OcrTaskchildPicture ocrTaskchildPicture) { + OcrTaskchildPicture old = this.getById(childpictureid); + + //判断当前图片是否在任务包中，如果不在任务保重，不允许设置图片真假 + if (!old.getPackageid().equals(ocrTaskchildPicture.getPackageid())) { + return false; + } // // //更新图片真假 // if(StringUtils.isNotBlank(ocrTaskchildPicture.getIzpass())){ @@ -162,109 +165,131 @@ 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; - } - - @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(","); @@ -272,103 +297,105 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl taskList = iFlowTaskService.nowRunTask(ocrTaskchildPicture.getProcessinstanceid(),ocrTaskchildPicture.getProcessdefinitionid()); - if(null != taskList && !taskList.isEmpty()) { - ocrTaskchildPicture.setTaskId(taskList.get(0).getId()); - } + //查询审批流节点信息 + 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.setIztrueorfalse(ocrPicture.getIztrueorfalse()); + //是否已经审批 + ocrTaskchildPicture.setWorkStatus(ocrPicture.getWorkStatus()); - ocrTaskchildPicture.setOcrPicture(ocrPicture); + 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()); + return ocrTaskchildPicture; + } - //当前显示的任务对象 - OcrTaskchildPicture mainOcrTaskchildPicture = this.getById(taskchildpictureid); + /** + * 根据任务包主键，查询对应的任务信息 + * + * @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()); - //判断当前图片是否为历史图片 - if(!packageid.equals(mainOcrTaskchildPicture.getPackageid().toString())){ + //当前显示的任务对象 + OcrTaskchildPicture mainOcrTaskchildPicture = this.getById(taskchildpictureid); - QueryWrapper queryWrapperNew = new QueryWrapper<>(); - queryWrapperNew.eq("TENANTID",tenantId); - queryWrapperNew.eq("PACKAGEID",packageid); + //判断当前图片是否为历史图片 + if (!packageid.equals(mainOcrTaskchildPicture.getPackageid().toString())) { - //查询非历史图片存在的集合 - IPage pageNew = this.selectSearchListPage(paramterPage,queryWrapperNew); + QueryWrapper queryWrapperNew = new QueryWrapper<>(); + queryWrapperNew.eq("TENANTID", tenantId); + queryWrapperNew.eq("PACKAGEID", packageid); - //如果是历史图片，从非历史图片存在的集合中随机选取一个 - if(!pageNew.getRecords().isEmpty()){ - mainOcrTaskchildPicture = pageNew.getRecords().get(0); - } + //查询非历史图片存在的集合 + 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"); - } + //不包含当前选中的图片 + queryWrapper.ne("ID", taskchildpictureid); - }else if(StringUtils.isNotBlank(orderbyname) && orderbyname.equals("desc")){ + 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"); + } - if(StringUtils.isNotBlank(orderbyvalue) && orderbyvalue.equals("pictureResult")){ - queryWrapper.orderByDesc("FIELD(PICTUREID,"+ mainOcrTaskchildPicture.getOcpictureid() +")"); - }else if(StringUtils.isNotBlank(orderbyvalue) && orderbyvalue.equals("fromuptime")){ - queryWrapper.orderByDesc("FROMUPTIME"); - } + } else if (StringUtils.isNotBlank(orderbyname) && orderbyname.equals("desc")) { - } - queryWrapper.in("PICTUREID",mainOcrTaskchildPicture.getOcpictureid().split(",")); + 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); + IPage iPage = this.page(page, queryWrapper); - this.formatTask(iPage.getRecords(),packageid); + this.formatTask(iPage.getRecords(), packageid); - return iPage; - } + return iPage; + } - /** - * 格式化显示数据 - * @param list - * @param packageid - */ - private void formatTask(List list,String packageid){ - for(OcrTaskchildPicture ocrTaskchildPicture:list){ + /** + * 格式化显示数据 + * + * @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()); - } + //查询审批流节点信息 + 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(","); @@ -376,117 +403,122 @@ 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); - } + return this.updateById(ocrTaskchildPicture); + } + return false; + } + + /** + * 生成工单 + * + * @param ocrPicture 源图 + * @param tenantId 公司主键 + * @param sysUser 当前登录用户 + */ + public OcrTaskchildPicture create(OcrPicture ocrPicture, String tenantId, UserToken sysUser, Long packageid, String buessinessno) { + + OcrTaskchildPicture ocrTaskchildPicture = new OcrTaskchildPicture(); + ocrTaskchildPicture.setBuessinessno(buessinessno); + ocrTaskchildPicture.setFromtaskid(ocrPicture.getRemark()); + ocrTaskchildPicture.setFromtaskname(ocrPicture.getTaskname()); + ocrTaskchildPicture.setPictureid(ocrPicture.getId()); + ocrTaskchildPicture.setTenantid(Long.parseLong(tenantId)); + ocrTaskchildPicture.setCreateuser(sysUser.getLoginname()); + ocrTaskchildPicture.setCreateusername(sysUser.getUsername()); + ocrTaskchildPicture.setCreatedate(System.currentTimeMillis()); + ocrTaskchildPicture.setPackageid(packageid); + ocrTaskchildPicture.setCategoryid(ocrPicture.getCategoryid()); + + ocrTaskchildPicture.setFromsourceid(ocrPicture.getField4()); + ocrTaskchildPicture.setFromuptime(ocrPicture.getUptime()); + ocrTaskchildPicture.setFromplanid(ocrPicture.getPlanid()); + ocrTaskchildPicture.setFromprojectid(ocrPicture.getProjectid()); + ocrTaskchildPicture.setFromuserid(ocrPicture.getUpuserid()); + + StringBuffer pcid = new StringBuffer(); + StringBuffer result = new StringBuffer(); + for (OcrPicture comp : ocrPicture.getListCom()) { + if (null == pcid || pcid.toString().length() < 1) { + pcid.append(comp.getId()); + result.append(comp.getResult()); + } else { + pcid.append("," + comp.getId()); + result.append("," + comp.getResult()); + } + } + + ocrTaskchildPicture.setOcpictureid(pcid.toString()); + ocrTaskchildPicture.setPictureresult(result.toString()); + ocrTaskchildPicture.setPicturecompare(String.join(",", ocrPicture.getPicturecompareList())); + + 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); + } } diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml index 15aefdb..3f75a13 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml @@ -111,6 +111,12 @@ and TENANTID ${tenantid.dataOp} ${tenantid.likestar}#{tenantid.value}${tenantid.likeend} and PACKAGEID ${packageid.dataOp} ${packageid.likestar}#{packageid.value}${packageid.likeend} and PROCESSDEFINITIONID ${processdefinitionid.dataOp} ${processdefinitionid.likestar}#{processdefinitionid.value}${processdefinitionid.likeend} + and TASKID ${taskid.dataOp} ${taskid.likestar}#{taskid.value}${taskid.likeend} + and FROMPROJECTID ${fromprojectid.dataOp} ${fromprojectid.likestar}#{fromprojectid.value}${fromprojectid.likeend} + and FROMUSERID ${fromuserid.dataOp} ${fromuserid.likestar}#{fromuserid.value}${fromuserid.likeend} + and FROMPLANID ${fromplanid.dataOp} ${fromplanid.likestar}#{fromplanid.value}${fromplanid.likeend} + + and ID in