From 4adfeb4a63f5a09f42868f43af5a50034a09dce8 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 22 七月 2025 16:29:28 +0800
Subject: [PATCH] art: 技术状态鉴定申请-Bug修改
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
index b4fdad5..4d7e977 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
@@ -7,6 +7,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.common.constant.CommonConstant;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -18,7 +19,7 @@
* <p>
* 閮ㄩ棬琛�
* <p>
- *
+ *
* @Author Steve
* @Since 2019-01-22
*/
@@ -26,7 +27,7 @@
@TableName("sys_depart")
public class SysDepart implements Serializable {
private static final long serialVersionUID = 1L;
-
+
/**ID*/
@TableId(type = IdType.ASSIGN_ID)
private String id;
@@ -71,7 +72,7 @@
private String status;
/**鍒犻櫎鐘舵�侊紙0锛屾甯革紝1宸插垹闄わ級*/
@Dict(dicCode = "del_flag")
- private String delFlag;
+ private String delFlag = String.valueOf(CommonConstant.DEL_FLAG_0);
/**瀵规帴浼佷笟寰俊鐨処D*/
private String qywxIdentifier;
/**鍒涘缓浜�*/
@@ -87,6 +88,14 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
+ /**浣跨敤閮ㄩ棬缂栫爜*/
+// @TableField(exist = false)
+ private String useDepartNum;
+
+ /**缁翠慨閮ㄩ棬缂栫爜*/
+// @TableField(exist = false)
+ private String repairDepartNum;
+
//update-begin---author:wangshuai ---date:20200308 for锛歔JTC-119]鍦ㄩ儴闂ㄧ鐞嗚彍鍗曚笅璁剧疆閮ㄩ棬璐熻矗浜猴紝鏂板瀛楁璐熻矗浜篿ds鍜屾棫鐨勮礋璐ｄ汉ids
/**閮ㄩ棬璐熻矗浜虹殑ids*/
@TableField(exist = false)
@@ -95,7 +104,7 @@
@TableField(exist = false)
private String oldDirectorUserIds;
//update-end---author:wangshuai ---date:20200308 for锛歔JTC-119]鏂板瀛楁璐熻矗浜篿ds鍜屾棫鐨勮礋璐ｄ汉ids
-
+
/**
* 閲嶅啓equals鏂规硶
*/
@@ -130,6 +139,8 @@
Objects.equals(createBy, depart.createBy) &&
Objects.equals(createTime, depart.createTime) &&
Objects.equals(updateBy, depart.updateBy) &&
+ Objects.equals(useDepartNum, depart.useDepartNum) &&
+ Objects.equals(repairDepartNum, depart.repairDepartNum) &&
Objects.equals(updateTime, depart.updateTime);
}
@@ -139,9 +150,9 @@
@Override
public int hashCode() {
- 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);
+ 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,useDepartNum,repairDepartNum);
}
}
--
Gitblit v1.9.3