From 74117f58a89dc78a336377c1ca621b46d63fd921 Mon Sep 17 00:00:00 2001 From: sunchenliang <2532527871@qq.com> Date: Sat, 13 Apr 2024 21:03:18 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=BB=88=E5=AE=A1=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FlowTaskController.java | 13 +- .../service/impl/FlowTaskServiceImpl.java | 178 ++++++------- .../OcrTaskchildPictureController.java | 6 +- .../ocr/dataDao/OcrPictureMybatisDao.java | 4 +- .../OcrTaskchildPictureMybatisDao.java | 9 +- .../ocr/dataobject/OcrTaskchildPicture.java | 4 + .../ocr/service/OcrPictureService.java | 8 - .../service/OcrTaskchildPictureService.java | 8 +- .../service/impl/OcrPictureServiceImpl.java | 13 +- .../impl/OcrTaskchildPictureServiceImpl.java | 14 +- .../resources/mapper/oa/OcrPictureMapper.xml | 22 +- .../mapper/oa/OcrTaskchildPictureMapper.xml | 241 ++++++++++-------- 12 files changed, 263 insertions(+), 257 deletions(-) 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 75e86a60..2d9783a3 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 @@ -383,10 +383,10 @@ public class FlowTaskController extends BaseController { @RequestParam(name = "izstatus", defaultValue = "", required = false) String izstatus, @RequestParam(name = "iztaskrrom", defaultValue = "", required = false) String iztaskrrom, @RequestParam(name = "izuptime", defaultValue = "", required = false) String izuptime, + @RequestParam(name = "isFail", defaultValue = "false", required = false) String isFail, HttpServletRequest request) { SearchQuery searchQuery = new SearchQuery(); if (org.springframework.util.StringUtils.hasText(izupuser)) { -// searchQuery.addEqual("fromuserid",izupuser); if (izupuser.contains(",")) { String[] userIds = izupuser.split(","); List arrayData = Arrays.asList(userIds); @@ -422,17 +422,22 @@ public class FlowTaskController extends BaseController { if (izstatus.contains(",")) { String[] statusIds = izstatus.split(","); // 以逗号拆分字符串 List arrayData = Arrays.asList(statusIds); - SearchQueryForm searchQueryForm = new SearchQueryForm(); searchQuery.addIn("states", arrayData); } else { searchQuery.addEqual("states", izstatus); } + }else{ + if(Boolean.parseBoolean(isFail)){ + searchQuery.addEqual("isFail","1"); + searchQuery.addIn("states", Arrays.asList("2","3","5")); + }else{ + searchQuery.addIn("states", Arrays.asList("2","3")); + } } if (org.springframework.util.StringUtils.hasText(iztaskrrom)) { if (iztaskrrom.contains(",")) { String[] taskrromIds = iztaskrrom.split(","); // 以逗号拆分字符串 List arrayData = Arrays.asList(taskrromIds); - SearchQueryForm searchQueryForm = new SearchQueryForm(); searchQuery.addIn("fromsourceid", arrayData); } else { searchQuery.addEqual("fromsourceid", iztaskrrom); @@ -474,7 +479,7 @@ public class FlowTaskController extends BaseController { User user = this.userService.getSessionUser(request); if (user.isUserIsSys(xiaoyaoConfig.getWebconfig().getSysLoginUser().split(","))) { } else { - searchQuery.addEqual("thisLoginUserid", user.getId().toString()); + searchQuery.addEqual("thisLoginUserid", user.getLoginname()); searchQuery.addEqual("tenantid", tenantId); } String searchId = request.getParameter("searchId"); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java index 975d4a8b..d454e121 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java @@ -497,6 +497,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask } else { //判断节点上的描述字段，是否伟finale_judgment,如果是，记录到终审表中，如果终审表已经存在，不再重复记录 if (StringUtils.isNotBlank(taskData.getDescription()) && taskData.getDescription().equals(SystemConstantsOa.OA_TASK_COMPLETE_FINALE_FORM)) { + childPicture.setIsFinal(1); User user = userService.findByLoginname(formData.getAssignee()); userFinalService.save(user.getId().toString(), formId); } @@ -542,6 +543,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask executions.forEach(execution -> executionIds.add(execution.getId())); OcrTaskchildPicture taskchildPicture = ocrTaskchildPictureService.getById(Long.parseLong(formId)); taskchildPicture.setFinishtime(System.currentTimeMillis()); + taskchildPicture.setIsFinal(1); ocrTaskchildPictureService.updateById(taskchildPicture); OcrPicture picture = ocrPictureService.getById(taskchildPicture.getPictureid()); ocrTaskchildPictureService.sendFlowTaskResult(taskchildPicture, picture, approve); @@ -979,6 +981,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask ParamterPage paramterPage = new ParamterPage(); paramterPage.setStart((pageUtils.getCurrPage() - 1) * pageUtils.getPageSize()); paramterPage.setPagesize(pageUtils.getPageSize()); + Page page = new Page<>(); if (StringUtils.isNotBlank(pageUtils.getSortname())) { paramterPage.setSortname(pageUtils.getSortname()); @@ -992,97 +995,96 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask paramterPage.setSortorder("DESC"); } - Long count = ocrTaskchildPictureService.listFinalCount(query); - query.put("page", paramterPage); + Long count = ocrTaskchildPictureService.listFinalCount(query); List list = ocrTaskchildPictureService.listFinal(query); - for (OcrTaskchildPicture taskchildPicture : list) { - //查询对应的流程分类 - Category category = categoryService.selectDtoById(taskchildPicture.getCategoryid()); - taskchildPicture.setCategoryDto(category); - - if (StringUtils.isNotBlank(taskchildPicture.getProcessdefinitionid())) { - - List taskList = this.nowRunTask(taskchildPicture.getProcessinstanceid(), taskchildPicture.getProcessdefinitionid()); - if (null != taskList && !taskList.isEmpty()) { - taskchildPicture.setTaskId(taskList.get(0).getId()); - - Task tasknow = taskService.createTaskQuery().taskId(taskchildPicture.getTaskId()).singleResult(); - BpmnModel bpmnModel = repositoryService.getBpmnModel(tasknow.getProcessDefinitionId()); - // 获取节点定义id - String taskDefinitionKey = tasknow.getTaskDefinitionKey(); - // 根据节点定义id获取节点元素 - FlowElement flowElement = bpmnModel.getFlowElement(taskDefinitionKey); - if (flowElement instanceof UserTask) { - UserTask userTask = (UserTask) flowElement; - - taskchildPicture.setDocumentation(userTask.getDocumentation()); - } - } - - //查询历史 - List historicTaskInstanceDtos = new ArrayList<>(); - // 查询当前任务的流转信息 - List taskHiInstances = historyService.createHistoricTaskInstanceQuery() - .processInstanceId(taskchildPicture.getProcessinstanceid()) - .includeProcessVariables() - .orderByHistoricTaskInstanceStartTime() - .asc() - .list(); - for (HistoricTaskInstance taskHiInstance : taskHiInstances) { - HistoricTaskInstanceDto dto = new HistoricTaskInstanceDto(); - dto.setTaskId(taskHiInstance.getId()); - dto.setTaskName(taskHiInstance.getName()); - dto.setFinishTime(taskHiInstance.getEndTime()); - if (taskHiInstance.getDurationInMillis() != null) { - dto.setDuration(taskHiInstance.getDurationInMillis() / 1000 + "秒"); - } - dto.setTaskDefKey(taskHiInstance.getTaskDefinitionKey()); - - //Map variables = taskHiInstance.getTaskLocalVariables(); - - Map variables = taskHiInstance.getProcessVariables(); - - if (null != variables && null != variables.get("approvd")) { - dto.setState(variables.get("approvd").toString()); - } - - if (StringUtils.isNotBlank(taskHiInstance.getAssignee())) { - if (SystemConstantsOa.OA_TASK_SKIP_ASSIGINE.equals(taskHiInstance.getAssignee())) { - dto.setAssigneeName(taskHiInstance.getAssignee()); - } else { - User user1 = userService.findByLoginname(taskHiInstance.getAssignee()); - - dto.setAssigneeName(user1.getUsername()); - } - - } - - BpmnModel bpmnModel = repositoryService.getBpmnModel(taskchildPicture.getProcessdefinitionid()); - -// // 根据节点定义id获取节点元素 - FlowElement flowElement = bpmnModel.getFlowElement(taskHiInstance.getTaskDefinitionKey()); - if (flowElement instanceof UserTask) { - UserTask userTask = (UserTask) flowElement; - - taskchildPicture.setDocumentation(userTask.getDocumentation()); - } - // 还需要根据 HistoricTaskInstance 找到对应的 审批意见 - List processInstanceComments = taskService.getProcessInstanceComments(taskchildPicture.getProcessinstanceid()); - for (Comment comment : processInstanceComments) { - - if (comment.getTaskId().equals(taskHiInstance.getId())) { - // 审批意见 - String fullMessage = comment.getFullMessage(); - dto.setComment(fullMessage); - } - } - historicTaskInstanceDtos.add(dto); - } - taskchildPicture.setTransferRecords(historicTaskInstanceDtos); - } - } +// for (OcrTaskchildPicture taskchildPicture : list) { +// //查询对应的流程分类 +// Category category = categoryService.selectDtoById(taskchildPicture.getCategoryid()); +// taskchildPicture.setCategoryDto(category); +// +// if (StringUtils.isNotBlank(taskchildPicture.getProcessdefinitionid())) { +// +// List taskList = this.nowRunTask(taskchildPicture.getProcessinstanceid(), taskchildPicture.getProcessdefinitionid()); +// if (null != taskList && !taskList.isEmpty()) { +// taskchildPicture.setTaskId(taskList.get(0).getId()); +// +// Task tasknow = taskService.createTaskQuery().taskId(taskchildPicture.getTaskId()).singleResult(); +// BpmnModel bpmnModel = repositoryService.getBpmnModel(tasknow.getProcessDefinitionId()); +// // 获取节点定义id +// String taskDefinitionKey = tasknow.getTaskDefinitionKey(); +// // 根据节点定义id获取节点元素 +// FlowElement flowElement = bpmnModel.getFlowElement(taskDefinitionKey); +// if (flowElement instanceof UserTask) { +// UserTask userTask = (UserTask) flowElement; +// +// taskchildPicture.setDocumentation(userTask.getDocumentation()); +// } +// } +// +// //查询历史 +// List historicTaskInstanceDtos = new ArrayList<>(); +// // 查询当前任务的流转信息 +// List taskHiInstances = historyService.createHistoricTaskInstanceQuery() +// .processInstanceId(taskchildPicture.getProcessinstanceid()) +// .includeProcessVariables() +// .orderByHistoricTaskInstanceStartTime() +// .asc() +// .list(); +// for (HistoricTaskInstance taskHiInstance : taskHiInstances) { +// HistoricTaskInstanceDto dto = new HistoricTaskInstanceDto(); +// dto.setTaskId(taskHiInstance.getId()); +// dto.setTaskName(taskHiInstance.getName()); +// dto.setFinishTime(taskHiInstance.getEndTime()); +// if (taskHiInstance.getDurationInMillis() != null) { +// dto.setDuration(taskHiInstance.getDurationInMillis() / 1000 + "秒"); +// } +// dto.setTaskDefKey(taskHiInstance.getTaskDefinitionKey()); +// +// //Map variables = taskHiInstance.getTaskLocalVariables(); +// +// Map variables = taskHiInstance.getProcessVariables(); +// +// if (null != variables && null != variables.get("approvd")) { +// dto.setState(variables.get("approvd").toString()); +// } +// +// if (StringUtils.isNotBlank(taskHiInstance.getAssignee())) { +// if (SystemConstantsOa.OA_TASK_SKIP_ASSIGINE.equals(taskHiInstance.getAssignee())) { +// dto.setAssigneeName(taskHiInstance.getAssignee()); +// } else { +// User user1 = userService.findByLoginname(taskHiInstance.getAssignee()); +// +// dto.setAssigneeName(user1.getUsername()); +// } +// +// } +// +// BpmnModel bpmnModel = repositoryService.getBpmnModel(taskchildPicture.getProcessdefinitionid()); +// +//// // 根据节点定义id获取节点元素 +// FlowElement flowElement = bpmnModel.getFlowElement(taskHiInstance.getTaskDefinitionKey()); +// if (flowElement instanceof UserTask) { +// UserTask userTask = (UserTask) flowElement; +// +// taskchildPicture.setDocumentation(userTask.getDocumentation()); +// } +// // 还需要根据 HistoricTaskInstance 找到对应的 审批意见 +// List processInstanceComments = taskService.getProcessInstanceComments(taskchildPicture.getProcessinstanceid()); +// for (Comment comment : processInstanceComments) { +// +// if (comment.getTaskId().equals(taskHiInstance.getId())) { +// // 审批意见 +// String fullMessage = comment.getFullMessage(); +// dto.setComment(fullMessage); +// } +// } +// historicTaskInstanceDtos.add(dto); +// } +// taskchildPicture.setTransferRecords(historicTaskInstanceDtos); +// } +// } pageUtils.setTotalCount(count.intValue()); pageUtils.setList(list); 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 fbeb607d..116c58b0 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 @@ -401,10 +401,8 @@ public class OcrTaskchildPictureController extends BaseController { @RequestParam(name = "orderType") String orderType, @RequestParam(name = "orderName") String orderName, @RequestParam(name = "checkDuplicateId") String checkDuplicateId, - @RequestParam(name = "pictureId") String pictureId, - HttpServletRequest request) { - UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); - Page result = ocrTaskchildPictureService.getPackageSimilarityList(pageNo, pageSize, orderType, orderName, checkDuplicateId, pictureId,userToken); + @RequestParam(name = "pictureId") String pictureId) { + Page result = ocrTaskchildPictureService.getPackageSimilarityList(pageNo, pageSize, orderType, orderName, checkDuplicateId, pictureId); return ResultVoUtil.success(result); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureMybatisDao.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureMybatisDao.java index 6a52b59c..e1789885 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureMybatisDao.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureMybatisDao.java @@ -12,7 +12,5 @@ import java.util.List; */ @Mapper public interface OcrPictureMybatisDao extends BaseMapper { - OcrPicture getPackagePictureInfo(@Param("packageId") String packageId, @Param("pictureId") String pictureId, @Param("userNodeType") String userNodeType); - - List getPictureNodeStatesList(@Param("pictureIds") List pictureIds, @Param("userNodeType") String userNodeType); + OcrPicture getPackagePictureInfo(@Param("packageId") String packageId, @Param("pictureId") String pictureId); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskchildPictureMybatisDao.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskchildPictureMybatisDao.java index 7d8025da..f76cc434 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskchildPictureMybatisDao.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskchildPictureMybatisDao.java @@ -17,14 +17,17 @@ import java.util.Map; */ @Mapper public interface OcrTaskchildPictureMybatisDao extends BaseMapper { - + /** * 查询所有业务表集合 * @param query * @return */ public List listFinal(Map query); - + + List listFinalTask(Map query); + + /** * 查询所有业务表数量 * @param query @@ -53,5 +56,5 @@ public interface OcrTaskchildPictureMybatisDao extends BaseMapper getPackageSimilarityList(Page page, @Param("checkDuplicateId") String checkDuplicateId, @Param("pictureId") String pictureId, @Param("oderType") String oderType, @Param("oderName") String oderName, @Param("taskname") String taskname); + Page getPackageSimilarityList(Page page, @Param("checkDuplicateId") String checkDuplicateId, @Param("pictureId") String pictureId, @Param("oderType") String oderType, @Param("oderName") String oderName); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java index d2e0ae2a..2aad9119 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java @@ -203,6 +203,10 @@ public class OcrTaskchildPicture implements BaseDto, java.io.Serializable { @TableField(value = "FINISHTIME") private Long finishtime; + @Schema(description = "是否终审") + @TableField(value = "ISFINAIL") + private Integer isFinal; + @ApiModelProperty(value = "项目对象") @TableField(exist = false) private Category categoryDto; diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureService.java index aad2f72e..9640b47a 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureService.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureService.java @@ -71,14 +71,6 @@ public interface OcrPictureService extends BaseService { OcrPicture getPackagePictureInfo(String packageId, String pictureId, UserToken userToken); - /** - * 根据图片id查询图片节点状态 - * @param pictureIds - * @param nodeType - * @return - */ - List getPictureNodeStatesList(List pictureIds,Integer nodeType); - // Long getPhotoDateTime(OcrPicture picture); } 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 2a7e3059..864642da 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 @@ -1,6 +1,5 @@ package cn.jyjz.xiaoyao.ocr.service; -import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -17,6 +16,7 @@ import cn.jyjz.xiaoyao.ocr.vo.PictureDetailVo; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; /** * 业务层 @@ -110,9 +110,11 @@ public interface OcrTaskchildPictureService extends BaseService getSimilarityList(Integer pageNo, Integer pageSize, String pictureId, String orderType, String orderValue, UserToken userToken); - Page getPackageSimilarityList(Integer pageNo, Integer pageSize, String oderType, String oderName, String checkDuplicateId, String pictureId, UserToken userToken); + Page getPackageSimilarityList(Integer pageNo, Integer pageSize, String oderType, String oderName, String checkDuplicateId, String pictureId); void sendFlowTaskResult(OcrTaskchildPicture taskchildPicture, OcrPicture picture, FlowApprove flowApprove) throws Exception; diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java index d7c69e25..4dc2277c 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java @@ -318,22 +318,11 @@ public class OcrPictureServiceImpl extends BaseServiceImpl getPictureNodeStatesList(List pictureIds, Integer nodeType) { - String userNodeType = ProcessConstant.userNodeType.getOrDefault(nodeType, "一级审批"); - - return pictureMybatisDao.getPictureNodeStatesList(pictureIds,userNodeType); - } - - // @Override // public Long getPhotoDateTime(OcrPicture picture) { // long timestamp = 0L; 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 9d731394..ed831adb 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 @@ -1,8 +1,6 @@ package cn.jyjz.xiaoyao.ocr.service.impl; -import cn.hutool.core.map.MapBuilder; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.http.HttpUtil; import cn.jyjz.flowable.common.ProcessConstant; import cn.jyjz.flowable.common.SystemConstantsOa; import cn.jyjz.flowable.domain.vo.FlowModelVO; @@ -42,9 +40,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.flowable.bpmn.model.FlowElement; -import org.flowable.bpmn.model.UserTask; -import org.flowable.engine.history.HistoricProcessInstance; import org.flowable.task.api.Task; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; @@ -608,12 +603,13 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl listFinal(Map query) { - return this.ocrtaskchildpicturemybatisdao.listFinal(query); + return this.ocrtaskchildpicturemybatisdao.listFinalTask(query); } @@ -725,11 +721,9 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl getPackageSimilarityList(Integer pageNo, Integer pageSize, String oderType, String oderName, String checkDuplicateId, String pictureId, UserToken userToken) { + public Page getPackageSimilarityList(Integer pageNo, Integer pageSize, String oderType, String oderName, String checkDuplicateId, String pictureId) { Page page = new Page<>(pageNo, pageSize); - String userNodeType = ProcessConstant.userNodeType.getOrDefault(userToken.getNodeType(), "一级审批"); - - return ocrtaskchildpicturemybatisdao.getPackageSimilarityList(page, checkDuplicateId, pictureId, oderType, oderName, userNodeType); + return ocrtaskchildpicturemybatisdao.getPackageSimilarityList(page, checkDuplicateId, pictureId, oderType, oderName); } @Override diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml index 3f436d16..b3a3f5f7 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml @@ -226,12 +226,18 @@ - diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml index 5d3a0d46..7a49ef65 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml @@ -186,6 +186,8 @@ + + and OCPICTUREID ${ocpictureid.dataOp} ${ocpictureid.likestar}#{ocpictureid.value}${ocpictureid.likeend} @@ -307,8 +309,6 @@ - - and tcp.OCPICTUREID ${ocpictureid.dataOp} ${ocpictureid.likestar}#{ocpictureid.value}${ocpictureid.likeend} @@ -525,21 +525,22 @@ ${izproject.likeend} - - - - - - - - - + + + + + + + + + - + - and (tcp.FROMUPTIME ${izuptimeStart.dataOp} '${izuptimeStart.value}' or tcp.FROMUPTIME ${izuptimeEnd.dataOp} '${izuptimeEnd.value}') + and (tcp.FROMUPTIME ${izuptimeStart.dataOp} '${izuptimeStart.value}' + or tcp.FROMUPTIME ${izuptimeEnd.dataOp} '${izuptimeEnd.value}') @@ -594,28 +595,22 @@ SELECT distinct t3.ID id, - t3.PICTUREID pictureId, - t3.STATES states, - t3.PROCESSINSTANCEID processInstanceId, - t3.PROCESSDEFINITIONID processDefinitionId, - t3.DEPLOYMENTID deploymentId, - t3.ASSIGNEENAME assigneeName, - t3.ASSIGNEE assignee, - t3.FILEANNEX fileAnnex, - t3.GUIDANG guiDang, - t3.CREATEUSER createUser, - t3.CREATEUSERNAME createUserName, - t3.CREATEDATE createDate, - t3.USERID userId, - t3.USERNAME userName, - t3.FROMTASKID fromTaskId, - t3.FROMTASKNAME fromTaskName, - t3.FROMUSERID fromUserId, - t3.FROMPROJECTID fromProjectId, - t3.FROMPLANID fromPlanId, - t3.FROMUPTIME fromupTime, - t3.FROMSOURCEID fromSourceId, - t3.HAVEPOINTS havePoints, - t3.TASKNAME taskName, - t3.FROMUSERNAME fromUserName, - t3.FROMPROJECTNAME fromProjectName, - t3.FINISHTIME finishTime, - t3.TASKID taskId, - t2.imgUrl, - t2.submit_date_timestamp submitDateTimestamp, - t2.photo_date_timestamp photoDateTimestamp, - t2.server_thumbnail_url serverThumbnailUrl, - t1.max_similarity maxSimilarity, - ifnull(t4.STATSHIS, 1) historyStates, - t1.check_duplicate_id + t3.PICTUREID pictureId, + t3.STATES states, + t3.PROCESSINSTANCEID processInstanceId, + t3.PROCESSDEFINITIONID processDefinitionId, + t3.DEPLOYMENTID deploymentId, + t3.ASSIGNEENAME assigneeName, + t3.ASSIGNEE assignee, + t3.FILEANNEX fileAnnex, + t3.GUIDANG guiDang, + t3.CREATEUSER createUser, + t3.CREATEUSERNAME createUserName, + t3.CREATEDATE createDate, + t3.USERID userId, + t3.USERNAME userName, + t3.FROMTASKID fromTaskId, + t3.FROMTASKNAME fromTaskName, + t3.FROMUSERID fromUserId, + t3.FROMPROJECTID fromProjectId, + t3.FROMPLANID fromPlanId, + t3.FROMUPTIME fromupTime, + t3.FROMSOURCEID fromSourceId, + t3.HAVEPOINTS havePoints, + t3.TASKNAME taskName, + t3.FROMUSERNAME fromUserName, + t3.FROMPROJECTNAME fromProjectName, + t3.FINISHTIME finishTime, + t3.TASKID taskId, + t2.imgUrl, + t2.submit_date_timestamp submitDateTimestamp, + t2.photo_date_timestamp photoDateTimestamp, + t2.server_thumbnail_url serverThumbnailUrl, + t1.max_similarity maxSimilarity, + COALESCE( + (SELECT t4.STATSHIS + FROM oa_userapprove_t t4 + WHERE t4.FORMID = t3.ID + ORDER BY t4.CREATEDATE DESC + LIMIT 1), 1) AS historyStates, + t1.check_duplicate_id FROM ocr_check_duplicate_result t1 LEFT JOIN ocr_picture t2 ON t1.picture_id = t2.ID LEFT JOIN ocr_taskchild_picture t3 ON t2.ID = t3.PICTUREID - LEFT JOIN oa_userapprove_t t4 ON t3.ID = t4.FORMID and t4.TASKNAME = '${taskname}' left join ocr_picture_info t5 on t2.ID = t5.picture_id WHERE t1.check_duplicate_id = #{checkDuplicateId} and t2.suspiciousfile = 0 @@ -932,4 +920,41 @@ #{item} + +