fix(training): 修复培训申请流程查询中的审批时间获取问题
parent
4a3f438864
commit
54934638cd
|
|
@ -54,7 +54,6 @@ public class TrainingApplyProcessQueryExe {
|
||||||
List<TrainingApplyProcessNodeE> processList =
|
List<TrainingApplyProcessNodeE> processList =
|
||||||
trainingApplyProcessRepository.getProcessNodeByRecordId(qry.getEqTrainingApplyRecordId());
|
trainingApplyProcessRepository.getProcessNodeByRecordId(qry.getEqTrainingApplyRecordId());
|
||||||
|
|
||||||
TrainingApplyRecordDO byTrainingRecordId = trainingApplyRecordRepository.getByTrainingRecordId(qry.getEqTrainingApplyRecordId());
|
|
||||||
List<FlowCO> flowList = Optional.ofNullable(processList).orElse(Collections.emptyList())
|
List<FlowCO> flowList = Optional.ofNullable(processList).orElse(Collections.emptyList())
|
||||||
.stream()
|
.stream()
|
||||||
.map(e -> {
|
.map(e -> {
|
||||||
|
|
@ -66,8 +65,8 @@ public class TrainingApplyProcessQueryExe {
|
||||||
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 && byTrainingRecordId.getApprovalTime()!=null){
|
if(e.getApplyType()!=null && e.getApprovalTime()!=null){
|
||||||
time = byTrainingRecordId.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"));
|
||||||
}
|
}
|
||||||
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));
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue