Merge remote-tracking branch 'origin/main'

fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmFlowInstanceVo.java

@@ -35,6 +35,7 @@ public class HrmFlowInstanceVo implements Serializable {
     private BigDecimal hours;
     private String procStatus;
     private Date actualEndTime;
+    private String statusName;
 
     private String createBy;
     private Date createTime;

fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmFlowInstanceServiceImpl.java

@@ -159,6 +159,22 @@ public class HrmFlowInstanceServiceImpl implements IHrmFlowInstanceService {
                 record.setActualEndTime(hrmTravelReqVo.getActualEndTime());
             }
         }
+        for (HrmFlowInstanceVo vo : result.getRecords()) {
+            if ("travel".equals(vo.getBizType())) {
+                HrmTravelReqVo travel = travelReqMapper.selectVoById(vo.getBizId());
+                if (travel != null) {
+                    vo.setActualEndTime(travel.getActualEndTime());
+                    // 只有流程已完成，才替换显示文字
+                    if ("complete".equals(vo.getStatus())) {
+                        if (travel.getActualEndTime() == null) {
+                            vo.setStatusName("出差中");
+                        } else {
+                            vo.setStatusName("已结束");
+                        }
+                    }
+                }
+            }
+        }
         return TableDataInfo.build(result);
     }