通用流程分页列表调整

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/universal/vo/OaUniversalPageReqVO.java

@@ -1,10 +1,12 @@
 package cn.iocoder.yudao.module.bpm.controller.admin.oa.universal.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -27,12 +29,18 @@ public class OaUniversalPageReqVO extends PageParam {
     @Schema(description = "申请员工姓名", example = "芋艿")
     private String employeeName;
 
+    @Schema(description = "申请员工手机号", example = "13900000000")
+    private String employeePhone;
+
     @Schema(description = "申请用户账号id", example = "18283")
     private Long userId;
 
     @Schema(description = "申请用户账号uuid", example = "28769")
     private String userUuid;
 
+    @Schema(description = "申请用户账号手机号", example = "13900000000")
+    private String userPhone;
+
     @Schema(description = "部门id", example = "12910")
     private Long deptId;
 
@@ -63,12 +71,18 @@ public class OaUniversalPageReqVO extends PageParam {
     @Schema(description = "当前审核人用户uuid", example = "23687")
     private String currentAuditUserUuid;
 
+    @Schema(description = "当前审核人用户姓名")
+    private String currentAuditUserName;
+
     @Schema(description = "当前审核人员工id", example = "2375")
     private Long currentAuditEmployeeId;
 
     @Schema(description = "当前审核人员工uuid", example = "13039")
     private String currentAuditEmployeeUuid;
 
+    @Schema(description = "当前审核人员工姓名")
+    private String currentAuditEmployeeName;
+
     @Schema(description = "最后审核时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] finalAuditDate;

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/universal/vo/OaUniversalRespVO.java

@@ -1,12 +1,13 @@
 package cn.iocoder.yudao.module.bpm.controller.admin.oa.universal.vo;
 
+import cn.iocoder.yudao.framework.common.util.date.DateUtils;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import java.util.*;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 通用审批流程信息 Response VO")
 @Data
@@ -33,6 +34,9 @@ public class OaUniversalRespVO {
     @ExcelProperty("申请员工姓名")
     private String employeeName;
 
+    @Schema(description = "申请员工手机号", example = "13900000000")
+    private String employeePhone;
+
     @Schema(description = "申请用户账号id", example = "18283")
     @ExcelProperty("申请用户账号id")
     private Long userId;
@@ -41,6 +45,9 @@ public class OaUniversalRespVO {
     @ExcelProperty("申请用户账号uuid")
     private String userUuid;
 
+    @Schema(description = "申请用户账号手机号", example = "13900000000")
+    private String userPhone;
+
     @Schema(description = "部门id", example = "12910")
     @ExcelProperty("部门id")
     private Long deptId;
@@ -91,6 +98,7 @@ public class OaUniversalRespVO {
 
     @Schema(description = "最后审核时间")
     @ExcelProperty("最后审核时间")
+    @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime finalAuditDate;
 
     @Schema(description = "数据来源，0流程添加、1手动添加")
@@ -102,6 +110,7 @@ public class OaUniversalRespVO {
     private String creator;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/universal/vo/OaUniversalSaveReqVO.java

@@ -2,11 +2,10 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.universal.vo;
 
 import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskApproveReqVO;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import javax.validation.constraints.*;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
 
 @Schema(description = "管理后台 - 通用审批流程信息新增/修改 Request VO")
 @Data
@@ -27,12 +26,18 @@ public class OaUniversalSaveReqVO {
     @Schema(description = "申请员工姓名", example = "芋艿")
     private String employeeName;
 
-    @Schema(description = "申请用户账号id", example = "18283")
+    @Schema(description = "申请员工手机号", example = "13900000000")
+    private String employeePhone;
+
+    @Schema(description = "申请用户账号id", example = "1")
     private Long userId;
 
     @Schema(description = "申请用户账号uuid", example = "28769")
     private String userUuid;
 
+    @Schema(description = "申请用户账号手机号", example = "13900000000")
+    private String userPhone;
+
     @Schema(description = "部门id", example = "1")
     private Long deptId;
 
@@ -71,20 +76,16 @@ public class OaUniversalSaveReqVO {
     @Schema(description = "当前审核人员工uuid", example = "13039")
     private String currentAuditEmployeeUuid;
 
-    @Schema(description = "最后审核时间")
-    private LocalDateTime finalAuditDate;
-
     @Schema(description = "数据来源，0流程添加、1手动添加", example = "0")
     private String infoSource;
 
-
     @Schema(description = "审批，true 通过，false 驳回", example = "true")
     private Boolean auditPass;
 
     @Schema(description = "发起人自选审批人 Map", example = " [1, 1]")
     private List<Long> startUserSelectAssignees;
 
-    @Schema(description = "附件主键id", example = "[1, 2]")
+    @Schema(description = "附件主键id集合", example = "[1, 2]")
     private List<Long> fileIdList;
 
     @Schema(description = "审批信息")

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/universal/OaUniversalDO.java

@@ -44,6 +44,10 @@ public class OaUniversalDO extends BaseDO {
      * 申请员工姓名
      */
     private String employeeName;
+    /**
+     * 申请员工手机号
+     */
+    private String employeePhone;
     /**
      * 申请用户账号id
      */
@@ -52,6 +56,10 @@ public class OaUniversalDO extends BaseDO {
      * 申请用户账号uuid
      */
     private String userUuid;
+    /**
+     * 申请用户手机号
+     */
+    private String userPhone;
     /**
      * 部门id
      */

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/universal/OaUniversalMapper.java

@@ -21,12 +21,14 @@ public interface OaUniversalMapper extends BaseMapperX<OaUniversalDO> {
                 .eqIfPresent(OaUniversalDO::getEmployeeId, reqVO.getEmployeeId())
                 .eqIfPresent(OaUniversalDO::getEmployeeUuid, reqVO.getEmployeeUuid())
                 .likeIfPresent(OaUniversalDO::getEmployeeName, reqVO.getEmployeeName())
+                .likeIfPresent(OaUniversalDO::getEmployeePhone, reqVO.getEmployeePhone())
                 .eqIfPresent(OaUniversalDO::getUserId, reqVO.getUserId())
                 .eqIfPresent(OaUniversalDO::getUserUuid, reqVO.getUserUuid())
+                .likeIfPresent(OaUniversalDO::getUserPhone, reqVO.getUserPhone())
                 .eqIfPresent(OaUniversalDO::getDeptId, reqVO.getDeptId())
                 .eqIfPresent(OaUniversalDO::getDeptUuid, reqVO.getDeptUuid())
                 .eqIfPresent(OaUniversalDO::getPosition, reqVO.getPosition())
-                .eqIfPresent(OaUniversalDO::getTitle, reqVO.getTitle())
+                .likeIfPresent(OaUniversalDO::getTitle, reqVO.getTitle())
                 .eqIfPresent(OaUniversalDO::getDescription, reqVO.getDescription())
                 .eqIfPresent(OaUniversalDO::getRemarks, reqVO.getRemarks())
                 .eqIfPresent(OaUniversalDO::getProcInstId, reqVO.getProcInstId())