前端预览加权限设置页面 相关sql修改
This commit is contained in:
@@ -0,0 +1,19 @@
|
||||
package com.ruoyi.rm.domain.bo;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class RmCommissioningBo extends BaseEntity {
|
||||
private Long commissioningId;
|
||||
private Long projectId;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private Date commissioningDate;
|
||||
private String confirmer;
|
||||
private String remark;
|
||||
}
|
||||
@@ -21,5 +21,6 @@ public class RmInstallFeedbackBo extends BaseEntity {
|
||||
private String solution;
|
||||
private String preventAction;
|
||||
private String status;
|
||||
private String attachmentUrl;
|
||||
private String remark;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.ruoyi.rm.domain.bo;
|
||||
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class RmStageConfirmBo extends BaseEntity {
|
||||
private Long confirmId;
|
||||
private Long projectId;
|
||||
private String stageKey;
|
||||
private String confirmType;
|
||||
private String remark;
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package com.ruoyi.rm.domain.bo;
|
||||
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class RmStageImageBo extends BaseEntity {
|
||||
|
||||
private Long imageId;
|
||||
private Long projectId;
|
||||
private String stageKey;
|
||||
private String imageUrl;
|
||||
private String description;
|
||||
private Integer sortOrder;
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.ruoyi.rm.domain.bo;
|
||||
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class RmStageUserPermBo extends BaseEntity {
|
||||
private Long id;
|
||||
private Long userId;
|
||||
private String stageKey;
|
||||
private String canOverride;
|
||||
private String canConfirm;
|
||||
}
|
||||
@@ -14,6 +14,8 @@ public class RmTechPlanItemBo extends BaseEntity {
|
||||
private String status;
|
||||
private String description;
|
||||
private String owner;
|
||||
private String completionDate;
|
||||
private String endDate;
|
||||
private String attachmentUrl;
|
||||
private String remark;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
package com.ruoyi.rm.domain.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("fad_rm_commissioning")
|
||||
public class RmCommissioning extends BaseEntity implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId
|
||||
private Long commissioningId;
|
||||
private Long projectId;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private Date commissioningDate;
|
||||
private String confirmer;
|
||||
private String remark;
|
||||
@TableLogic
|
||||
private Integer delFlag;
|
||||
}
|
||||
@@ -29,6 +29,7 @@ public class RmInstallFeedback extends BaseEntity implements Serializable {
|
||||
private String solution;
|
||||
private String preventAction;
|
||||
private String status;
|
||||
private String attachmentUrl;
|
||||
private String remark;
|
||||
@TableLogic
|
||||
private Integer delFlag;
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
package com.ruoyi.rm.domain.entity;
|
||||
|
||||
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 lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("fad_rm_stage_confirm")
|
||||
public class RmStageConfirm extends BaseEntity implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId
|
||||
private Long confirmId;
|
||||
private Long projectId;
|
||||
private String stageKey;
|
||||
private String confirmType;
|
||||
private Long confirmerId;
|
||||
private Date confirmedAt;
|
||||
private String remark;
|
||||
@TableLogic
|
||||
private Integer delFlag;
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package com.ruoyi.rm.domain.entity;
|
||||
|
||||
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 lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("fad_rm_stage_image")
|
||||
public class RmStageImage extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId
|
||||
private Long imageId;
|
||||
private Long projectId;
|
||||
private String stageKey;
|
||||
private String imageUrl;
|
||||
private String description;
|
||||
private Integer sortOrder;
|
||||
@TableLogic
|
||||
private Integer delFlag;
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
package com.ruoyi.rm.domain.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("fad_rm_stage_user_perm")
|
||||
public class RmStageUserPerm extends BaseEntity implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId
|
||||
private Long id;
|
||||
private Long userId;
|
||||
private String stageKey;
|
||||
private String canOverride;
|
||||
private String canConfirm;
|
||||
}
|
||||
@@ -22,6 +22,8 @@ public class RmTechPlanItem extends BaseEntity implements Serializable {
|
||||
private String status;
|
||||
private String description;
|
||||
private String owner;
|
||||
private String completionDate;
|
||||
private String endDate;
|
||||
private String attachmentUrl;
|
||||
private String remark;
|
||||
@TableLogic
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
package com.ruoyi.rm.domain.vo;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
public class RmCommissioningVo implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private Long commissioningId;
|
||||
|
||||
@Excel(name = "项目ID")
|
||||
private Long projectId;
|
||||
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "试车日期", width = 15)
|
||||
private Date commissioningDate;
|
||||
|
||||
@Excel(name = "确认人")
|
||||
private String confirmer;
|
||||
|
||||
@Excel(name = "备注")
|
||||
private String remark;
|
||||
}
|
||||
@@ -41,4 +41,7 @@ public class RmInstallFeedbackVo implements Serializable {
|
||||
|
||||
@Excel(name = "状态")
|
||||
private String status;
|
||||
|
||||
@Excel(name = "附件")
|
||||
private String attachmentUrl;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
package com.ruoyi.rm.domain.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
public class RmStageConfirmVo implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private Long confirmId;
|
||||
private Long projectId;
|
||||
private String stageKey;
|
||||
private String confirmType;
|
||||
private Long confirmerId;
|
||||
private String confirmerName;
|
||||
private Date confirmedAt;
|
||||
private String remark;
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
package com.ruoyi.rm.domain.vo;
|
||||
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
public class RmStageImageVo implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@Excel(name = "图片ID")
|
||||
private Long imageId;
|
||||
|
||||
@Excel(name = "项目ID")
|
||||
private Long projectId;
|
||||
|
||||
@Excel(name = "阶段标识")
|
||||
private String stageKey;
|
||||
|
||||
@Excel(name = "图片地址")
|
||||
private String imageUrl;
|
||||
|
||||
@Excel(name = "描述")
|
||||
private String description;
|
||||
|
||||
@Excel(name = "排序号")
|
||||
private Integer sortOrder;
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package com.ruoyi.rm.domain.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
public class RmStageUserPermVo implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private Long id;
|
||||
private Long userId;
|
||||
private String stageKey;
|
||||
private String canOverride;
|
||||
private String canConfirm;
|
||||
}
|
||||
@@ -27,7 +27,13 @@ public class RmTechPlanItemVo implements Serializable {
|
||||
@Excel(name = "负责人")
|
||||
private String owner;
|
||||
|
||||
@Excel(name = "附件路径")
|
||||
@Excel(name = "完成时间")
|
||||
private String completionDate;
|
||||
|
||||
@Excel(name = "结束时间")
|
||||
private String endDate;
|
||||
|
||||
@Excel(name = "附件")
|
||||
private String attachmentUrl;
|
||||
|
||||
@Excel(name = "备注")
|
||||
|
||||
Reference in New Issue
Block a user