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 |  235 ++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 178 insertions(+), 57 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 e021e1f..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 {
+
 	/***
 	 * 鏁版嵁鍦ㄦ绯荤粺涓敮涓�鏍囪瘑
 	 */
@@ -54,7 +55,7 @@
 	/***
 	 * 绫嶈疮
 	 */
-	private String citiizenship;
+	private String citizenship;
 
 	/**
 	 * 鍥藉/鍦板尯
@@ -112,7 +113,7 @@
 	private String mobile_phone;
 
 	/***
-	 * 鍚嶆棌
+	 * 姘戞棌
 	 */
 	private String nationality;
 
@@ -156,7 +157,7 @@
 	 */
 	private String worker_category;
 
-	/***
+	/**
 	 * 浜哄憳绫诲埆缂栫爜
 	 */
 	private String worker_category_code;
@@ -197,7 +198,7 @@
 	private String business_level_code;
 
 	/**
-	 * 鍟嗗瘑绛夌骇缂栫爜
+	 * 鍟嗗瘑绛夌骇鍚嶇О
 	 */
 	private String business_level_name;
 
@@ -267,6 +268,21 @@
 	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;
@@ -348,12 +364,36 @@
 		this.birthplace = birthplace;
 	}
 
-	public String getCitiizenship() {
-		return citiizenship;
+	public String getCitizenship() {
+		return citizenship;
 	}
 
-	public void setCitiizenship(String citiizenship) {
-		this.citiizenship = citiizenship;
+	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() {
@@ -362,6 +402,30 @@
 
 	public void setCountry(String country) {
 		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() {
@@ -534,54 +598,6 @@
 
 	public String getWorker_level() {
 		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) {
@@ -772,6 +788,94 @@
 		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 "PersonMasterData{" +
@@ -785,7 +889,7 @@
 			", admin_division_code='" + admin_division_code + '\'' +
 			", birthday='" + birthday + '\'' +
 			", birthplace='" + birthplace + '\'' +
-			", citiizenship='" + citiizenship + '\'' +
+			", citizenship='" + citizenship + '\'' +
 			", country='" + country + '\'' +
 			", dept_type='" + dept_type + '\'' +
 			", dept_name='" + dept_name + '\'' +
@@ -806,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 + '\'' +
@@ -832,6 +942,17 @@
 			", 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