From 2876d18531c7a75d4184285d54740e4b77859c56 Mon Sep 17 00:00:00 2001 From: xiejun <xiejun@vci-tech.com> Date: 星期三, 08 一月 2025 20:23:47 +0800 Subject: [PATCH] 产品型号集成,类型转换,人员组织加日志,申请接口引用码段值校验 --- Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonMasterData.java | 295 +++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 266 insertions(+), 29 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 d75d269..751e14d 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 @@ -1,6 +1,7 @@ package com.vci.ubcs.code.vo.webserviceModel.person; public class PersonMasterData { + /*** * 鏁版嵁鍦ㄦ绯荤粺涓敮涓�鏍囪瘑 */ @@ -15,51 +16,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 citizenship; /** * 鍥藉/鍦板尯 */ private String country; + /*** * 閮ㄩ棬 */ private String dept_type; + /*** * 閮ㄩ棬鍚嶇О */ - private String deptName; + private String dept_name; + /*** * 瀛﹀巻 */ @@ -69,37 +81,42 @@ * 浠昏亴鍗曚綅缂栫爜 */ private String employer_code; + /*** * 鐢ㄥ伐褰㈠紡 */ private String employment_form; - /** * 韬唤璇佺紪鍙� */ private String id_number; + /*** * 璇佷欢绫诲瀷 */ private String id_type; + /*** * 鏄惁涓昏亴 */ private String is_keyposion; + /** * 濠氬Щ鐘跺喌 */ private String marital_status; + /** * 鎵嬫満鍙风爜 */ private String mobile_phone; /*** - * 鍚嶆棌 + * 姘戞棌 */ private String nationality; + /** * 鍔炲叕鐢佃瘽 */ @@ -114,6 +131,7 @@ *涓婄骇闂ㄧ紪鐮� */ private String parent_dept_code; + /*** *涓婄骇闂ㄥ悕绉� */ @@ -123,6 +141,7 @@ *鏀挎不闈㈣矊 */ private String politiccountenance; + /*** * 宀椾綅 */ @@ -132,10 +151,16 @@ * 鑱岀О */ private String work_title; + /*** * 浜哄憳绫诲埆 */ private String worker_category; + + /** + * 浜哄憳绫诲埆缂栫爜 + */ + private String worker_category_code; /*** * 鑱屽姟 @@ -153,6 +178,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,45 +211,78 @@ * 娴佺▼鐘舵�� */ 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 gerder_entity; + + 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; + + + private String graduatecolleges; + private String is_on_duty; + private String is_on_job; + private String leibie; + private String major; + private String position_code; + + private String post_state_code; + private String post_state_name; + private String sort_num; + private String worktime; + + private String workyear; public String getId() { return id; @@ -281,12 +364,36 @@ this.birthplace = birthplace; } - public String getCittizenship() { - return cittizenship; + public String getCitizenship() { + return citizenship; } - public void setCittizenship(String cittizenship) { - this.cittizenship = cittizenship; + public void setCitizenship(String citizenship) { + this.citizenship = citizenship; + } + + 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 String getCountry() { @@ -297,6 +404,30 @@ this.country = country; } + 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 String getDept_type() { return dept_type; } @@ -305,12 +436,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() { @@ -561,12 +692,12 @@ this.mdm_duplicate = mdm_duplicate; } - public EnumerableData getGerder_entity() { - return gerder_entity; + public EnumerableData getGender_entity() { + return gender_entity; } - public void setGerder_entity(EnumerableData gerder_entity) { - this.gerder_entity = gerder_entity; + public void setGender_entity(EnumerableData gender_entity) { + this.gender_entity = gender_entity; } public EnumerableData getEmployment_type_entity() { @@ -577,12 +708,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() { @@ -657,9 +788,97 @@ this.ts = ts; } + public String getGraduatecolleges() { + return graduatecolleges; + } + + public void setGraduatecolleges(String graduatecolleges) { + this.graduatecolleges = graduatecolleges; + } + + public String getIs_on_duty() { + return is_on_duty; + } + + public void setIs_on_duty(String is_on_duty) { + this.is_on_duty = is_on_duty; + } + + public String getIs_on_job() { + return is_on_job; + } + + public void setIs_on_job(String is_on_job) { + this.is_on_job = is_on_job; + } + + public String getLeibie() { + return leibie; + } + + public void setLeibie(String leibie) { + this.leibie = leibie; + } + + public String getMajor() { + return major; + } + + public void setMajor(String major) { + this.major = major; + } + + public String getPosition_code() { + return position_code; + } + + public void setPosition_code(String position_code) { + this.position_code = position_code; + } + + public String getPost_state_code() { + return post_state_code; + } + + public void setPost_state_code(String post_state_code) { + this.post_state_code = post_state_code; + } + + public String getPost_state_name() { + return post_state_name; + } + + public void setPost_state_name(String post_state_name) { + this.post_state_name = post_state_name; + } + + public String getSort_num() { + return sort_num; + } + + public void setSort_num(String sort_num) { + this.sort_num = sort_num; + } + + public String getWorktime() { + return worktime; + } + + public void setWorktime(String worktime) { + this.worktime = worktime; + } + + public String getWorkyear() { + return workyear; + } + + public void setWorkyear(String workyear) { + this.workyear = workyear; + } + @Override public String toString() { - return "MasterData{" + + return "PersonMasterData{" + "id='" + id + '\'' + ", lm_code='" + lm_code + '\'' + ", group_code='" + group_code + '\'' + @@ -670,10 +889,10 @@ ", admin_division_code='" + admin_division_code + '\'' + ", birthday='" + birthday + '\'' + ", birthplace='" + birthplace + '\'' + - ", cittizenship='" + cittizenship + '\'' + + ", citizenship='" + citizenship + '\'' + ", country='" + country + '\'' + ", dept_type='" + dept_type + '\'' + - ", deptName='" + deptName + '\'' + + ", dept_name='" + dept_name + '\'' + ", education='" + education + '\'' + ", employer_code='" + employer_code + '\'' + ", employment_form='" + employment_form + '\'' + @@ -691,9 +910,15 @@ ", position='" + position + '\'' + ", work_title='" + work_title + '\'' + ", worker_category='" + worker_category + '\'' + + ", worker_category_code='" + worker_category_code + '\'' + ", worker_duty='" + worker_duty + '\'' + ", worker_email='" + worker_email + '\'' + ", worker_level='" + worker_level + '\'' + + ", worker_level_code='" + worker_level_code + '\'' + + ", country_level_code='" + country_level_code + '\'' + + ", country_level_name='" + country_level_name + '\'' + + ", business_level_code='" + business_level_code + '\'' + + ", business_level_name='" + business_level_name + '\'' + ", worker_security_level='" + worker_security_level + '\'' + ", mdm_workflow=" + mdm_workflow + ", modifier='" + modifier + '\'' + @@ -705,9 +930,9 @@ ", flow_middatastatus='" + flow_middatastatus + '\'' + ", employer='" + employer + '\'' + ", mdm_duplicate=" + mdm_duplicate + - ", gerder_entity='" + gerder_entity + '\'' + - ", employment_type_entity='" + employment_type_entity + '\'' + - ", gerder='" + gerder + '\'' + + ", gender_entity=" + gender_entity + + ", employment_type_entity=" + employment_type_entity + + ", gender='" + gender + '\'' + ", employment_type='" + employment_type + '\'' + ", employment_type_nane='" + employment_type_nane + '\'' + ", mdm_cleanstatus='" + mdm_cleanstatus + '\'' + @@ -717,6 +942,18 @@ ", pk_mdm='" + pk_mdm + '\'' + ", gender_name='" + gender_name + '\'' + ", ts='" + ts + '\'' + + ", graduatecolleges='" + graduatecolleges + '\'' + + ", is_on_duty='" + is_on_duty + '\'' + + ", is_on_job='" + is_on_job + '\'' + + ", leibie='" + leibie + '\'' + + ", major='" + major + '\'' + + ", position_code='" + position_code + '\'' + + ", post_state_code='" + post_state_code + '\'' + + ", post_state_name='" + post_state_name + '\'' + + ", sort_num='" + sort_num + '\'' + + ", worktime='" + worktime + '\'' + + ", workyear='" + workyear + '\'' + '}'; } + } -- Gitblit v1.9.3