diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmFlowInstanceVo.java b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmFlowInstanceVo.java index 3c75c9f..10825b2 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmFlowInstanceVo.java +++ b/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; diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmFlowInstanceServiceImpl.java b/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmFlowInstanceServiceImpl.java index 5c35151..b0e443d 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmFlowInstanceServiceImpl.java +++ b/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); } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaCity.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaCity.java index 77e92dc..d51da49 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaCity.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaCity.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import lombok.EqualsAndHashCode; @@ -26,6 +27,17 @@ public class OaCity extends BaseEntity { /** 城市 */ private String cityName; + /** + * 城市编码 + */ + private String cityCode; + + /** + * 所属省份 + */ + private String provinceName; + + /** 状态 1正常 0禁用 */ private Long status; diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaCityBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaCityBo.java index e6d26ad..f0ca132 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaCityBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaCityBo.java @@ -23,6 +23,7 @@ public class OaCityBo extends BaseEntity { private String cityName; private Long status; - + private String cityCode; + private String provinceName; private String remark; } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaCityVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaCityVo.java index a6c85b7..de59a71 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaCityVo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaCityVo.java @@ -20,4 +20,8 @@ public class OaCityVo extends BaseEntity { private Long status; private String remark; + /** 城市编码 */ + private String cityCode; + /** 所属省份 */ + private String provinceName; } diff --git a/ruoyi-ui/src/views/oa/city/index.vue b/ruoyi-ui/src/views/oa/city/index.vue index ce6aae4..4f21e9e 100644 --- a/ruoyi-ui/src/views/oa/city/index.vue +++ b/ruoyi-ui/src/views/oa/city/index.vue @@ -25,14 +25,21 @@ - - - - - - - - + + + + + + + + +