Browse Source

修改申请人链接

wangliang 1 year ago
parent
commit
f663fb2a08

+ 11 - 5
cas/src/main/java/com/qmth/teachcloud/cas/mq/gdpu/api/GdpuMqController.java

@@ -161,13 +161,19 @@ public class GdpuMqController {
 //        processInfoDTO.setOrunId("LYOA79ec0af89702d641d839d5bbb5e9073b0e4b");
         if (Objects.nonNull(toDoTaskDto)) {
             List<String> userIdList = new LinkedList<>(), userNameList = new LinkedList<>(), taskIdList = new LinkedList<>();
-            String taskName = null;
+            String taskName = null, requestUserId = null, requestUserName = null;
             if (Objects.nonNull(toDoTaskDto.getHandleMessageDto())) {
                 List<StandardFlowWorkMsg> standardFlowWorkMsgList = toDoTaskDto.getHandleMessageDto().getTodoTaskList();
                 if (!CollectionUtils.isEmpty(standardFlowWorkMsgList)) {
                     for (StandardFlowWorkMsg s : standardFlowWorkMsgList) {
                         userIdList.add(s.getLoginName());
                         userNameList.add(s.getUserName());
+                        if (Objects.isNull(requestUserId)) {
+                            requestUserId = s.getCreateLoginName();
+                        }
+                        if (Objects.isNull(requestUserName)) {
+                            requestUserName = s.getCreateRealName();
+                        }
                         taskIdList.add(String.valueOf(s.getTaskId()));
                         taskName = s.getTaskName();
                     }
@@ -179,12 +185,12 @@ public class GdpuMqController {
             processInfoDTO.setCurrentNodeName(taskName);
 //        processInfoDTO.setStatus(standardFlowWorkMsgList.get(0).getStatus().name());
             processInfoDTO.setStatus("Current");
-            processInfoDTO.setUserId(toDoTaskDto.getFlowData().getUpdateName()); //申请人ID
-            processInfoDTO.setUserName(toDoTaskDto.getFlowData().getUpdateName()); //申请人名称
+            processInfoDTO.setUserId(requestUserId); //申请人ID
+            processInfoDTO.setUserName(requestUserName); //申请人名称
             processInfoDTO.setAuthor(StringUtils.join(userIdList, ",")); //当前审批人的账户ID(多个使用逗号分隔(示例:2007112, admin))
             processInfoDTO.setAuthorCn(StringUtils.join(userNameList, ",")); //当前审批人的账户名称(多个使用逗号分隔(示例:2007112, admin))
-            processInfoDTO.setUrl(SystemConstant.GDPU_CAS_MQ_URL + "?schoolCode=" + schoolCode + "&employeeNo=" + StringUtils.join(userIdList, ","));
-            processInfoDTO.setMobileUrl(SystemConstant.GDPU_CAS_MQ_URL + "?schoolCode=" + schoolCode + "&employeeNo=" + StringUtils.join(userIdList, ","));
+            processInfoDTO.setUrl(SystemConstant.GDPU_CAS_MQ_URL + "?schoolCode=" + schoolCode + "&employeeNo=" + requestUserId);
+            processInfoDTO.setMobileUrl(SystemConstant.GDPU_CAS_MQ_URL + "?schoolCode=" + schoolCode + "&employeeNo=" + requestUserId);
             processInfoDTO.setDocAddTime(new Date());// "2022-07-25 02:36:00"
             processInfoDTO.setDocEndTime(new Date());
             processInfoDTO.setDesc(toDoTaskDto.getFlowData().getName());

+ 22 - 0
teachcloud-exchange-common/src/main/java/com/qmth/teachcloud/exchange/common/bean/result/flow/WorkResult.java

@@ -120,6 +120,28 @@ public class WorkResult extends BaseFlowData implements Serializable {
     @ApiModelProperty(value = "登录工号")
     String loginName;
 
+    @ApiModelProperty(value = "创建人真实姓名")
+    String createRealName;
+
+    @ApiModelProperty(value = "创建人登录名")
+    String createLoginName;
+
+    public String getCreateRealName() {
+        return createRealName;
+    }
+
+    public void setCreateRealName(String createRealName) {
+        this.createRealName = createRealName;
+    }
+
+    public String getCreateLoginName() {
+        return createLoginName;
+    }
+
+    public void setCreateLoginName(String createLoginName) {
+        this.createLoginName = createLoginName;
+    }
+
     public String getLoginName() {
         return loginName;
     }