浏览代码

修复bug

zhaopeiqing 1 年之前
父节点
当前提交
2fc0d5e58c
共有 9 个文件被更改,包括 19 次插入0 次删除
  1. 3 0
      yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/controller/admin/info/vo/AttendanceDailyInfoPageReqVO.java
  2. 3 0
      yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/controller/admin/out/vo/AttendanceOutPageReqVO.java
  3. 1 0
      yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/dal/mysql/out/AttendanceOutMapper.java
  4. 3 0
      yudao-module-personnel/yudao-module-relations-biz/src/main/java/cn/iocoder/yudao/module/relations/controller/admin/conversion/vo/RelationsConversionPageReqVO.java
  5. 3 0
      yudao-module-personnel/yudao-module-relations-biz/src/main/java/cn/iocoder/yudao/module/relations/controller/admin/entry/vo/RelationsEntryPageReqVO.java
  6. 3 0
      yudao-module-personnel/yudao-module-relations-biz/src/main/java/cn/iocoder/yudao/module/relations/controller/admin/turnover/vo/RelationsTurnoverPageReqVO.java
  7. 1 0
      yudao-module-personnel/yudao-module-relations-biz/src/main/java/cn/iocoder/yudao/module/relations/dal/mysql/conversion/RelationsConversionMapper.java
  8. 1 0
      yudao-module-personnel/yudao-module-relations-biz/src/main/java/cn/iocoder/yudao/module/relations/dal/mysql/entry/RelationsEntryMapper.java
  9. 1 0
      yudao-module-personnel/yudao-module-relations-biz/src/main/java/cn/iocoder/yudao/module/relations/dal/mysql/turnover/RelationsTurnoverMapper.java

+ 3 - 0
yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/controller/admin/info/vo/AttendanceDailyInfoPageReqVO.java

@@ -26,6 +26,9 @@ public class AttendanceDailyInfoPageReqVO extends PageParam {
     @Schema(description = "员工手机号", requiredMode = Schema.RequiredMode.REQUIRED, example = "13812345678")
     private String employeeMobile;
 
+    @Schema(description = "职位ID", example = "13463")
+    private Long postId;
+
     @Schema(description = "部门ID", example = "13463")
     private Long deptId;
 

+ 3 - 0
yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/controller/admin/out/vo/AttendanceOutPageReqVO.java

@@ -46,6 +46,9 @@ public class AttendanceOutPageReqVO extends PageParam {
     @Schema(description = "部门uuid", example = "29774")
     private String deptUuid;
 
+    @Schema(description = "职位id", example = "7228")
+    private Long postId;
+
     @Schema(description = "员工职位")
     private String position;
 

+ 1 - 0
yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/dal/mysql/out/AttendanceOutMapper.java

@@ -29,6 +29,7 @@ public interface AttendanceOutMapper extends BaseMapperX<AttendanceOutDO> {
                 .eqIfPresent(AttendanceOutDO::getUserUuid, reqVO.getUserUuid())
                 .eqIfPresent(AttendanceOutDO::getDeptId, reqVO.getDeptId())
                 .eqIfPresent(AttendanceOutDO::getDeptUuid, reqVO.getDeptUuid())
+                .eqIfPresent(AttendanceOutDO::getPostId, reqVO.getPostId())
                 .eqIfPresent(AttendanceOutDO::getPosition, reqVO.getPosition())
                 .eqIfPresent(AttendanceOutDO::getReason, reqVO.getReason())
                 .eqIfPresent(AttendanceOutDO::getDestination, reqVO.getDestination())

+ 3 - 0
yudao-module-personnel/yudao-module-relations-biz/src/main/java/cn/iocoder/yudao/module/relations/controller/admin/conversion/vo/RelationsConversionPageReqVO.java

@@ -44,6 +44,9 @@ public class RelationsConversionPageReqVO extends PageParam {
     @Schema(description = "部门uuid", example = "11190")
     private String deptUuid;
 
+    @Schema(description = "职位id", example = "2507")
+    private Long postId;
+
     @Schema(description = "职位")
     private String position;
 

+ 3 - 0
yudao-module-personnel/yudao-module-relations-biz/src/main/java/cn/iocoder/yudao/module/relations/controller/admin/entry/vo/RelationsEntryPageReqVO.java

@@ -24,6 +24,9 @@ public class RelationsEntryPageReqVO extends PageParam {
     @Schema(description = "部门", example = "24059")
     private Long deptId;
 
+    @Schema(description = "职位ID", example = "24059")
+    private Long postId;
+
     @Schema(description = "职位")
     private String position;
 

+ 3 - 0
yudao-module-personnel/yudao-module-relations-biz/src/main/java/cn/iocoder/yudao/module/relations/controller/admin/turnover/vo/RelationsTurnoverPageReqVO.java

@@ -44,6 +44,9 @@ public class RelationsTurnoverPageReqVO extends PageParam {
     @Schema(description = "部门uuid", example = "6524")
     private String deptUuid;
 
+    @Schema(description = "职位id", example = "19364")
+    private Long postId;
+
     @Schema(description = "职位")
     private String position;
 

+ 1 - 0
yudao-module-personnel/yudao-module-relations-biz/src/main/java/cn/iocoder/yudao/module/relations/dal/mysql/conversion/RelationsConversionMapper.java

@@ -28,6 +28,7 @@ public interface RelationsConversionMapper extends BaseMapperX<RelationsConversi
                 .eqIfPresent(RelationsConversionDO::getUserUuid, reqVO.getUserUuid())
                 .eqIfPresent(RelationsConversionDO::getDeptId, reqVO.getDeptId())
                 .eqIfPresent(RelationsConversionDO::getDeptUuid, reqVO.getDeptUuid())
+                .eqIfPresent(RelationsConversionDO::getPostId, reqVO.getPostId())
                 .eqIfPresent(RelationsConversionDO::getPosition, reqVO.getPosition())
                 .betweenIfPresent(RelationsConversionDO::getEntryDate, reqVO.getEntryDate())
                 .betweenIfPresent(RelationsConversionDO::getProbationEndDate, reqVO.getProbationEndDate())

+ 1 - 0
yudao-module-personnel/yudao-module-relations-biz/src/main/java/cn/iocoder/yudao/module/relations/dal/mysql/entry/RelationsEntryMapper.java

@@ -22,6 +22,7 @@ public interface RelationsEntryMapper extends BaseMapperX<RelationsEntryDO> {
                 .eqIfPresent(RelationsEntryDO::getEntryId, reqVO.getEntryId())
                 .likeIfPresent(RelationsEntryDO::getEntryName, reqVO.getEntryName())
                 .eqIfPresent(RelationsEntryDO::getDeptId, reqVO.getDeptId())
+                .eqIfPresent(RelationsEntryDO::getPostId, reqVO.getPostId())
                 .eqIfPresent(RelationsEntryDO::getPosition, reqVO.getPosition())
                 .eqIfPresent(RelationsEntryDO::getEmployeeType, reqVO.getEmployeeType())
                 .eqIfPresent(RelationsEntryDO::getGender, reqVO.getGender())

+ 1 - 0
yudao-module-personnel/yudao-module-relations-biz/src/main/java/cn/iocoder/yudao/module/relations/dal/mysql/turnover/RelationsTurnoverMapper.java

@@ -28,6 +28,7 @@ public interface RelationsTurnoverMapper extends BaseMapperX<RelationsTurnoverDO
                 .eqIfPresent(RelationsTurnoverDO::getUserUuid, reqVO.getUserUuid())
                 .eqIfPresent(RelationsTurnoverDO::getDeptId, reqVO.getDeptId())
                 .eqIfPresent(RelationsTurnoverDO::getDeptUuid, reqVO.getDeptUuid())
+                .eqIfPresent(RelationsTurnoverDO::getPostId, reqVO.getPostId())
                 .eqIfPresent(RelationsTurnoverDO::getPosition, reqVO.getPosition())
                 .betweenIfPresent(RelationsTurnoverDO::getEntryDate, reqVO.getEntryDate())
                 .betweenIfPresent(RelationsTurnoverDO::getTurnoverDate, reqVO.getTurnoverDate())