Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2026-03-07 d7fef91a4cbb702988dc820bcde82c166253ceec

 ard-inspection/src/main/java/com/ard/inspection/domain/ArdInspectionGroup.java

@@ -1,8 +1,13 @@
package com.ard.inspection.domain;

import com.ard.common.annotation.Excel;
import com.ard.common.core.domain.BaseEntity;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import java.util.ArrayList;
import java.util.List;

/**
 * 精细化巡检分组对象 ard_inspection_group
@@ -10,7 +15,6 @@
 * @author xia
 * @date 2026-01-15
 */
@Data
public class ArdInspectionGroup extends BaseEntity {

    private static final long serialVersionUID = 1L;
@@ -19,19 +23,101 @@
    private Long groupId;

    /** 分组父部门id */
    @Excel(name = "分组父部门id")
    private Long groupParentId;

    /** 祖级列表 */
    @Excel(name = "祖级列表")
    private String ancestors;

    /** 分组名称 */
    @Excel(name = "分组名称")
    private String groupName;

    /** 显示顺序 */
    @Excel(name = "显示顺序")
    private Long orderNum;
    private Integer orderNum;

    /** 删除标志（0代表存在 2代表删除） */
    private String delFlag;

    /** 父部门名称 */
    private String parentName;

    /** 子部门 */
    private List<ArdInspectionGroup> children = new ArrayList<ArdInspectionGroup>();

    public Long getGroupId() {
        return groupId;
    }

    public void setGroupId(Long groupId) {
        this.groupId = groupId;
    }

    public Long getGroupParentId() {
        return groupParentId;
    }

    public void setGroupParentId(Long groupParentId) {
        this.groupParentId = groupParentId;
    }

    public String getAncestors() {
        return ancestors;
    }

    public void setAncestors(String ancestors) {
        this.ancestors = ancestors;
    }

    @NotBlank(message = "分组名称不能为空")
    @Size(min = 0, max = 30, message = "分组名称长度不能超过30个字符")
    public String getGroupName() {
        return groupName;
    }

    public void setGroupName(String groupName) {
        this.groupName = groupName;
    }

    public Integer getOrderNum() {
        return orderNum;
    }

    public void setOrderNum(Integer orderNum) {
        this.orderNum = orderNum;
    }

    public String getParentName() {
        return parentName;
    }

    public void setParentName(String parentName) {
        this.parentName = parentName;
    }

    public List<ArdInspectionGroup> getChildren() {
        return children;
    }

    public void setChildren(List<ArdInspectionGroup> children) {
        this.children = children;
    }

    public String getDelFlag() {
        return delFlag;
    }

    public void setDelFlag(String delFlag) {
        this.delFlag = delFlag;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
            .append("groupId", getGroupId())
            .append("groupParentId", getGroupParentId())
            .append("ancestors", getAncestors())
            .append("groupName", getGroupName())
            .append("orderNum", getOrderNum())
            .append("delFlag", getDelFlag())
            .toString();
    }
}