浏览代码

审批人获取,审批状态获取

liuyongxin 1 年之前
父节点
当前提交
ef59150bf4

+ 14 - 0
src/main/java/com/dingding/mid/controller/WorkspaceProcessController.java

@@ -987,6 +987,14 @@ public class WorkspaceProcessController {
                             taskDetailVO.setComment(comment.getFullMessage());
                             List<Attachment> attachments = attachmentMap.get(historicActivityInstance.getTaskId());
 
+                            // TODO: 2024/3/9 获取任务执行的用户
+                            String userId = comment.getUserId();
+                            log.info("userId:{}", userId);
+                            String username = processTemplateService.getUserNameByUserId(userId);
+                            log.info("username:{}", username);
+                            taskDetailVO.setUsername(username);
+
+
                             List<AttachmentVO> attachmentVOList = new ArrayList<>();
 
                             if (attachments != null) {
@@ -1245,6 +1253,12 @@ public class WorkspaceProcessController {
         }
         handleDataVO.setProcessTemplates(processTemplates);
         handleDataVO.setDetailVOList(deatailMap);
+
+        //handleDataVO 设置审批状态
+        handleDataVO.setBusinessStatus(MapUtil.getStr(processVariables,PROCESS_STATUS));
+        String str = MapUtil.getStr(processVariables, PROCESS_STATUS);
+        //log.info("str:{}", str);
+
         return Result.OK(handleDataVO);
     }
 

+ 1 - 1
src/main/java/com/dingding/mid/exception/GlobalExceptionHandlerResolver.java

@@ -30,7 +30,7 @@ public class GlobalExceptionHandlerResolver {
 	@ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
 	public Object handleGlobalException(Exception e) {
 		log.error("全局异常信息 ex={}", e.getMessage(), e);
-		return R.badRequest(e.getLocalizedMessage());
+		return R.serverError(e.getMessage());
 	}
 
 

+ 9 - 0
src/main/java/com/dingding/mid/mapper/ProcessTemplatesMapper.java

@@ -34,4 +34,13 @@ public interface ProcessTemplatesMapper extends BaseMapper<ProcessTemplates> {
      * @return {@link IPage}<{@link ProcessTemplatesVO}>
      */
     IPage<ProcessTemplatesVO> getFormPagev2(Page page, @Param("param") ProcessTemplatesParam param);
+
+
+    /**
+     * 按用户id获取用户名
+     *
+     * @param userId 用户id
+     * @return {@link String}
+     */
+    String getUserNameByUserId(@Param("userId") String userId);
 }

+ 7 - 0
src/main/java/com/dingding/mid/service/ProcessTemplateService.java

@@ -11,4 +11,11 @@ import com.dingding.mid.entity.Users;
 public interface ProcessTemplateService extends IService<ProcessTemplates> {
 
 
+    /**
+     * 按用户id获取用户名
+     *
+     * @param userId 用户id
+     * @return {@link String}
+     */
+    String getUserNameByUserId(String userId);
 }

+ 4 - 0
src/main/java/com/dingding/mid/service/impl/ProcessTemplateServiceImpl.java

@@ -17,4 +17,8 @@ import org.springframework.stereotype.Service;
 public class ProcessTemplateServiceImpl extends ServiceImpl<ProcessTemplatesMapper, ProcessTemplates>  implements
     ProcessTemplateService {
 
+    @Override
+    public String getUserNameByUserId(String userId) {
+        return baseMapper.getUserNameByUserId(userId);
+    }
 }

+ 2 - 0
src/main/java/com/dingding/mid/vo/HandleDataVO.java

@@ -39,4 +39,6 @@ public class HandleDataVO {
     List<String> runningList;
     @ApiModelProperty("还没运行的节点")
     List<String> noTakeList;
+    @ApiModelProperty("审批状态")
+    private String businessStatus;
 }

+ 1 - 0
src/main/java/com/dingding/mid/vo/TaskDetailVO.java

@@ -23,4 +23,5 @@ public class TaskDetailVO {
     private List<OptionVO> optionVOList;
     private List<CommentVO> commentVOList;
     private String comment;
+    private String username;
 }

+ 5 - 0
src/main/resources/mapper/process/ProcessTemplatesMapper.xml

@@ -34,4 +34,9 @@
             </if>
         </where>
     </select>
+    <select id="getUserNameByUserId" resultType="java.lang.String">
+        SELECT username
+        FROM sys_user_info
+        WHERE user_id = #{userId}
+    </select>
 </mapper>