流程消息改造

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/WorkResult.java

@@ -117,6 +117,17 @@ public class WorkResult extends BaseFlowData implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     Long examId;
 
+    @ApiModelProperty(value = "登录工号")
+    String loginName;
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
+    }
+
     public Long getExamId() {
         return examId;
     }

distributed-print-business/src/main/resources/mapper/ExamTaskMapper.xml

@@ -1213,6 +1213,7 @@
                   end cardRuleName,
               cast(art.ASSIGNEE_ as Decimal(24)) as userId,
               c.real_name userName,
+              c.login_name loginName,
               et.start_time startTime,
               et.end_time endTime,
               tffa.status,

distributed-print-business/src/main/resources/mapper/TFCustomFlowMapper.xml

@@ -59,7 +59,7 @@
         select
             tfcf.*,
             tfcfe.flow_id as flowId,
-            if(tbu2.real_name is not null,tbu2.real_name,tbu1.real_name) as updateName
+            if(tbu2.login_name is not null,tbu2.login_name,tbu1.login_name) as updateName
         from
             t_f_custom_flow tfcf
                 join t_f_custom_flow_entity tfcfe on tfcfe.t_f_custom_flow_id = tfcf.id

distributed-print-business/src/main/resources/mapper/TFFlowLogMapper.xml

@@ -99,17 +99,8 @@
                      su.org_id as orgId,
                      so.name as orgName,
                      so.`type` as orgType,
-                     (select group_concat(su.real_name, '(', so.name, ')' order by FIND_IN_SET(su.id, replace(tffl.pend_approve_id, ', ', ',')))
-                      from sys_user su join sys_org so on so.id = su.org_id where FIND_IN_SET(su.id, replace(tffl.pend_approve_id, ', ', ','))) as pendApproveUserName,
-                     (
-                         select
-                             CONCAT(su.real_name, '(', so.name, ')')
-                         from
-                             sys_user su
-                                 join sys_org so on
-                                 so.id = su.org_id
-                         where
-                             su.id = tffl.approve_id) as approveUserName
+                     (select group_concat(su.login_name) from sys_user su where FIND_IN_SET(su.id, replace(tffl.pend_approve_id, ', ', ','))) as pendApproveUserName,
+                     su.login_name as approveUserName
         from
             t_f_flow_log tffl
                 join sys_user su on

teachcloud-task/src/main/java/com/qmth/teachcloud/task/config/RedisMessageListener.java

@@ -119,19 +119,19 @@ public class RedisMessageListener implements MessageListener {
                                 FlowMsgDto flowMsgDto = activitiService.getFlowMsgData(schoolId);
                                 StandardFlowData standardFlowData = activitiService.getFlowInfo(Long.parseLong(mqDto.getObjId()));
                                 HandleMessageDto handleMessageDto = activitiService.handleMessage(schoolId, Long.parseLong(mqDto.getObjId()), flowApproveOperationEnum);
-                                if (Objects.nonNull(handleMessageDto) && !CollectionUtils.isEmpty(handleMessageDto.getTodoTaskList())) {
+//                                if (Objects.nonNull(handleMessageDto) && !CollectionUtils.isEmpty(handleMessageDto.getTodoTaskList())) {
 //                                    ToDoTaskDto toDoTaskDto = new ToDoTaskDto(standardFlowData, handleMessageDto.getStandardFlowWorkMsgList(), handleMessageDto);
-                                    ToDoTaskDto toDoTaskDto = new ToDoTaskDto(standardFlowData, handleMessageDto);
-                                    log.info("flowMq toDoTaskDto:{}", JacksonUtil.parseJson(toDoTaskDto));
+                                ToDoTaskDto toDoTaskDto = new ToDoTaskDto(standardFlowData, handleMessageDto);
+                                log.info("flowMq toDoTaskDto:{}", JacksonUtil.parseJson(toDoTaskDto));
 
-                                    BasicSchool basicSchool = commonCacheService.schoolCache(schoolId);
-                                    String hostUrl = SystemConstant.getHost(flowMsgDto.getMqHostUrl(), basicSchool.getCode());
-                                    String[] strs = hostUrl.split("\\?");
-                                    Long timestamp = System.currentTimeMillis();
-                                    String signature = SignatureEntity.build(SignatureType.SECRET, SystemConstant.METHOD, SystemConstant.GDPU_TODOTASK_URL, timestamp, basicSchool.getAccessKey(), basicSchool.getAccessSecret());
-                                    String callResult = HttpUtil.postJson(strs[0] + SystemConstant.GDPU_TODOTASK_URL, JacksonUtil.parseJson(toDoTaskDto), signature, timestamp);
-                                    log.info("flowMq toDoTaskDto callResult:{}", JacksonUtil.parseJson(callResult));
-                                }
+                                BasicSchool basicSchool = commonCacheService.schoolCache(schoolId);
+                                String hostUrl = SystemConstant.getHost(flowMsgDto.getMqHostUrl(), basicSchool.getCode());
+                                String[] strs = hostUrl.split("\\?");
+                                Long timestamp = System.currentTimeMillis();
+                                String signature = SignatureEntity.build(SignatureType.SECRET, SystemConstant.METHOD, SystemConstant.GDPU_TODOTASK_URL, timestamp, basicSchool.getAccessKey(), basicSchool.getAccessSecret());
+                                String callResult = HttpUtil.postJson(strs[0] + SystemConstant.GDPU_TODOTASK_URL, JacksonUtil.parseJson(toDoTaskDto), signature, timestamp);
+                                log.info("flowMq toDoTaskDto callResult:{}", JacksonUtil.parseJson(callResult));
+//                                }
                             } else if (Objects.equals(topic, MqTagEnum.FLOW_MQ_DONE.getCode())) {
                                 log.info("创建flowMqDone消息进来了");
                                 Map<String, Object> map = (Map<String, Object>) mqDto.getBody();