From f21bdede8546a348e2b16ffc3bbe292df7eeba76 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期五, 12 四月 2024 23:24:21 +0800 Subject: [PATCH] 集成相关代码修改 --- Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonMasterData.java | 156 +++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 136 insertions(+), 20 deletions(-) diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonMasterData.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonMasterData.java index 7c200d0..e021e1f 100644 --- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonMasterData.java +++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonMasterData.java @@ -15,51 +15,62 @@ * 闆嗗洟鍛樺伐缂栧彿 */ private String group_code; + /*** * 鍛樺伐濮撳悕 */ private String name; + /** * 涓绘暟鎹紪鐮� */ private String mdm_code; + /*** *0:姝e父锛�1鏁版嵁琚垹闄わ紝榛樿涓�0; */ private int dr; + /*** * 琛屾斂鍖哄煙鍖� */ private String admin_division; + /*** * 琛屾斂鍖哄煙鍖栧彿鐮� */ private String admin_division_code; + /** * 鍑虹敓鏃ユ湡(yyyy-MM-dd) */ private String birthday; + /** * 鍑虹敓鍦� */ private String birthplace; + /*** * 绫嶈疮 */ - private String cittizenship; + private String citiizenship; /** * 鍥藉/鍦板尯 */ private String country; + /*** * 閮ㄩ棬 */ private String dept_type; + /*** * 閮ㄩ棬鍚嶇О */ - private String deptName; + private String dept_name; + /*** * 瀛﹀巻 */ @@ -69,28 +80,32 @@ * 浠昏亴鍗曚綅缂栫爜 */ private String employer_code; + /*** * 鐢ㄥ伐褰㈠紡 */ private String employment_form; - /** * 韬唤璇佺紪鍙� */ private String id_number; + /*** * 璇佷欢绫诲瀷 */ private String id_type; + /*** * 鏄惁涓昏亴 */ private String is_keyposion; + /** * 濠氬Щ鐘跺喌 */ private String marital_status; + /** * 鎵嬫満鍙风爜 */ @@ -100,6 +115,7 @@ * 鍚嶆棌 */ private String nationality; + /** * 鍔炲叕鐢佃瘽 */ @@ -114,6 +130,7 @@ *涓婄骇闂ㄧ紪鐮� */ private String parent_dept_code; + /*** *涓婄骇闂ㄥ悕绉� */ @@ -123,6 +140,7 @@ *鏀挎不闈㈣矊 */ private String politiccountenance; + /*** * 宀椾綅 */ @@ -132,10 +150,16 @@ * 鑱岀О */ private String work_title; + /*** * 浜哄憳绫诲埆 */ private String worker_category; + + /*** + * 浜哄憳绫诲埆缂栫爜 + */ + private String worker_category_code; /*** * 鑱屽姟 @@ -153,6 +177,31 @@ private String worker_level; /*** + * 鑱岀骇缂栫爜 + */ + private String worker_level_code; + + /** + * 鍥藉瘑绛夌骇缂栫爜 + */ + private String country_level_code; + + /** + * 鍥藉瘑绛夌骇鍚嶇О + */ + private String country_level_name; + + /** + * 鍟嗗瘑绛夌骇缂栫爜 + */ + private String business_level_code; + + /** + * 鍟嗗瘑绛夌骇缂栫爜 + */ + private String business_level_name; + + /*** * 浜哄憳瀵嗙骇 */ private String worker_security_level; @@ -161,44 +210,62 @@ * 娴佺▼鐘舵�� */ private int mdm_workflow; + /*** * 淇敼鑰� */ private String modifier; + /*** * 淇敼鏃堕棿 */ private String modifytime; + /*** * 鍒涘缓鑰� */ private String creator; + /*** * 鍒涘缓鏃堕棿 */ private String createtime; - /** * 鏁版嵁鐘舵�� */ private int mdm_datastatus; + private String link_fieldvalue; + private String flow_middatastatus; + private String employer; + private int mdm_duplicate; + private EnumerableData gender_entity; + private EnumerableData employment_type_entity; - private String gerder; + + private String gender; + private String employment_type; + private String employment_type_nane; + private String mdm_cleanstatus; + private String mdm_parentcode; + private String mdm_yersion; + private String dr_mdm_code; + private String pk_mdm; private String gender_name; + private String ts; public String getId() { @@ -281,12 +348,12 @@ this.birthplace = birthplace; } - public String getCittizenship() { - return cittizenship; + public String getCitiizenship() { + return citiizenship; } - public void setCittizenship(String cittizenship) { - this.cittizenship = cittizenship; + public void setCitiizenship(String citiizenship) { + this.citiizenship = citiizenship; } public String getCountry() { @@ -305,12 +372,12 @@ this.dept_type = dept_type; } - public String getDeptName() { - return deptName; + public String getDept_name() { + return dept_name; } - public void setDeptName(String deptName) { - this.deptName = deptName; + public void setDept_name(String dept_name) { + this.dept_name = dept_name; } public String getEducation() { @@ -469,6 +536,54 @@ return worker_level; } + public String getWorker_category_code() { + return worker_category_code; + } + + public String getWorker_level_code() { + return worker_level_code; + } + + public String getCountry_level_code() { + return country_level_code; + } + + public String getCountry_level_name() { + return country_level_name; + } + + public String getBusiness_level_code() { + return business_level_code; + } + + public String getBusiness_level_name() { + return business_level_name; + } + + public void setWorker_category_code(String worker_category_code) { + this.worker_category_code = worker_category_code; + } + + public void setWorker_level_code(String worker_level_code) { + this.worker_level_code = worker_level_code; + } + + public void setCountry_level_code(String country_level_code) { + this.country_level_code = country_level_code; + } + + public void setCountry_level_name(String country_level_name) { + this.country_level_name = country_level_name; + } + + public void setBusiness_level_code(String business_level_code) { + this.business_level_code = business_level_code; + } + + public void setBusiness_level_name(String business_level_name) { + this.business_level_name = business_level_name; + } + public void setWorker_level(String worker_level) { this.worker_level = worker_level; } @@ -577,12 +692,12 @@ this.employment_type_entity = employment_type_entity; } - public String getGerder() { - return gerder; + public String getGender() { + return gender; } - public void setGerder(String gerder) { - this.gerder = gerder; + public void setGender(String gender) { + this.gender = gender; } public String getEmployment_type() { @@ -670,10 +785,10 @@ ", admin_division_code='" + admin_division_code + '\'' + ", birthday='" + birthday + '\'' + ", birthplace='" + birthplace + '\'' + - ", cittizenship='" + cittizenship + '\'' + + ", citiizenship='" + citiizenship + '\'' + ", country='" + country + '\'' + ", dept_type='" + dept_type + '\'' + - ", deptName='" + deptName + '\'' + + ", dept_name='" + dept_name + '\'' + ", education='" + education + '\'' + ", employer_code='" + employer_code + '\'' + ", employment_form='" + employment_form + '\'' + @@ -707,7 +822,7 @@ ", mdm_duplicate=" + mdm_duplicate + ", gender_entity=" + gender_entity + ", employment_type_entity=" + employment_type_entity + - ", gerder='" + gerder + '\'' + + ", gender='" + gender + '\'' + ", employment_type='" + employment_type + '\'' + ", employment_type_nane='" + employment_type_nane + '\'' + ", mdm_cleanstatus='" + mdm_cleanstatus + '\'' + @@ -719,4 +834,5 @@ ", ts='" + ts + '\'' + '}'; } + } -- Gitblit v1.9.3