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

jyzb-process/src/main/java/com/junmp/junmpProcess/controller/FlowTaskController.java

@@ -74,7 +74,7 @@ public class FlowTaskController {
     @PostMapping("/record")
     public ApiRes<RecordVO> record(@RequestBody HandleDataDTO handleDataDTO) {
 
-        return FlowTaskService.record(handleDataDTO.getProcessInstanceId());
+        return FlowTaskService.record(handleDataDTO.getProcessInstanceId(),handleDataDTO.getUserId() );
     }
     //添加快选意见
     @ApiOperation("添加快选意见")

jyzb-process/src/main/java/com/junmp/junmpProcess/dto/HandleDataDTO.java

@@ -32,7 +32,8 @@ public class HandleDataDTO {
     private String rollbackId;
     @ApiModelProperty("当前用户信息")
     private UserInfo currentUserInfo;
-
+    @ApiModelProperty("当前用户信息")
+    private String userId;
     @ApiModelProperty("委派的人")
     private UserInfo delegateUserInfo;
 }

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

@@ -740,19 +740,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);
-
-//                taskDetailVO.setSignImage();
-//                taskDetailVO.setAttachmentVOList();
-//                taskDetailVO.setOptionVOList();
-//                taskDetailVO.setCommentVOList();
             }
             else if("endEvent".equals(historicActivityInstance.getActivityType())){
                 TaskDetailVO taskDetailVO= new TaskDetailVO();
@@ -761,8 +754,6 @@ 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());
@@ -788,7 +779,6 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
                             taskDetailVO.setName(historicActivityInstance.getActivityName());
                             taskDetailVO.setCreateTime(historicActivityInstance.getStartTime());
                             taskDetailVO.setEndTime(historicActivityInstance.getEndTime());
-//                            taskDetailVO.setComment(comment.getFullMessage());
                             List<Attachment> attachments = attachmentMap.get(historicActivityInstance.getTaskId());
                             List<AttachmentVO> attachmentVOList = new ArrayList<>();
 
@@ -810,7 +800,6 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
                                 }
                             }
                             Object a= comments.get(0).getFullMessage().getBytes(StandardCharsets.UTF_8);
-//                            Object comMsg= taskService.getProcessInstanceComments(processInstanceId);
                             taskDetailVO.setComment(comments.get(0).getFullMessage());
                             taskDetailVO.setAttachmentVOList(attachmentVOList);
                             taskDetailVOS.add(taskDetailVO);

jyzb-process/src/main/java/com/junmp/junmpProcess/service/IFlowTaskService.java

@@ -63,5 +63,5 @@ public interface IFlowTaskService {
      *
      * @return
      */
-    ApiRes<RecordVO> record(String processInstanceId);
+    ApiRes<RecordVO> record(String processInstanceId,String userID);
 }

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

@@ -759,10 +759,24 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
     }
 
     @Override
-    public ApiRes<RecordVO> record(String processInstanceId) {
+    public ApiRes<RecordVO> record(String processInstanceId,String userId) {
+        SysUser StartUser=new SysUser();
+        if (userId!=null)//优先拿接口中的信息，方便调试
+        {
+            StartUser = sysUserService.getById(userId);
 
+        }
+        else
+        {
+            StartUser= sysUserService.getById(LoginContext.getContext().getLoginUser());
+        }
+        TaskQuery taskQuery = taskService.createTaskQuery().taskAssignee(StartUser.getUserId().toString())
+                .processInstanceId(processInstanceId)
+                .orderByTaskCreateTime().desc();
 
+        Task taskInfo = taskQuery.list().get(0);
         RecordVO vo=new RecordVO();
+        vo.setTaskId(taskInfo.getId());
         String tempID= flowInstanceService.getFormIdByInstanceId(processInstanceId);//先拿到表单id，然后通过表单拿到初始表结构
         ProcessTemplates processTemplates = processTemplateService.getById(tempID);
         Object formJson= processTemplates.getProcessJson();

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

@@ -13,4 +13,5 @@ public class RecordVO {
     JSONObject formJson;
     JSONObject detailJson;
     String type;
+    String taskId;
 }