Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh

jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl.java

@@ -23,6 +23,7 @@ import com.junmp.junmpProcess.dto.*;
 import com.junmp.junmpProcess.dto.json.*;
 import com.junmp.junmpProcess.entity.ProcessTemplates;
 import com.junmp.junmpProcess.exception.WorkFlowException;
+import com.junmp.junmpProcess.mapper.OrgUserMapper;
 import com.junmp.junmpProcess.mapper.ProcessTemplatesMapper;
 import com.junmp.junmpProcess.mapper.TemplateGroupMapper;
 import com.junmp.junmpProcess.service.Bussiness.WorkProcessService;
@@ -55,6 +56,7 @@ import org.flowable.engine.history.HistoricProcessInstanceQuery;
 import org.flowable.engine.impl.persistence.entity.ExecutionEntity;
 import org.flowable.engine.repository.Deployment;
 import org.flowable.engine.repository.ProcessDefinition;
+import org.flowable.engine.runtime.ActivityInstance;
 import org.flowable.engine.runtime.Execution;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.engine.runtime.ProcessInstanceBuilder;
@@ -93,7 +95,8 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
     private RepositoryService repositoryService;
     @Autowired
     protected ManagementService managementService;
-
+    @Resource
+    private OrgUserMapper orgUserMapper;
     @Resource
     private RuntimeService runtimeService;
     @Resource
@@ -681,6 +684,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
 //            {
 //                return  ApiRes.failure("流程不存在或已挂起");
 //            }
+
             ProcessInstance processInstance = processInstanceBuilder
                     .processDefinitionId(processInstanceDto.getProcessDefinitionId())
                     .variable("initiator",StartUser.getUserId())
@@ -688,7 +692,8 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
                     .businessStatus(BUSINESS_STATUS_1)
                         .start();
                         //手动完成第一个任务
-//            Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            task.setAssignee(StartUser.getUserId().toString());
 //            Object ts=new Object();
 //            if(task!=null){
 //                taskService.complete(task.getId());
@@ -727,6 +732,13 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
                 taskDetailVO.setName("流程开始");
                 taskDetailVO.setCreateTime(historicActivityInstance.getStartTime());
                 taskDetailVO.setEndTime(historicActivityInstance.getEndTime());
+//                List<Comment> comments = commentsMap.get(historicActivityInstance.getTaskId());
+//                taskDetailVO.setComment(comments.get(0).getFullMessage());
+                if (historicActivityInstance.getAssignee()!=null)
+                {List<UserListDTO> userList= orgUserMapper.QueryUserWithParentOrg(historicActivityInstance.getAssignee());
+                    taskDetailVO.setUserId(userList.get(0).getUserID());
+                    taskDetailVO.setUserName(userList.get(0).getRealName());}
+
                 taskDetailVOS.add(taskDetailVO);
 
 //                taskDetailVO.setSignImage();
@@ -741,6 +753,12 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
                 taskDetailVO.setName("流程结束");
                 taskDetailVO.setCreateTime(historicActivityInstance.getStartTime());
                 taskDetailVO.setEndTime(historicActivityInstance.getEndTime());
+//                List<Comment> comments = commentsMap.get(historicActivityInstance.getTaskId());
+//                taskDetailVO.setComment(comments.get(0).getFullMessage());
+                if (historicActivityInstance.getAssignee()!=null)
+                {List<UserListDTO> userList= orgUserMapper.QueryUserWithParentOrg(historicActivityInstance.getAssignee());
+                    taskDetailVO.setUserId(userList.get(0).getUserID());
+                    taskDetailVO.setUserName(userList.get(0).getRealName());}
                 taskDetailVOS.add(taskDetailVO);
             }
             else if("userTask".equals(historicActivityInstance.getActivityType())){
@@ -748,8 +766,14 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
                 if(CollUtil.isNotEmpty(comments)){
                     for (Comment comment : comments) {
                         if("opinion".equals(comment.getType())){
+
+
                             TaskDetailVO taskDetailVO= new TaskDetailVO();
                             taskDetailVO.setTaskId(historicActivityInstance.getTaskId());
+                            if (historicActivityInstance.getAssignee()!=null)
+                            {List<UserListDTO> userList= orgUserMapper.QueryUserWithParentOrg(historicActivityInstance.getAssignee());
+                                taskDetailVO.setUserId(userList.get(0).getUserID());
+                                taskDetailVO.setUserName(userList.get(0).getRealName());}
                             taskDetailVO.setActivityId(historicActivityInstance.getActivityId());
                             taskDetailVO.setName(historicActivityInstance.getActivityName());
                             taskDetailVO.setCreateTime(historicActivityInstance.getStartTime());
@@ -757,20 +781,25 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
 //                            taskDetailVO.setComment(comment.getFullMessage());
                             List<Attachment> attachments = attachmentMap.get(historicActivityInstance.getTaskId());
                             List<AttachmentVO> attachmentVOList = new ArrayList<>();
-                            for (Attachment attachment : attachments) {
-                                AttachmentVO attachmentVO = new AttachmentVO();
-                                attachmentVO.setId(attachment.getId());
-                                attachmentVO.setName(attachment.getName());
-                                attachmentVO.setUrl(attachment.getUrl());
-                                attachmentVOList.add(attachmentVO);
+
+                            if (attachments!=null)
+                            {
+                                for (Attachment attachment : attachments) {
+                                    AttachmentVO attachmentVO = new AttachmentVO();
+                                    attachmentVO.setId(attachment.getId());
+                                    attachmentVO.setName(attachment.getName());
+                                    attachmentVO.setUrl(attachment.getUrl());
+                                    attachmentVOList.add(attachmentVO);
+                                }
                             }
 
+
                             for (Comment comment1 : comments) {
                                 if("sign".equals(comment1.getType())){
                                     taskDetailVO.setSignImage(comment1.getFullMessage());
                                 }
                             }
-
+                            taskDetailVO.setComment(comments.get(0).getFullMessage());
                             taskDetailVO.setAttachmentVOList(attachmentVOList);
                             taskDetailVOS.add(taskDetailVO);
                         }
@@ -1640,15 +1669,25 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
         if (flag) {
             return "流程已结束";
         }
-        Execution execution = runtimeService.createExecutionQuery().executionId(processInstanceId).singleResult();
-        String activityId = execution.getActivityId();
-        if (StringUtils.isBlank(activityId)) {
+        List<ActivityInstance> list = runtimeService.createActivityInstanceQuery().processInstanceId(processInstanceId).activityType("userTask").unfinished().orderByActivityInstanceStartTime().desc().list();
+        if(CollUtil.isEmpty(list)){
             return "";
-        } else {
+        }
+        else{
+            String activityId = list.get(0).getActivityId();
             BpmnModel bpmnModel = repositoryService.getBpmnModel(processDefinitionId);
             FlowElement flowElement = bpmnModel.getMainProcess().getFlowElement(activityId);
             return flowElement.getName();
         }
+//        Execution execution = runtimeService.createExecutionQuery().executionId(processInstanceId).singleResult();
+//        String activityId = execution.getActivityId();
+//        if (StringUtils.isBlank(activityId)) {
+//            return "";
+//        } else {
+//            BpmnModel bpmnModel = repositoryService.getBpmnModel(processDefinitionId);
+//            FlowElement flowElement = bpmnModel.getMainProcess().getFlowElement(activityId);
+//            return flowElement.getName();
+//        }
 
     }
 

jyzb-process/src/main/java/com/junmp/junmpProcess/vo/TaskDetailVO.java

 package com.junmp.junmpProcess.vo;
 
+import com.junmp.junmpProcess.dto.json.UserInfo;
 import lombok.Data;
 
 import java.util.Date;
@@ -17,6 +18,9 @@ public class TaskDetailVO {
     private Date createTime;
     private Date endTime;
     private String signImage;
+    private String comment;
+    private String userId;
+    private String userName;
     private List<AttachmentVO> attachmentVOList;
     private List<OptionVO> optionVOList;
     private List<CommentVO> commentVOList;