From 5c9b8a15ff3136a55d777212f35804162ed1f665 Mon Sep 17 00:00:00 2001 From: sunchenliang <2532527871@qq.com> Date: Thu, 28 Mar 2024 09:40:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A1=E6=89=B9=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flowable/service/IFormCustomService.java | 3 +- .../service/impl/FlowInstanceServiceImpl.java | 14 ++--- .../service/impl/FlowTaskServiceImpl.java | 53 +++++++++++-------- .../ocr/dataobject/OcrTaskchildPicture.java | 8 +-- .../impl/OcrTaskchildPictureServiceImpl.java | 4 +- .../impl/TaskchildPictureServiceImpl.java | 9 +++- .../mapper/oa/OcrTaskchildPictureMapper.xml | 45 ++++++++++++---- 7 files changed, 89 insertions(+), 47 deletions(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/IFormCustomService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/IFormCustomService.java index 7561707b..69a13ed9 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/IFormCustomService.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/IFormCustomService.java @@ -1,6 +1,7 @@ package cn.jyjz.flowable.service; import cn.jyjz.flowable.domain.vo.FlowModelVO; +import org.flowable.task.api.Task; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; @@ -36,7 +37,7 @@ public interface IFormCustomService { * @param deploymentid * @param processdefinitionid */ - public boolean updateForm(String fromid,String deploymentid,String processdefinitionid,String assignee,String taskId,String processInstanceId,String tasknme); + public boolean updateForm(String fromid, String deploymentid, String processdefinitionid, String assignee, String taskId, String processInstanceId, Task task); /** * 表单流程状态修改 * @param fromid 表单主键 diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowInstanceServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowInstanceServiceImpl.java index 58fc82d0..21031f31 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowInstanceServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowInstanceServiceImpl.java @@ -93,12 +93,12 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow throw new ServiceException("没有审批人，请联系管理员，流程定义：" + businessKey); } List list = this.flowTaskService.nowRunTask(processInstance.getProcessInstanceId(), processInstance.getProcessDefinitionId()); - String taskname = ""; + Task task = null; if (null != list && !list.isEmpty()) { - taskname = list.get(0).getName(); + task = list.get(0); } //保存instanceId到数据库，需要根据流程分类进行，判断更新 - boolean isupdate = iFormCustomService.updateForm(formid, processDefinition.getDeploymentId(), processDefinition.getId(), flowTaskCompleteVO.getAssignee(), flowTaskCompleteVO.getTaskId(), processInstance.getProcessInstanceId(), taskname); + boolean isupdate = iFormCustomService.updateForm(formid, processDefinition.getDeploymentId(), processDefinition.getId(), flowTaskCompleteVO.getAssignee(), flowTaskCompleteVO.getTaskId(), processInstance.getProcessInstanceId(), task); if (isupdate) { FlowModelVO flowModelVO = iFormCustomService.getForm(formid); //增加未查看记录 @@ -121,7 +121,7 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow if (StringUtils.isNotBlank(servicename) && StringUtils.isNotBlank(formid)) { iFormCustomService.delForm(formid); } - }finally { + } finally { RequestContextHolder.resetRequestAttributes(); } return false; @@ -165,12 +165,12 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow throw new ServiceException("没有审批人，请联系管理员，流程定义：" + businessKey); } List list = this.flowTaskService.nowRunTask(processInstance.getProcessInstanceId(), processInstance.getProcessDefinitionId()); - String taskname = ""; + Task task = null; if (null != list && !list.isEmpty()) { - taskname = list.get(0).getName(); + task = list.get(0); } //保存instanceId到数据库，需要根据流程分类进行，判断更新 - boolean isupdate = iFormCustomService.updateForm(formid, processDefinition.getDeploymentId(), processDefinition.getId(), flowTaskCompleteVO.getAssignee(), flowTaskCompleteVO.getTaskId(), processInstance.getProcessInstanceId(), taskname); + boolean isupdate = iFormCustomService.updateForm(formid, processDefinition.getDeploymentId(), processDefinition.getId(), flowTaskCompleteVO.getAssignee(), flowTaskCompleteVO.getTaskId(), processInstance.getProcessInstanceId(), task); if (isupdate) { FlowModelVO flowModelVO = iFormCustomService.getForm(formid); //增加未查看记录 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 f0b85fa5..9a9e5480 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 @@ -480,28 +480,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask } OcrTaskchildPicture childPicture = ocrTaskchildPictureService.getById(Long.parseLong(taskVO.getFormid())); UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); - cn.jyjz.xiaoyao.common.base.vo.User byLoginname = userTokenService.findByLoginname(childPicture.getAssignee()); - OcrMsg msg = new OcrMsg(); - msg.setCreateTime(System.currentTimeMillis()); - msg.setSendTime(System.currentTimeMillis()); - msg.setReceiveUserIds(byLoginname.getId().toString()); - msg.setTitile(model.getFromtaskname()); - msg.setSender(Long.valueOf(userToken.getUserid())); - JSONObject jsonObject = new JSONObject(); - jsonObject.put("taskId", model.getFromtaskid()); - jsonObject.put("nodeName", model.getTaskname()); - jsonObject.put("states", 1); - jsonObject.put("sendUserId", userToken.getUserid()); - jsonObject.put("sendUserName", userToken.getUsername()); - jsonObject.put("sendTime", System.currentTimeMillis()); - jsonObject.put("fromId", model.getId().toString()); - jsonObject.put("taskName", model.getFromtaskname()); - jsonObject.put("packageId", model.getPackageid()); - msg.setBusJson(jsonObject.toJSONString()); - msg.setCreateBy(Long.valueOf(userToken.getUserid())); - msg.setCreateTime(System.currentTimeMillis()); - msg.setSendStatus("1"); - ocrMsgService.save(msg); + sendMsg(childPicture,userToken); + childPicture.setTaskId(taskData.getId()); + childPicture.setTaskname(taskData.getName()); + ocrTaskchildPictureService.updateById(childPicture); } //增加未查看记录 userViewApproeService.saveUserViewApproe(formData.getAssignee(), formData.getFormid().toString(), formData.getTenantid().toString()); @@ -550,6 +532,31 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask return false; } + private void sendMsg(OcrTaskchildPicture model,UserToken userToken){ + cn.jyjz.xiaoyao.common.base.vo.User byLoginname = userTokenService.findByLoginname(model.getAssignee()); + OcrMsg msg = new OcrMsg(); + msg.setCreateTime(System.currentTimeMillis()); + msg.setSendTime(System.currentTimeMillis()); + msg.setReceiveUserIds(byLoginname.getId().toString()); + msg.setTitile(model.getFromtaskname()); + msg.setSender(Long.valueOf(userToken.getUserid())); + JSONObject jsonObject = new JSONObject(); + jsonObject.put("taskId", model.getFromtaskid()); + jsonObject.put("nodeName", model.getTaskname()); + jsonObject.put("states", 1); + jsonObject.put("sendUserId", userToken.getUserid()); + jsonObject.put("sendUserName", userToken.getUsername()); + jsonObject.put("sendTime", System.currentTimeMillis()); + jsonObject.put("fromId", model.getId().toString()); + jsonObject.put("taskName", model.getFromtaskname()); + jsonObject.put("packageId", model.getPackageid()); + msg.setBusJson(jsonObject.toJSONString()); + msg.setCreateBy(Long.valueOf(userToken.getUserid())); + msg.setCreateTime(System.currentTimeMillis()); + msg.setSendStatus("1"); + ocrMsgService.save(msg); + } + /** * 更新当前节点处理人信息 * @@ -573,7 +580,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask if (StringUtils.isNotBlank(businesskey)) { String[] busskey = businesskey.split(SystemConstantsOa.OA_BUSSINESS_KEY_SPLIT); iFormCustomService = SpringUtils.getBean(busskey[2]); - iFormCustomService.updateForm(busskey[1], processDefinition.getDeploymentId(), processDefinition.getId(), flowTaskCompleteVO.getAssignee(), flowTaskCompleteVO.getTaskId(), processInstanceId, task.getName()); + iFormCustomService.updateForm(busskey[1], processDefinition.getDeploymentId(), processDefinition.getId(), flowTaskCompleteVO.getAssignee(), flowTaskCompleteVO.getTaskId(), processInstanceId, task); } } 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 94c37b13..d2e0ae2a 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 @@ -195,6 +195,10 @@ public class OcrTaskchildPicture implements BaseDto, java.io.Serializable { @TableField(value = "TASKNAME") private String taskname; + @Schema(description = "当前节点id") + @TableField(value = "TASKID") + private String taskId; + @Schema(description = "完成时间") @TableField(value = "FINISHTIME") private Long finishtime; @@ -203,10 +207,6 @@ public class OcrTaskchildPicture implements BaseDto, java.io.Serializable { @TableField(exist = false) private Category categoryDto; - @ApiModelProperty(value = "节点主键") - @TableField(exist = false) - private String taskId; - //节点描述 @ApiModelProperty(value = "节点描述") @TableField(exist = false) 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 fa8f1e53..df3e23e0 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 @@ -319,8 +319,10 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl