Skip to content

I
iBiz人力资源
提交 5014ba0b 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

jackwang 部署微服务接口

上级 e3ecf4ea
显示空白字符变更
内嵌 并排
正在显示 包含 36 行增加 和 36 行删除
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/domain/HREmployee.java
浏览文件 @ 5014ba0b
...@@ -195,13 +195,6 @@ public class HREmployee extends EntityMP implements Serializable { ...@@ -195,13 +195,6 @@ public class HREmployee extends EntityMP implements Serializable {
@JSONField(name = "nativetype") @JSONField(name = "nativetype")
@JsonProperty("nativetype") @JsonProperty("nativetype")
private String nativetype; private String nativetype;
/**
* 籍贯
*/
@TableField(value = "native")
@JSONField(name = "native")
@JsonProperty("native")
private String native;
/** /**
* 户籍地址 * 户籍地址
*/ */
...@@ -324,6 +317,13 @@ public class HREmployee extends EntityMP implements Serializable { ...@@ -324,6 +317,13 @@ public class HREmployee extends EntityMP implements Serializable {
@JSONField(name = "jobstate") @JSONField(name = "jobstate")
@JsonProperty("jobstate") @JsonProperty("jobstate")
private String jobstate; private String jobstate;
/**
* 籍贯
*/
@TableField(value = "nativeplace")
@JSONField(name = "nativeplace")
@JsonProperty("nativeplace")
private String nativeplace;
/** /**
* *
...@@ -465,14 +465,6 @@ public class HREmployee extends EntityMP implements Serializable { ...@@ -465,14 +465,6 @@ public class HREmployee extends EntityMP implements Serializable {
this.modify("nativetype",nativetype); this.modify("nativetype",nativetype);
} }
/**
* 设置 [籍贯]
*/
public void setNative(String native){
this.native = native ;
this.modify("native",native);
}
/** /**
* 设置 [户籍地址] * 设置 [户籍地址]
*/ */
...@@ -631,6 +623,14 @@ public class HREmployee extends EntityMP implements Serializable { ...@@ -631,6 +623,14 @@ public class HREmployee extends EntityMP implements Serializable {
this.modify("empstate",empstate); this.modify("empstate",empstate);
} }
/**
* 设置 [籍贯]
*/
public void setNativeplace(String nativeplace){
this.nativeplace = nativeplace ;
this.modify("nativeplace",nativeplace);
}
} }
......
humanresource-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 5014ba0b
...@@ -219,8 +219,6 @@ ...@@ -219,8 +219,6 @@
</column> </column>
<column name="NATIVETYPE" remarks="" type="VARCHAR(60)"> <column name="NATIVETYPE" remarks="" type="VARCHAR(60)">
</column> </column>
<column name="NATIVE" remarks="" type="VARCHAR(100)">
</column>
<column name="NATIVEADDRESS" remarks="" type="VARCHAR(100)"> <column name="NATIVEADDRESS" remarks="" type="VARCHAR(100)">
</column> </column>
<column name="BIRTHADDRESS" remarks="" type="VARCHAR(100)"> <column name="BIRTHADDRESS" remarks="" type="VARCHAR(100)">
...@@ -253,6 +251,8 @@ ...@@ -253,6 +251,8 @@
</column> </column>
<column name="EMPSTATE" remarks="" type="VARCHAR(100)"> <column name="EMPSTATE" remarks="" type="VARCHAR(100)">
</column> </column>
<column name="NATIVEPLACE" remarks="" type="VARCHAR(100)">
</column>
</createTable> </createTable>
</changeSet> </changeSet>
......
humanresource-core/src/main/resources/mapper/humanresource/hremployee/HREmployeeMapper.xml
浏览文件 @ 5014ba0b
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性--> <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="HREmployeeResultMap" databaseId="mysql"> <select id="selectById" resultMap="HREmployeeResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT (TIMESTAMPDIFF(YEAR, t1.`BIRTHDAY`, CURDATE())) AS `AGE`, t1.`BIRTHADDRESS`, t1.`BIRTHDAY`, t1.`BLOODTYPE`, t1.`CERTIFICATES`, t1.`CERTNUM`, t1.`CERTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMAIL`, t1.`EMPLOYEECODE`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`EMPSTATE`, t1.`ENTRYTYPE`, t1.`FIRSTDEGREE`, t1.`HEALTH`, t1.`HIGHESTDEGREE`, t1.`HOBBY`, t21.`JOBSTATE`, t1.`MARRIAGE`, t1.`MOBILE`, t1.`NATION`, t1.`NATIVE`, t1.`NATIVEADDRESS`, t1.`NATIVETYPE`, t1.`ORGANIZATIONID`, t11.`ORGANIZATIONNAME`, t1.`PHOTO`, t1.`POLITICAL`, t1.`POLITICALTIME`, t1.`POSTALADDRESS`, t1.`SEX`, t1.`STARTORGTIME`, t1.`STARTWORKTIME`, t1.`TECHNICALTITLE`, t1.`TELEPHONE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1 LEFT JOIN ORGANIZATION t11 ON t1.ORGANIZATIONID = t11.ORGANIZATIONID LEFT JOIN T_HREMPSTATE t21 ON t1.EMPSTATE = t21.HREMPSTATEID ) t1 where employeeid=#{id}]]> <![CDATA[select t1.* from (SELECT (TIMESTAMPDIFF(YEAR, t1.`BIRTHDAY`, CURDATE())) AS `AGE`, t1.`BIRTHADDRESS`, t1.`BIRTHDAY`, t1.`BLOODTYPE`, t1.`CERTIFICATES`, t1.`CERTNUM`, t1.`CERTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMAIL`, t1.`EMPLOYEECODE`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`EMPSTATE`, t1.`ENTRYTYPE`, t1.`FIRSTDEGREE`, t1.`HEALTH`, t1.`HIGHESTDEGREE`, t1.`HOBBY`, t21.`JOBSTATE`, t1.`MARRIAGE`, t1.`MOBILE`, t1.`NATION`, t1.`NATIVEADDRESS`, t1.`NATIVEPLACE`, t1.`NATIVETYPE`, t1.`ORGANIZATIONID`, t11.`ORGANIZATIONNAME`, t1.`PHOTO`, t1.`POLITICAL`, t1.`POLITICALTIME`, t1.`POSTALADDRESS`, t1.`SEX`, t1.`STARTORGTIME`, t1.`STARTWORKTIME`, t1.`TECHNICALTITLE`, t1.`TELEPHONE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1 LEFT JOIN ORGANIZATION t11 ON t1.ORGANIZATIONID = t11.ORGANIZATIONID LEFT JOIN T_HREMPSTATE t21 ON t1.EMPSTATE = t21.HREMPSTATEID ) t1 where employeeid=#{id}]]>
</select> </select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 --> <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
...@@ -47,12 +47,12 @@ ...@@ -47,12 +47,12 @@
<!--数据查询[Default]--> <!--数据查询[Default]-->
<sql id="Default" databaseId="mysql"> <sql id="Default" databaseId="mysql">
<![CDATA[ SELECT (TIMESTAMPDIFF(YEAR, t1.`BIRTHDAY`, CURDATE())) AS `AGE`, t1.`BIRTHADDRESS`, t1.`BIRTHDAY`, t1.`BLOODTYPE`, t1.`CERTIFICATES`, t1.`CERTNUM`, t1.`CERTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMAIL`, t1.`EMPLOYEECODE`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`EMPSTATE`, t1.`ENTRYTYPE`, t1.`FIRSTDEGREE`, t1.`HEALTH`, t1.`HIGHESTDEGREE`, t1.`HOBBY`, t21.`JOBSTATE`, t1.`MARRIAGE`, t1.`MOBILE`, t1.`NATION`, t1.`NATIVE`, t1.`NATIVEADDRESS`, t1.`NATIVETYPE`, t1.`ORGANIZATIONID`, t11.`ORGANIZATIONNAME`, t1.`PHOTO`, t1.`POLITICAL`, t1.`POLITICALTIME`, t1.`POSTALADDRESS`, t1.`SEX`, t1.`STARTORGTIME`, t1.`STARTWORKTIME`, t1.`TECHNICALTITLE`, t1.`TELEPHONE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1 LEFT JOIN ORGANIZATION t11 ON t1.ORGANIZATIONID = t11.ORGANIZATIONID LEFT JOIN T_HREMPSTATE t21 ON t1.EMPSTATE = t21.HREMPSTATEID <![CDATA[ SELECT (TIMESTAMPDIFF(YEAR, t1.`BIRTHDAY`, CURDATE())) AS `AGE`, t1.`BIRTHADDRESS`, t1.`BIRTHDAY`, t1.`BLOODTYPE`, t1.`CERTIFICATES`, t1.`CERTNUM`, t1.`CERTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMAIL`, t1.`EMPLOYEECODE`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`EMPSTATE`, t1.`ENTRYTYPE`, t1.`FIRSTDEGREE`, t1.`HEALTH`, t1.`HIGHESTDEGREE`, t1.`HOBBY`, t21.`JOBSTATE`, t1.`MARRIAGE`, t1.`MOBILE`, t1.`NATION`, t1.`NATIVEADDRESS`, t1.`NATIVEPLACE`, t1.`NATIVETYPE`, t1.`ORGANIZATIONID`, t11.`ORGANIZATIONNAME`, t1.`PHOTO`, t1.`POLITICAL`, t1.`POLITICALTIME`, t1.`POSTALADDRESS`, t1.`SEX`, t1.`STARTORGTIME`, t1.`STARTWORKTIME`, t1.`TECHNICALTITLE`, t1.`TELEPHONE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1 LEFT JOIN ORGANIZATION t11 ON t1.ORGANIZATIONID = t11.ORGANIZATIONID LEFT JOIN T_HREMPSTATE t21 ON t1.EMPSTATE = t21.HREMPSTATEID
]]> ]]>
</sql> </sql>
<!--数据查询[View]--> <!--数据查询[View]-->
<sql id="View" databaseId="mysql"> <sql id="View" databaseId="mysql">
<![CDATA[ SELECT (TIMESTAMPDIFF(YEAR, t1.`BIRTHDAY`, CURDATE())) AS `AGE`, t1.`BIRTHADDRESS`, t1.`BIRTHDAY`, t1.`BLOODTYPE`, t1.`CERTIFICATES`, t1.`CERTNUM`, t1.`CERTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMAIL`, t1.`EMPLOYEECODE`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`EMPSTATE`, t1.`ENTRYTYPE`, t1.`FIRSTDEGREE`, t1.`HEALTH`, t1.`HIGHESTDEGREE`, t1.`HOBBY`, t21.`JOBSTATE`, t1.`MARRIAGE`, t1.`MOBILE`, t1.`NATION`, t1.`NATIVE`, t1.`NATIVEADDRESS`, t1.`NATIVETYPE`, t1.`ORGANIZATIONID`, t11.`ORGANIZATIONNAME`, t1.`PHOTO`, t1.`POLITICAL`, t1.`POLITICALTIME`, t1.`POSTALADDRESS`, t1.`SEX`, t1.`STARTORGTIME`, t1.`STARTWORKTIME`, t1.`TECHNICALTITLE`, t1.`TELEPHONE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1 LEFT JOIN ORGANIZATION t11 ON t1.ORGANIZATIONID = t11.ORGANIZATIONID LEFT JOIN T_HREMPSTATE t21 ON t1.EMPSTATE = t21.HREMPSTATEID <![CDATA[ SELECT (TIMESTAMPDIFF(YEAR, t1.`BIRTHDAY`, CURDATE())) AS `AGE`, t1.`BIRTHADDRESS`, t1.`BIRTHDAY`, t1.`BLOODTYPE`, t1.`CERTIFICATES`, t1.`CERTNUM`, t1.`CERTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMAIL`, t1.`EMPLOYEECODE`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`EMPSTATE`, t1.`ENTRYTYPE`, t1.`FIRSTDEGREE`, t1.`HEALTH`, t1.`HIGHESTDEGREE`, t1.`HOBBY`, t21.`JOBSTATE`, t1.`MARRIAGE`, t1.`MOBILE`, t1.`NATION`, t1.`NATIVEADDRESS`, t1.`NATIVEPLACE`, t1.`NATIVETYPE`, t1.`ORGANIZATIONID`, t11.`ORGANIZATIONNAME`, t1.`PHOTO`, t1.`POLITICAL`, t1.`POLITICALTIME`, t1.`POSTALADDRESS`, t1.`SEX`, t1.`STARTORGTIME`, t1.`STARTWORKTIME`, t1.`TECHNICALTITLE`, t1.`TELEPHONE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1 LEFT JOIN ORGANIZATION t11 ON t1.ORGANIZATIONID = t11.ORGANIZATIONID LEFT JOIN T_HREMPSTATE t21 ON t1.EMPSTATE = t21.HREMPSTATEID
]]> ]]>
</sql> </sql>
</mapper> </mapper>
......
humanresource-provider/humanresource-provider-hrapi/src/main/java/cn/ibizlab/humanresource/hrapi/dto/HREmployeeDTO.java
浏览文件 @ 5014ba0b
...@@ -195,14 +195,6 @@ public class HREmployeeDTO extends DTOBase implements Serializable { ...@@ -195,14 +195,6 @@ public class HREmployeeDTO extends DTOBase implements Serializable {
@JsonProperty("nativetype") @JsonProperty("nativetype")
private String nativetype; private String nativetype;
/**
* 属性 [NATIVE]
*
*/
@JSONField(name = "native")
@JsonProperty("native")
private String native;
/** /**
* 属性 [NATIVEADDRESS] * 属性 [NATIVEADDRESS]
* *
...@@ -342,6 +334,14 @@ public class HREmployeeDTO extends DTOBase implements Serializable { ...@@ -342,6 +334,14 @@ public class HREmployeeDTO extends DTOBase implements Serializable {
@JsonProperty("jobstate") @JsonProperty("jobstate")
private String jobstate; private String jobstate;
/**
* 属性 [NATIVEPLACE]
*
*/
@JSONField(name = "nativeplace")
@JsonProperty("nativeplace")
private String nativeplace;
/** /**
* 设置 [EMPLOYEENAME] * 设置 [EMPLOYEENAME]
...@@ -455,14 +455,6 @@ public class HREmployeeDTO extends DTOBase implements Serializable { ...@@ -455,14 +455,6 @@ public class HREmployeeDTO extends DTOBase implements Serializable {
this.modify("nativetype",nativetype); this.modify("nativetype",nativetype);
} }
/**
* 设置 [NATIVE]
*/
public void setNative(String native){
this.native = native ;
this.modify("native",native);
}
/** /**
* 设置 [NATIVEADDRESS] * 设置 [NATIVEADDRESS]
*/ */
...@@ -591,6 +583,14 @@ public class HREmployeeDTO extends DTOBase implements Serializable { ...@@ -591,6 +583,14 @@ public class HREmployeeDTO extends DTOBase implements Serializable {
this.modify("empstate",empstate); this.modify("empstate",empstate);
} }
/**
* 设置 [NATIVEPLACE]
*/
public void setNativeplace(String nativeplace){
this.nativeplace = nativeplace ;
this.modify("nativeplace",nativeplace);
}
} }
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或