Browse Source

1、离职路径问题
2、列表返回缺少手机号

dongpo 1 year ago
parent
commit
77734fc9fc

+ 1 - 1
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/leave/vo/OaLeavePageReqVO.java

@@ -17,7 +17,7 @@ public class OaLeavePageReqVO extends PageParam {
     @Schema(description = "请假员工姓名", example = "王五")
     private String employeeName;
 
-    @Schema(description = "续签员工手机号", example = "1394920000")
+    @Schema(description = "请假员工手机号", example = "1394920000")
     private String employeePhone;
 
     @Schema(description = "部门id", example = "115")

+ 3 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/leave/vo/OaLeaveRespVO.java

@@ -36,6 +36,9 @@ public class OaLeaveRespVO {
     @ExcelProperty("转正员工姓名")
     private String employeeName;
 
+    @Schema(description = "请假员工手机号", example = "1394920000")
+    private String employeePhone;
+
     @Schema(description = "用户账号id", example = "25603")
     @ExcelProperty("用户账号id")
     private Long userId;

+ 1 - 1
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/turnover/OaTurnoverController.java

@@ -30,7 +30,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 离职流程信息")
 @RestController
-@RequestMapping("/bpm/oa-dimission")
+@RequestMapping("/bpm/oa-turnover")
 @Validated
 public class OaTurnoverController {
 

+ 1 - 1
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/turnover/vo/OaTurnoverPageReqVO.java

@@ -17,7 +17,7 @@ public class OaTurnoverPageReqVO extends PageParam {
     @Schema(description = "离职员工姓名", example = "赵六")
     private String employeeName;
 
-    @Schema(description = "续签员工手机号", example = "1394920000")
+    @Schema(description = "离职员工手机号", example = "1394920000")
     private String employeePhone;
 
     @Schema(description = "部门id", example = "24445")

+ 9 - 6
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/turnover/vo/OaTurnoverRespVO.java

@@ -24,18 +24,21 @@ public class OaTurnoverRespVO {
     @ExcelProperty("uuid")
     private String turnoverId;
 
-    @Schema(description = "转正人id", example = "18376")
-    @ExcelProperty("转正人id")
+    @Schema(description = "离职人id", example = "18376")
+    @ExcelProperty("离职人id")
     private Long employeeId;
 
-    @Schema(description = "转正人uuid", example = "2649")
-    @ExcelProperty("转正人uuid")
+    @Schema(description = "离职人uuid", example = "2649")
+    @ExcelProperty("离职人uuid")
     private String employeeUuid;
 
-    @Schema(description = "转正员工姓名", example = "赵六")
-    @ExcelProperty("转正员工姓名")
+    @Schema(description = "离职员工姓名", example = "赵六")
+    @ExcelProperty("离职员工姓名")
     private String employeeName;
 
+    @Schema(description = "离职员工手机号", example = "1394920000")
+    private String employeePhone;
+
     @Schema(description = "用户账号id", example = "9650")
     @ExcelProperty("用户账号id")
     private Long userId;