修复一些问题

2025-12-30 03:52:25 +00:00 · 2025-01-08 14:33:01 +08:00
parent 953242a8a9
commit 082aaf5b8b
16 changed files with 83 additions and 223 deletions
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/work/WorkLeaveController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/work/WorkLeaveController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.work.controller;
+package com.ruoyi.web.controller.work;

 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
--- a/ruoyi-api/ruoyi-flowable-api/src/main/java/com/ruoyi/flowable/api/domain/WfBusinessProcess.java
+++ b/ruoyi-api/ruoyi-flowable-api/src/main/java/com/ruoyi/flowable/api/domain/WfBusinessProcess.java
@@ -2,6 +2,9 @@ package com.ruoyi.flowable.api.domain;


 import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;

 /**
 * 业务流程对象 wf_business_process
@@ -9,6 +12,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 * @author fengcheng
 * @date 2024-07-15
 */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class WfBusinessProcess extends BaseEntity
 {
    private static final long serialVersionUID = 1L;
@@ -21,37 +27,4 @@ public class WfBusinessProcess extends BaseEntity

    /** 业务流程类型 */
    private String businessProcessType;
-
-    public String getBusinessId() {
-        return businessId;
-    }
-
-    public void setBusinessId(String businessId) {
-        this.businessId = businessId;
-    }
-
-    public String getProcessId() {
-        return processId;
-    }
-
-    public void setProcessId(String processId) {
-        this.processId = processId;
-    }
-
-    public String getBusinessProcessType() {
-        return businessProcessType;
-    }
-
-    public void setBusinessProcessType(String businessProcessType) {
-        this.businessProcessType = businessProcessType;
-    }
-
-    @Override
-    public String toString() {
-        return "WfBusinessProcess{" +
-                "businessId='" + businessId + '\'' +
-                ", processId='" + processId + '\'' +
-                ", businessProcessType='" + businessProcessType + '\'' +
-                '}';
-    }
 }
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/ActReModel.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/ActReModel.java
@@ -1,8 +1,10 @@
 package com.ruoyi.flowable.domain;

 import com.ruoyi.flowable.base.BaseEntity;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;

 import java.util.Date;

@@ -12,6 +14,8 @@ import java.util.Date;
 * @author fengcheng
 */
@Data
+@NoArgsConstructor
+@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
 public class ActReModel extends BaseEntity {
    private static final long serialVersionUID = 1L;
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/Deploy.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/Deploy.java
@@ -1,8 +1,10 @@
 package com.ruoyi.flowable.domain;

 import com.ruoyi.flowable.base.BaseEntity;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;

 /**
 * 部署对象 deploy
@@ -10,6 +12,8 @@ import lombok.EqualsAndHashCode;
 * @author fengcheng
 */
@Data
+@NoArgsConstructor
+@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
 public class Deploy extends BaseEntity {
    private static final long serialVersionUID = 1L;
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfCategory.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfCategory.java
@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.flowable.base.BaseEntity;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;

 /**
 * 流程分类对象 wf_category
@@ -14,6 +16,8 @@ import lombok.EqualsAndHashCode;
 * @date 2022-01-15
 */
@Data
+@NoArgsConstructor
+@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
@TableName("wf_category")
 public class WfCategory extends BaseEntity {
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfCopy.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfCopy.java
@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.flowable.base.BaseEntity;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;

 /**
 * 流程抄送对象 wf_copy
@@ -14,6 +16,8 @@ import lombok.EqualsAndHashCode;
 * @date 2022-05-19
 */
@Data
+@NoArgsConstructor
+@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
@TableName("wf_copy")
 public class WfCopy extends BaseEntity {
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfDeployForm.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfDeployForm.java
@@ -3,7 +3,9 @@ package com.ruoyi.flowable.domain;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;

 /**
 * 流程实例关联表单对象 sys_instance_form
@@ -12,6 +14,8 @@ import lombok.Data;
 * @createTime 2022/3/7 22:07
 */
@Data
+@NoArgsConstructor
+@AllArgsConstructor
@TableName("wf_deploy_form")
 public class WfDeployForm {
    private static final long serialVersionUID = 1L;
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfFlowMenu.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfFlowMenu.java
@@ -3,8 +3,10 @@ package com.ruoyi.flowable.domain;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.flowable.base.BaseEntity;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;

 /**
 * 流程菜单对象 wf_flow_menu
@@ -12,6 +14,8 @@ import lombok.EqualsAndHashCode;
 * @author fengcheng
 */
@Data
+@NoArgsConstructor
+@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
@TableName("wf_flow_menu" )
 public class WfFlowMenu extends BaseEntity {
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfForm.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfForm.java
@@ -3,8 +3,10 @@ package com.ruoyi.flowable.domain;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.flowable.base.BaseEntity;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;

 /**
 * 流程表单对象 wf_form
@@ -13,6 +15,8 @@ import lombok.EqualsAndHashCode;
 * @createTime 2022/3/7 22:07
 */
@Data
+@NoArgsConstructor
+@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
@TableName("wf_form")
 public class WfForm extends BaseEntity {
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfIcon.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfIcon.java
@@ -1,9 +1,9 @@
 package com.ruoyi.flowable.domain;

-import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;

 /**
 * 流程图标对象 wf_icon
@@ -11,42 +11,19 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 * @author fengcheng
 * @date 2024-07-09
 */
-public class WfIcon extends BaseEntity
-{
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class WfIcon extends BaseEntity {
    private static final long serialVersionUID = 1L;

-    /** 流程部署id */
-    @Excel(name = "流程部署id")
+    /**
+     * 流程部署id
+     */
    private String deploymentId;

-    /** 流程图标路径 */
-    @Excel(name = "流程图标路径")
+    /**
+     * 流程图标路径
+     */
    private String icon;
-
-    public void setDeploymentId(String deploymentId)
-    {
-        this.deploymentId = deploymentId;
-    }
-
-    public String getDeploymentId()
-    {
-        return deploymentId;
-    }
-    public void setIcon(String icon)
-    {
-        this.icon = icon;
-    }
-
-    public String getIcon()
-    {
-        return icon;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("deploymentId", getDeploymentId())
-            .append("icon", getIcon())
-            .toString();
-    }
 }
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfModelAssociationTemplate.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfModelAssociationTemplate.java
@@ -1,9 +1,9 @@
 package com.ruoyi.flowable.domain;

-import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;

 /**
 * 模型关联模板对象 wf_model_association_template
@@ -11,42 +11,19 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 * @author fengcheng
 * @date 2024-07-23
 */
-public class WfModelAssociationTemplate extends BaseEntity
-{
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class WfModelAssociationTemplate extends BaseEntity {
    private static final long serialVersionUID = 1L;

-    /** 模型模板id */
-    @Excel(name = "模型模板id")
+    /**
+     * 模型模板id
+     */
    private String modelTemplateId;

-    /** 模型ID */
-    @Excel(name = "模型ID")
+    /**
+     * 模型ID
+     */
    private String modelId;
-
-    public void setModelTemplateId(String modelTemplateId)
-    {
-        this.modelTemplateId = modelTemplateId;
-    }
-
-    public String getModelTemplateId()
-    {
-        return modelTemplateId;
-    }
-    public void setModelId(String modelId)
-    {
-        this.modelId = modelId;
-    }
-
-    public String getModelId()
-    {
-        return modelId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("modelTemplateId", getModelTemplateId())
-            .append("modelId", getModelId())
-            .toString();
-    }
 }
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfModelPermission.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfModelPermission.java
@@ -2,6 +2,9 @@ package com.ruoyi.flowable.domain;

 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

@@ -11,6 +14,9 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 * @author fengcheng
 * @date 2024-07-10
 */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class WfModelPermission extends BaseEntity
 {
    private static final long serialVersionUID = 1L;
@@ -19,77 +25,14 @@ public class WfModelPermission extends BaseEntity
    private String modelPermissionId;

    /** 流程模型ID */
-    @Excel(name = "流程模型ID")
    private String modelId;

    /** 权限id */
-    @Excel(name = "权限id")
    private Long permissionId;

    /** 名称 */
-    @Excel(name = "名称")
    private String name;

    /** 权限类型(1=人员权限,2=部门权限) */
-    @Excel(name = "权限类型(1=人员权限,2=部门权限)")
    private String type;
-
-    public void setModelPermissionId(String modelPermissionId)
-    {
-        this.modelPermissionId = modelPermissionId;
-    }
-
-    public String getModelPermissionId()
-    {
-        return modelPermissionId;
-    }
-    public void setModelId(String modelId)
-    {
-        this.modelId = modelId;
-    }
-
-    public String getModelId()
-    {
-        return modelId;
-    }
-    public void setPermissionId(Long permissionId)
-    {
-        this.permissionId = permissionId;
-    }
-
-    public Long getPermissionId()
-    {
-        return permissionId;
-    }
-    public void setName(String name)
-    {
-        this.name = name;
-    }
-
-    public String getName()
-    {
-        return name;
-    }
-    public void setType(String type)
-    {
-        this.type = type;
-    }
-
-    public String getType()
-    {
-        return type;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("modelPermissionId", getModelPermissionId())
-            .append("modelId", getModelId())
-            .append("permissionId", getPermissionId())
-            .append("name", getName())
-            .append("type", getType())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
 }
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfModelProcdef.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfModelProcdef.java
@@ -1,6 +1,9 @@
 package com.ruoyi.flowable.domain;

 import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;

 /**
 * 模型部署对象 wf_model_procdef
@@ -8,6 +11,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 * @author fengcheng
 * @date 2024-07-11
 */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class WfModelProcdef extends BaseEntity
 {
    private static final long serialVersionUID = 1L;
@@ -32,59 +38,5 @@ public class WfModelProcdef extends BaseEntity
     * 表单查看路由
     */
    private String formViewPath;
-
-    public void setModelId(String modelId)
-    {
-        this.modelId = modelId;
-    }
-
-    public String getModelId()
-    {
-        return modelId;
-    }
-    public void setProcdefId(String procdefId)
-    {
-        this.procdefId = procdefId;
-    }
-
-    public String getProcdefId()
-    {
-        return procdefId;
-    }
-
-    public String getFormType() {
-        return formType;
-    }
-
-    public void setFormType(String formType) {
-        this.formType = formType;
-    }
-
-    public String getFormCreatePath() {
-        return formCreatePath;
-    }
-
-    public void setFormCreatePath(String formCreatePath) {
-        this.formCreatePath = formCreatePath;
-    }
-
-    public String getFormViewPath() {
-        return formViewPath;
-    }
-
-    public void setFormViewPath(String formViewPath) {
-        this.formViewPath = formViewPath;
-    }
-
-    @Override
-    public String toString() {
-        return "WfModelProcdef{" +
-                "modelId='" + modelId + '\'' +
-                ", procdefId='" + procdefId + '\'' +
-                ", formType='" + formType + '\'' +
-                ", formCreatePath='" + formCreatePath + '\'' +
-                ", formViewPath='" + formViewPath + '\'' +
-                '}';
-    }
 }

--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfModelTemplate.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfModelTemplate.java
@@ -3,8 +3,10 @@ package com.ruoyi.flowable.domain;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;

 /**
 * 模型模板对象 wf_model_template
@@ -13,6 +15,8 @@ import lombok.EqualsAndHashCode;
 * @date 2024-07-17
 */
@Data
+@NoArgsConstructor
+@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
@TableName("wf_model_template")
 public class WfModelTemplate extends BaseEntity {
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/page/PageQuery.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/page/PageQuery.java
@@ -7,7 +7,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.sql.SqlUtil;
 import com.ruoyi.flowable.utils.StringUtils;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;

 import java.io.Serializable;
 import java.util.ArrayList;
@@ -20,6 +22,8 @@ import java.util.List;
 */

@Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class PageQuery implements Serializable {

    private static final long serialVersionUID = 1L;
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/page/TableDataInfo.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/page/TableDataInfo.java
@@ -2,6 +2,7 @@ package com.ruoyi.flowable.page;

 import cn.hutool.http.HttpStatus;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

@@ -16,6 +17,7 @@ import java.util.List;

@Data
@NoArgsConstructor
+@AllArgsConstructor
 public class TableDataInfo<T> implements Serializable {
    private static final long serialVersionUID = 1L;