Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
iBiz人力资源
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
iBiz企业套件
iBiz人力资源
提交
3d984393
提交
3d984393
编写于
8月 04, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
jackwang 部署微服务接口
上级
2ab1faa9
变更
12
隐藏空白字符变更
内嵌
并排
正在显示
12 个修改的文件
包含
255 行增加
和
33 行删除
+255
-33
config.xml
config.xml
+5
-5
Dockerfile
...urce-app/humanresource-app-pim/src/main/docker/Dockerfile
+1
-1
humanresource-app-pim.yaml
...source-app-pim/src/main/docker/humanresource-app-pim.yaml
+1
-17
HRLegal.java
...va/cn/ibizlab/humanresource/core/base/domain/HRLegal.java
+87
-0
HROrganization.java
...bizlab/humanresource/core/base/domain/HROrganization.java
+15
-0
h2_table.xml
humanresource-core/src/main/resources/liquibase/h2_table.xml
+10
-2
HRLegalMapper.xml
.../src/main/resources/mapper/base/hrlegal/HRLegalMapper.xml
+3
-3
HROrganizationMapper.xml
...urces/mapper/base/hrorganization/HROrganizationMapper.xml
+3
-3
Dockerfile
...r/humanresource-provider-hrapi/src/main/docker/Dockerfile
+1
-1
humanresource-provider-hrapi.yaml
...r-hrapi/src/main/docker/humanresource-provider-hrapi.yaml
+17
-1
HRLegalDTO.java
...n/java/cn/ibizlab/humanresource/hrapi/dto/HRLegalDTO.java
+96
-0
HROrganizationDTO.java
...cn/ibizlab/humanresource/hrapi/dto/HROrganizationDTO.java
+16
-0
未找到文件。
config.xml
浏览文件 @
3d984393
...
@@ -37,11 +37,11 @@
...
@@ -37,11 +37,11 @@
git clone -b master $para2 ibizhumanresources/
git clone -b master $para2 ibizhumanresources/
export NODE_OPTIONS=--max-old-space-size=4096
export NODE_OPTIONS=--max-old-space-size=4096
cd ibizhumanresources/
cd ibizhumanresources/
mvn clean package -P
pim
mvn clean package -P
hrapi
cd humanresource-
app/humanresource-app-pim
cd humanresource-
provider/humanresource-provider-hrapi
mvn -P
pim
docker:build
mvn -P
hrapi
docker:build
mvn -P
pim
docker:push
mvn -P
hrapi
docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-
app-pim.yaml iBizEE --with-registry-auth
docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-
provider-hrapi.yaml iBizEE --with-registry-auth
</command>
</command>
</hudson.tasks.Shell>
</hudson.tasks.Shell>
</builders>
</builders>
...
...
humanresource-app/humanresource-app-pim/src/main/docker/Dockerfile
浏览文件 @
3d984393
...
@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
...
@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-app-pim.jar
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-app-pim.jar
EXPOSE
10327
EXPOSE
8080
ADD
humanresource-app-pim.jar /humanresource-app-pim.jar
ADD
humanresource-app-pim.jar /humanresource-app-pim.jar
humanresource-app/humanresource-app-pim/src/main/docker/humanresource-app-pim.yaml
浏览文件 @
3d984393
...
@@ -3,25 +3,9 @@ services:
...
@@ -3,25 +3,9 @@ services:
humanresource-app-pim
:
humanresource-app-pim
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-app-pim:latest
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-app-pim:latest
ports
:
ports
:
-
"
10327:10327
"
-
"
8080:8080
"
networks
:
networks
:
-
agent_network
-
agent_network
environment
:
-
SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-
SERVER_PORT=10327
-
SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-
SPRING_REDIS_HOST=172.16.240.110
-
SPRING_REDIS_PORT=6379
-
SPRING_REDIS_DATABASE=0
-
SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
-
SPRING_DATASOURCE_PASSWORD=b1@@@772
-
SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-
SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-
SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
-
CAS=https://passport.ibizlab.cn
-
NACOS=172.16.240.110:8848
-
SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-
SEATA_ENABLED=true
deploy
:
deploy
:
resources
:
resources
:
limits
:
limits
:
...
...
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/base/domain/HRLegal.java
浏览文件 @
3d984393
...
@@ -96,6 +96,69 @@ public class HRLegal extends EntityMP implements Serializable {
...
@@ -96,6 +96,69 @@ public class HRLegal extends EntityMP implements Serializable {
@JSONField
(
name
=
"organizationtype"
)
@JSONField
(
name
=
"organizationtype"
)
@JsonProperty
(
"organizationtype"
)
@JsonProperty
(
"organizationtype"
)
private
String
organizationtype
;
private
String
organizationtype
;
/**
* 组织层级
*/
@TableField
(
exist
=
false
)
@JSONField
(
name
=
"orglevel"
)
@JsonProperty
(
"orglevel"
)
private
BigInteger
orglevel
;
/**
* 运营单位类型
*/
@TableField
(
exist
=
false
)
@JSONField
(
name
=
"operationunittype"
)
@JsonProperty
(
"operationunittype"
)
private
String
operationunittype
;
/**
* 排序号
*/
@TableField
(
exist
=
false
)
@JSONField
(
name
=
"showorder"
)
@JsonProperty
(
"showorder"
)
private
BigInteger
showorder
;
/**
* 组织编码
*/
@TableField
(
exist
=
false
)
@JSONField
(
name
=
"orgcode"
)
@JsonProperty
(
"orgcode"
)
private
String
orgcode
;
/**
* 备注
*/
@TableField
(
exist
=
false
)
@JSONField
(
name
=
"memo"
)
@JsonProperty
(
"memo"
)
private
String
memo
;
/**
* 组织简称
*/
@TableField
(
exist
=
false
)
@JSONField
(
name
=
"shortname"
)
@JsonProperty
(
"shortname"
)
private
String
shortname
;
/**
* 统一社会信用代码
*/
@TableField
(
value
=
"uscc"
)
@JSONField
(
name
=
"uscc"
)
@JsonProperty
(
"uscc"
)
private
String
uscc
;
/**
* 开户行
*/
@TableField
(
value
=
"bank"
)
@JSONField
(
name
=
"bank"
)
@JsonProperty
(
"bank"
)
private
String
bank
;
/**
* 银行账号
*/
@TableField
(
value
=
"bankaccount"
)
@JSONField
(
name
=
"bankaccount"
)
@JsonProperty
(
"bankaccount"
)
private
String
bankaccount
;
...
@@ -107,6 +170,30 @@ public class HRLegal extends EntityMP implements Serializable {
...
@@ -107,6 +170,30 @@ public class HRLegal extends EntityMP implements Serializable {
this
.
modify
(
"legalname"
,
legalname
);
this
.
modify
(
"legalname"
,
legalname
);
}
}
/**
* 设置 [统一社会信用代码]
*/
public
void
setUscc
(
String
uscc
){
this
.
uscc
=
uscc
;
this
.
modify
(
"uscc"
,
uscc
);
}
/**
* 设置 [开户行]
*/
public
void
setBank
(
String
bank
){
this
.
bank
=
bank
;
this
.
modify
(
"bank"
,
bank
);
}
/**
* 设置 [银行账号]
*/
public
void
setBankaccount
(
String
bankaccount
){
this
.
bankaccount
=
bankaccount
;
this
.
modify
(
"bankaccount"
,
bankaccount
);
}
}
}
...
...
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/base/domain/HROrganization.java
浏览文件 @
3d984393
...
@@ -131,6 +131,13 @@ public class HROrganization extends EntityMP implements Serializable {
...
@@ -131,6 +131,13 @@ public class HROrganization extends EntityMP implements Serializable {
@JSONField
(
name
=
"operationunittype"
)
@JSONField
(
name
=
"operationunittype"
)
@JsonProperty
(
"operationunittype"
)
@JsonProperty
(
"operationunittype"
)
private
String
operationunittype
;
private
String
operationunittype
;
/**
* 备注
*/
@TableField
(
value
=
"memo"
)
@JSONField
(
name
=
"memo"
)
@JsonProperty
(
"memo"
)
private
String
memo
;
...
@@ -190,6 +197,14 @@ public class HROrganization extends EntityMP implements Serializable {
...
@@ -190,6 +197,14 @@ public class HROrganization extends EntityMP implements Serializable {
this
.
modify
(
"operationunittype"
,
operationunittype
);
this
.
modify
(
"operationunittype"
,
operationunittype
);
}
}
/**
* 设置 [备注]
*/
public
void
setMemo
(
String
memo
){
this
.
memo
=
memo
;
this
.
modify
(
"memo"
,
memo
);
}
}
}
...
...
humanresource-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
3d984393
...
@@ -66,7 +66,7 @@
...
@@ -66,7 +66,7 @@
<!--输出实体[HRLEGAL]数据结构 -->
<!--输出实体[HRLEGAL]数据结构 -->
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"tab-hrlegal-
6
-4"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"tab-hrlegal-
14
-4"
>
<createTable
tableName=
"LEGAL"
>
<createTable
tableName=
"LEGAL"
>
<column
name=
"LEGALNAME"
remarks=
""
type=
"VARCHAR(200)"
>
<column
name=
"LEGALNAME"
remarks=
""
type=
"VARCHAR(200)"
>
</column>
</column>
...
@@ -81,6 +81,12 @@
...
@@ -81,6 +81,12 @@
</column>
</column>
<column
name=
"UPDATEDATE"
remarks=
""
type=
"DATETIME"
>
<column
name=
"UPDATEDATE"
remarks=
""
type=
"DATETIME"
>
</column>
</column>
<column
name=
"USCC"
remarks=
""
type=
"VARCHAR(100)"
>
</column>
<column
name=
"BANK"
remarks=
""
type=
"VARCHAR(100)"
>
</column>
<column
name=
"BANKACCOUNT"
remarks=
""
type=
"VARCHAR(100)"
>
</column>
</createTable>
</createTable>
</changeSet>
</changeSet>
...
@@ -194,7 +200,7 @@
...
@@ -194,7 +200,7 @@
<!--输出实体[HRORGANIZATION]数据结构 -->
<!--输出实体[HRORGANIZATION]数据结构 -->
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"tab-hrorganization-
19
-10"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"tab-hrorganization-
21
-10"
>
<createTable
tableName=
"ORGANIZATION"
>
<createTable
tableName=
"ORGANIZATION"
>
<column
name=
"UPDATEMAN"
remarks=
""
type=
"VARCHAR(60)"
>
<column
name=
"UPDATEMAN"
remarks=
""
type=
"VARCHAR(60)"
>
</column>
</column>
...
@@ -221,6 +227,8 @@
...
@@ -221,6 +227,8 @@
</column>
</column>
<column
name=
"OPERATIONUNITTYPE"
remarks=
""
type=
"VARCHAR(60)"
>
<column
name=
"OPERATIONUNITTYPE"
remarks=
""
type=
"VARCHAR(60)"
>
</column>
</column>
<column
name=
"MEMO"
remarks=
""
type=
"VARCHAR(2000)"
>
</column>
</createTable>
</createTable>
</changeSet>
</changeSet>
...
...
humanresource-core/src/main/resources/mapper/base/hrlegal/HRLegalMapper.xml
浏览文件 @
3d984393
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<select
id=
"selectById"
resultMap=
"HRLegalResultMap"
databaseId=
"mysql"
>
<select
id=
"selectById"
resultMap=
"HRLegalResultMap"
databaseId=
"mysql"
>
<![CDATA[select t1.* from (SELECT t1.`
CREATEDATE`, t1.`CREATEMAN`, t1.`LEGALID`, t1.`LEGALNAME`, t11.`ORGANIZATIONTYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN
` FROM `LEGAL` t1 LEFT JOIN ORGANIZATION t11 ON t1.LEGALID = t11.ORGANIZATIONID ) t1 where legalid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.`
BANK`, t1.`BANKACCOUNT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`LEGALID`, t1.`LEGALNAME`, t11.`MEMO`, t11.`OPERATIONUNITTYPE`, t11.`ORGANIZATIONTYPE`, t11.`ORGCODE`, t11.`ORGLEVEL`, t11.`SHORTNAME`, t11.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USCC
` FROM `LEGAL` t1 LEFT JOIN ORGANIZATION t11 ON t1.LEGALID = t11.ORGANIZATIONID ) t1 where legalid=#{id}]]>
</select>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
...
@@ -27,12 +27,12 @@
...
@@ -27,12 +27,12 @@
<!--数据查询[Default]-->
<!--数据查询[Default]-->
<sql
id=
"Default"
databaseId=
"mysql"
>
<sql
id=
"Default"
databaseId=
"mysql"
>
<![CDATA[ SELECT t1.`
CREATEDATE`, t1.`CREATEMAN`, t1.`LEGALID`, t1.`LEGALNAME`, t11.`ORGANIZATIONTYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN
` FROM `LEGAL` t1 LEFT JOIN ORGANIZATION t11 ON t1.LEGALID = t11.ORGANIZATIONID
<![CDATA[ SELECT t1.`
BANK`, t1.`BANKACCOUNT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`LEGALID`, t1.`LEGALNAME`, t11.`MEMO`, t11.`OPERATIONUNITTYPE`, t11.`ORGANIZATIONTYPE`, t11.`ORGCODE`, t11.`ORGLEVEL`, t11.`SHORTNAME`, t11.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USCC
` FROM `LEGAL` t1 LEFT JOIN ORGANIZATION t11 ON t1.LEGALID = t11.ORGANIZATIONID
]]>
]]>
</sql>
</sql>
<!--数据查询[View]-->
<!--数据查询[View]-->
<sql
id=
"View"
databaseId=
"mysql"
>
<sql
id=
"View"
databaseId=
"mysql"
>
<![CDATA[ SELECT t1.`
CREATEDATE`, t1.`CREATEMAN`, t1.`LEGALID`, t1.`LEGALNAME`, t11.`ORGANIZATIONTYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN
` FROM `LEGAL` t1 LEFT JOIN ORGANIZATION t11 ON t1.LEGALID = t11.ORGANIZATIONID
<![CDATA[ SELECT t1.`
BANK`, t1.`BANKACCOUNT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`LEGALID`, t1.`LEGALNAME`, t11.`MEMO`, t11.`OPERATIONUNITTYPE`, t11.`ORGANIZATIONTYPE`, t11.`ORGCODE`, t11.`ORGLEVEL`, t11.`SHORTNAME`, t11.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USCC
` FROM `LEGAL` t1 LEFT JOIN ORGANIZATION t11 ON t1.LEGALID = t11.ORGANIZATIONID
]]>
]]>
</sql>
</sql>
</mapper>
</mapper>
...
...
humanresource-core/src/main/resources/mapper/base/hrorganization/HROrganizationMapper.xml
浏览文件 @
3d984393
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<select
id=
"selectById"
resultMap=
"HROrganizationResultMap"
databaseId=
"mysql"
>
<select
id=
"selectById"
resultMap=
"HROrganizationResultMap"
databaseId=
"mysql"
>
<![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`OPERATIONUNITTYPE`, t1.`ORGANIZATIONID`, t1.`ORGANIZATIONNAME`, t1.`ORGANIZATIONTYPE`, t1.`ORGCODE`, t1.`ORGLEVEL`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ORGANIZATION` t1 ) t1 where organizationid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`
MEMO`, t1.`
OPERATIONUNITTYPE`, t1.`ORGANIZATIONID`, t1.`ORGANIZATIONNAME`, t1.`ORGANIZATIONTYPE`, t1.`ORGCODE`, t1.`ORGLEVEL`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ORGANIZATION` t1 ) t1 where organizationid=#{id}]]>
</select>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
...
@@ -27,12 +27,12 @@
...
@@ -27,12 +27,12 @@
<!--数据查询[Default]-->
<!--数据查询[Default]-->
<sql
id=
"Default"
databaseId=
"mysql"
>
<sql
id=
"Default"
databaseId=
"mysql"
>
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`OPERATIONUNITTYPE`, t1.`ORGANIZATIONID`, t1.`ORGANIZATIONNAME`, t1.`ORGANIZATIONTYPE`, t1.`ORGCODE`, t1.`ORGLEVEL`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ORGANIZATION` t1
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`
MEMO`, t1.`
OPERATIONUNITTYPE`, t1.`ORGANIZATIONID`, t1.`ORGANIZATIONNAME`, t1.`ORGANIZATIONTYPE`, t1.`ORGCODE`, t1.`ORGLEVEL`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ORGANIZATION` t1
]]>
]]>
</sql>
</sql>
<!--数据查询[View]-->
<!--数据查询[View]-->
<sql
id=
"View"
databaseId=
"mysql"
>
<sql
id=
"View"
databaseId=
"mysql"
>
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`OPERATIONUNITTYPE`, t1.`ORGANIZATIONID`, t1.`ORGANIZATIONNAME`, t1.`ORGANIZATIONTYPE`, t1.`ORGCODE`, t1.`ORGLEVEL`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ORGANIZATION` t1
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`
MEMO`, t1.`
OPERATIONUNITTYPE`, t1.`ORGANIZATIONID`, t1.`ORGANIZATIONNAME`, t1.`ORGANIZATIONTYPE`, t1.`ORGCODE`, t1.`ORGLEVEL`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ORGANIZATION` t1
]]>
]]>
</sql>
</sql>
</mapper>
</mapper>
...
...
humanresource-provider/humanresource-provider-hrapi/src/main/docker/Dockerfile
浏览文件 @
3d984393
...
@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
...
@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-provider-hrapi.jar
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-provider-hrapi.jar
EXPOSE
8081
EXPOSE
10317
ADD
humanresource-provider-hrapi.jar /humanresource-provider-hrapi.jar
ADD
humanresource-provider-hrapi.jar /humanresource-provider-hrapi.jar
humanresource-provider/humanresource-provider-hrapi/src/main/docker/humanresource-provider-hrapi.yaml
浏览文件 @
3d984393
...
@@ -3,9 +3,25 @@ services:
...
@@ -3,9 +3,25 @@ services:
humanresource-provider-hrapi
:
humanresource-provider-hrapi
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-provider-hrapi:latest
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-provider-hrapi:latest
ports
:
ports
:
-
"
8081:8081
"
-
"
10317:10317
"
networks
:
networks
:
-
agent_network
-
agent_network
environment
:
-
SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-
SERVER_PORT=10317
-
SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-
SPRING_REDIS_HOST=172.16.240.110
-
SPRING_REDIS_PORT=6379
-
SPRING_REDIS_DATABASE=0
-
SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
-
SPRING_DATASOURCE_PASSWORD=b1@@@772
-
SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-
SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-
SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
-
CAS=https://passport.ibizlab.cn
-
NACOS=172.16.240.110:8848
-
SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-
SEATA_ENABLED=true
deploy
:
deploy
:
resources
:
resources
:
limits
:
limits
:
...
...
humanresource-provider/humanresource-provider-hrapi/src/main/java/cn/ibizlab/humanresource/hrapi/dto/HRLegalDTO.java
浏览文件 @
3d984393
...
@@ -81,6 +81,78 @@ public class HRLegalDTO extends DTOBase implements Serializable {
...
@@ -81,6 +81,78 @@ public class HRLegalDTO extends DTOBase implements Serializable {
@JsonProperty
(
"organizationtype"
)
@JsonProperty
(
"organizationtype"
)
private
String
organizationtype
;
private
String
organizationtype
;
/**
* 属性 [ORGLEVEL]
*
*/
@JSONField
(
name
=
"orglevel"
)
@JsonProperty
(
"orglevel"
)
private
BigInteger
orglevel
;
/**
* 属性 [OPERATIONUNITTYPE]
*
*/
@JSONField
(
name
=
"operationunittype"
)
@JsonProperty
(
"operationunittype"
)
private
String
operationunittype
;
/**
* 属性 [SHOWORDER]
*
*/
@JSONField
(
name
=
"showorder"
)
@JsonProperty
(
"showorder"
)
private
BigInteger
showorder
;
/**
* 属性 [ORGCODE]
*
*/
@JSONField
(
name
=
"orgcode"
)
@JsonProperty
(
"orgcode"
)
private
String
orgcode
;
/**
* 属性 [MEMO]
*
*/
@JSONField
(
name
=
"memo"
)
@JsonProperty
(
"memo"
)
private
String
memo
;
/**
* 属性 [SHORTNAME]
*
*/
@JSONField
(
name
=
"shortname"
)
@JsonProperty
(
"shortname"
)
private
String
shortname
;
/**
* 属性 [USCC]
*
*/
@JSONField
(
name
=
"uscc"
)
@JsonProperty
(
"uscc"
)
private
String
uscc
;
/**
* 属性 [BANK]
*
*/
@JSONField
(
name
=
"bank"
)
@JsonProperty
(
"bank"
)
private
String
bank
;
/**
* 属性 [BANKACCOUNT]
*
*/
@JSONField
(
name
=
"bankaccount"
)
@JsonProperty
(
"bankaccount"
)
private
String
bankaccount
;
/**
/**
* 设置 [LEGALNAME]
* 设置 [LEGALNAME]
...
@@ -90,6 +162,30 @@ public class HRLegalDTO extends DTOBase implements Serializable {
...
@@ -90,6 +162,30 @@ public class HRLegalDTO extends DTOBase implements Serializable {
this
.
modify
(
"legalname"
,
legalname
);
this
.
modify
(
"legalname"
,
legalname
);
}
}
/**
* 设置 [USCC]
*/
public
void
setUscc
(
String
uscc
){
this
.
uscc
=
uscc
;
this
.
modify
(
"uscc"
,
uscc
);
}
/**
* 设置 [BANK]
*/
public
void
setBank
(
String
bank
){
this
.
bank
=
bank
;
this
.
modify
(
"bank"
,
bank
);
}
/**
* 设置 [BANKACCOUNT]
*/
public
void
setBankaccount
(
String
bankaccount
){
this
.
bankaccount
=
bankaccount
;
this
.
modify
(
"bankaccount"
,
bankaccount
);
}
}
}
humanresource-provider/humanresource-provider-hrapi/src/main/java/cn/ibizlab/humanresource/hrapi/dto/HROrganizationDTO.java
浏览文件 @
3d984393
...
@@ -121,6 +121,14 @@ public class HROrganizationDTO extends DTOBase implements Serializable {
...
@@ -121,6 +121,14 @@ public class HROrganizationDTO extends DTOBase implements Serializable {
@JsonProperty
(
"operationunittype"
)
@JsonProperty
(
"operationunittype"
)
private
String
operationunittype
;
private
String
operationunittype
;
/**
* 属性 [MEMO]
*
*/
@JSONField
(
name
=
"memo"
)
@JsonProperty
(
"memo"
)
private
String
memo
;
/**
/**
* 设置 [ORGANIZATIONNAME]
* 设置 [ORGANIZATIONNAME]
...
@@ -178,6 +186,14 @@ public class HROrganizationDTO extends DTOBase implements Serializable {
...
@@ -178,6 +186,14 @@ public class HROrganizationDTO extends DTOBase implements Serializable {
this
.
modify
(
"operationunittype"
,
operationunittype
);
this
.
modify
(
"operationunittype"
,
operationunittype
);
}
}
/**
* 设置 [MEMO]
*/
public
void
setMemo
(
String
memo
){
this
.
memo
=
memo
;
this
.
modify
(
"memo"
,
memo
);
}
}
}
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录