添加部门类型

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java

@@ -18,7 +18,7 @@ import java.util.Objects;
  * <p>
  * 部门表
  * <p>
- * 
+ *
  * @Author Steve
  * @Since  2019-01-22
  */
@@ -26,7 +26,7 @@ import java.util.Objects;
 @TableName("sys_depart")
 public class SysDepart implements Serializable {
     private static final long serialVersionUID = 1L;
-    
+
 	/**ID*/
 	@TableId(type = IdType.ASSIGN_ID)
 	private String id;
@@ -49,6 +49,9 @@ public class SysDepart implements Serializable {
 	/**机构类别 1=公司，2=组织机构，3=岗位*/
 	@Excel(name="机构类别",width=15,dicCode="org_category")
 	private String orgCategory;
+	/**部门类型 0=设计部门，1=生产部门*/
+	@Excel(name="部门类型",width=15,dicCode="depart_type")
+	private String departType;
 	/**机构类型*/
 	private String orgType;
 	/**机构编码*/
@@ -95,7 +98,7 @@ public class SysDepart implements Serializable {
 	@TableField(exist = false)
     private String oldDirectorUserIds;
     //update-end---author:wangshuai ---date:20200308  for：[JTC-119]新增字段负责人ids和旧的负责人ids
-	
+
 	/**
 	 * 重写equals方法
 	 */
@@ -139,9 +142,9 @@ public class SysDepart implements Serializable {
     @Override
     public int hashCode() {
 
-        return Objects.hash(super.hashCode(), id, parentId, departName, 
-        		departNameEn, departNameAbbr, departOrder, description,orgCategory, 
-        		orgType, orgCode, mobile, fax, address, memo, status, 
+        return Objects.hash(super.hashCode(), id, parentId, departName,
+        		departNameEn, departNameAbbr, departOrder, description,orgCategory,
+        		orgType, orgCode, mobile, fax, address, memo, status,
         		delFlag, createBy, createTime, updateBy, updateTime);
     }
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java

@@ -12,14 +12,14 @@ import java.util.Objects;
  * <p>
  * 部门表 存储树结构数据的实体类
  * <p>
- * 
+ *
  * @Author Steve
- * @Since 2019-01-22 
+ * @Since 2019-01-22
  */
 public class SysDepartTreeModel implements Serializable{
-	
+
     private static final long serialVersionUID = 1L;
-    
+
     /** 对应SysDepart中的id字段,前端数据树中的key*/
     private String key;
 
@@ -32,7 +32,7 @@ public class SysDepartTreeModel implements Serializable{
 
     private boolean isLeaf;
     // 以下所有字段均与SysDepart相同
-    
+
     private String id;
 
     private String parentId;
@@ -46,9 +46,11 @@ public class SysDepartTreeModel implements Serializable{
     private Integer departOrder;
 
     private String description;
-    
+
     private String orgCategory;
 
+    private String departType;
+
     private String orgType;
 
     private String orgCode;
@@ -75,11 +77,13 @@ public class SysDepartTreeModel implements Serializable{
 
     private Date updateTime;
 
+    private String yy;
+
     //update-begin---author:wangshuai ---date:20200308  for：[JTC-119]在部门管理菜单下设置部门负责人，新增字段部门负责人ids
     /**部门负责人ids*/
     private String directorUserIds;
     //update-end---author:wangshuai ---date:20200308  for：[JTC-119]在部门管理菜单下设置部门负责人，新增字段部门负责人ids
-    
+
     private List<SysDepartTreeModel> children = new ArrayList<>();
 
 
@@ -99,6 +103,7 @@ public class SysDepartTreeModel implements Serializable{
         this.departOrder = sysDepart.getDepartOrder();
         this.description = sysDepart.getDescription();
         this.orgCategory = sysDepart.getOrgCategory();
+        this.departType = sysDepart.getDepartType();
         this.orgType = sysDepart.getOrgType();
         this.orgCode = sysDepart.getOrgCode();
         this.mobile = sysDepart.getMobile();
@@ -191,7 +196,7 @@ public class SysDepartTreeModel implements Serializable{
     public void setDepartName(String departName) {
         this.departName = departName;
     }
-    
+
     public String getOrgCategory() {
 		return orgCategory;
 	}
@@ -200,6 +205,13 @@ public class SysDepartTreeModel implements Serializable{
 		this.orgCategory = orgCategory;
 	}
 
+    public String getDepartType() {
+        return departType;
+    }
+    public void setDepartType(String departType) {
+        this.departType = departType;
+    }
+
 	public String getOrgType() {
         return orgType;
     }
@@ -366,6 +378,7 @@ public class SysDepartTreeModel implements Serializable{
                 Objects.equals(departOrder, model.departOrder) &&
                 Objects.equals(description, model.description) &&
                 Objects.equals(orgCategory, model.orgCategory) &&
+                Objects.equals(departType, model.departType) &&
                 Objects.equals(orgType, model.orgType) &&
                 Objects.equals(orgCode, model.orgCode) &&
                 Objects.equals(mobile, model.mobile) &&
@@ -382,7 +395,7 @@ public class SysDepartTreeModel implements Serializable{
                 Objects.equals(directorUserIds, model.directorUserIds) &&
                 Objects.equals(children, model.children);
     }
-    
+
     /**
      * 重写hashCode方法
      */
@@ -390,7 +403,7 @@ public class SysDepartTreeModel implements Serializable{
     public int hashCode() {
 
         return Objects.hash(id, parentId, departName, departNameEn, departNameAbbr,
-        		departOrder, description, orgCategory, orgType, orgCode, mobile, fax, address, 
+        		departOrder, description, orgCategory, departType, orgType, orgCode, mobile, fax, address,
         		memo, status, delFlag, qywxIdentifier, createBy, createTime, updateBy, updateTime,
         		children,directorUserIds);
     }