zcloud_gbs
/
zcloud_gbs_edu
15
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(training): 修复培训申请流程查询中的审批时间获取问题

dev
zhaokai 2026-03-10 17:46:30 +08:00
parent e3c3c02730
commit ffaea5a15c
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web-app/src/main/java/com/zcloud/edu/command/query/training/TrainingApplyProcessQueryExe.java
View File

@ -3,6 +3,7 @@ package com.zcloud.edu.command.query.training;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.zcloud.edu.command.convertor.training.TrainingApplyProcessCoConvertor; import com.zcloud.edu.command.convertor.training.TrainingApplyProcessCoConvertor;
import com.zcloud.edu.domain.enums.ApplyTypeEnum; import com.zcloud.edu.domain.enums.ApplyTypeEnum;
import com.zcloud.edu.domain.enums.ApprovalStatusEnum;
import com.zcloud.edu.domain.model.training.TrainingApplyProcessNodeE; import com.zcloud.edu.domain.model.training.TrainingApplyProcessNodeE;
import com.zcloud.edu.dto.clientobject.training.FlowCO; import com.zcloud.edu.dto.clientobject.training.FlowCO;
import com.zcloud.edu.dto.clientobject.training.TrainingApplyProcessFlowVO; import com.zcloud.edu.dto.clientobject.training.TrainingApplyProcessFlowVO;
@ -60,13 +61,17 @@ public class TrainingApplyProcessQueryExe {
FlowCO item = new FlowCO(); FlowCO item = new FlowCO();
item.setType(e.getApplyType()); item.setType(e.getApplyType());
item.setStatus(e.getApprovalStatus()); //1 进行中，2：已完成
// item.setStatus(e.getApprovalStatus());
String nodeName = e.getNodeName() == null ? "" : e.getNodeName(); String nodeName = e.getNodeName() == null ? "" : e.getNodeName();
String username = e.getUsername() == null ? "" : e.getUsername(); String username = e.getUsername() == null ? "" : e.getUsername();
String time =null; String time =null;
if(e.getApplyType()!=null && e.getApprovalTime()!=null){ if(e.getApplyType()!=null && e.getApprovalTime()!=null){
time = e.getApprovalTime().format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); time = e.getApprovalTime().format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
item.setStatus(ApprovalStatusEnum.APPROVED.getCode().intValue());
}else{
item.setStatus(ApprovalStatusEnum.APPROVING.getCode().intValue());
} }
String secondLine = StrUtil.isNotBlank(time) ? (username + " " + time) : username; String secondLine = StrUtil.isNotBlank(time) ? (username + " " + time) : username;
item.setFlowList(Arrays.asList(nodeName, secondLine)); item.setFlowList(Arrays.asList(nodeName, secondLine));