Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
iBiz人力资源
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
iBiz企业套件
iBiz人力资源
提交
0dec2ae6
提交
0dec2ae6
编写于
8月 11, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Miracle 部署微服务接口
上级
23642e72
变更
9
展开全部
隐藏空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
440 行增加
和
40 行删除
+440
-40
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
h2_table.xml
humanresource-core/src/main/resources/liquibase/h2_table.xml
+14
-14
HREmployeeMapper.xml
...rces/mapper/humanresource/hremployee/HREmployeeMapper.xml
+1
-0
systemResource.json
...ce-core/src/main/resources/permission/systemResource.json
+1
-1
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
HRTransferApplyResource.java
...lab/humanresource/hrapi/rest/HRTransferApplyResource.java
+399
-0
未找到文件。
config.xml
浏览文件 @
0dec2ae6
...
@@ -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
浏览文件 @
0dec2ae6
...
@@ -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
浏览文件 @
0dec2ae6
...
@@ -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/resources/liquibase/h2_table.xml
浏览文件 @
0dec2ae6
...
@@ -86,7 +86,7 @@
...
@@ -86,7 +86,7 @@
<!--输出实体[HRCONTRACT]数据结构 -->
<!--输出实体[HRCONTRACT]数据结构 -->
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"tab-hrcontract-6
1
-4"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"tab-hrcontract-6
7
-4"
>
<createTable
tableName=
"T_HRCONTRACT"
>
<createTable
tableName=
"T_HRCONTRACT"
>
<column
name=
"CREATEMAN"
remarks=
""
type=
"VARCHAR(60)"
>
<column
name=
"CREATEMAN"
remarks=
""
type=
"VARCHAR(60)"
>
</column>
</column>
...
@@ -338,7 +338,7 @@
...
@@ -338,7 +338,7 @@
<!--输出实体[HREMPLOYEE]数据结构 -->
<!--输出实体[HREMPLOYEE]数据结构 -->
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"tab-hremployee-28
0
-12"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"tab-hremployee-28
4
-12"
>
<createTable
tableName=
"EMPLOYEE"
>
<createTable
tableName=
"EMPLOYEE"
>
<column
name=
"EMPLOYEENAME"
remarks=
""
type=
"VARCHAR(200)"
>
<column
name=
"EMPLOYEENAME"
remarks=
""
type=
"VARCHAR(200)"
>
</column>
</column>
...
@@ -808,7 +808,7 @@
...
@@ -808,7 +808,7 @@
<!--输出实体[HRPOST]数据结构 -->
<!--输出实体[HRPOST]数据结构 -->
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"tab-hrpost-10
8
-27"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"tab-hrpost-10
9
-27"
>
<createTable
tableName=
"T_HRPOST"
>
<createTable
tableName=
"T_HRPOST"
>
<column
name=
"HRPOSTID"
remarks=
""
type=
"VARCHAR(100)"
>
<column
name=
"HRPOSTID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_HRPOST_HRPOSTID"
/>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_HRPOST_HRPOSTID"
/>
...
@@ -994,7 +994,7 @@
...
@@ -994,7 +994,7 @@
<!--输出实体[HRTRANSFERAPPLY]数据结构 -->
<!--输出实体[HRTRANSFERAPPLY]数据结构 -->
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"tab-hrtransferapply-
46
-33"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"tab-hrtransferapply-
139
-33"
>
<createTable
tableName=
"T_HRTRANSFERAPPLY"
>
<createTable
tableName=
"T_HRTRANSFERAPPLY"
>
<column
name=
"HRTRANSFERAPPLYID"
remarks=
""
type=
"VARCHAR(100)"
>
<column
name=
"HRTRANSFERAPPLYID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_HRTRANSFERAPPLY_HRTRANSFERA"
/>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_HRTRANSFERAPPLY_HRTRANSFERA"
/>
...
@@ -1087,10 +1087,10 @@
...
@@ -1087,10 +1087,10 @@
<addForeignKeyConstraint
baseColumnNames=
"REGISTERORGANIZATIONID"
baseTableName=
"T_HRCERTIFICATE"
constraintName=
"DER1N_HRCERTIFICATE_HRORGANIZA"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"ORGANIZATIONID"
referencedTableName=
"ORGANIZATION"
validate=
"true"
/>
<addForeignKeyConstraint
baseColumnNames=
"REGISTERORGANIZATIONID"
baseTableName=
"T_HRCERTIFICATE"
constraintName=
"DER1N_HRCERTIFICATE_HRORGANIZA"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"ORGANIZATIONID"
referencedTableName=
"ORGANIZATION"
validate=
"true"
/>
</changeSet>
</changeSet>
<!--输出实体[HRCONTRACT]外键关系 -->
<!--输出实体[HRCONTRACT]外键关系 -->
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-hrcontract-6
1
-38"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-hrcontract-6
7
-38"
>
<addForeignKeyConstraint
baseColumnNames=
"HREMPLOYEEID"
baseTableName=
"T_HRCONTRACT"
constraintName=
"DER1N_HRCONTRACT_HREMPLOYEE_HR"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"EMPLOYEEID"
referencedTableName=
"EMPLOYEE"
validate=
"true"
/>
<addForeignKeyConstraint
baseColumnNames=
"HREMPLOYEEID"
baseTableName=
"T_HRCONTRACT"
constraintName=
"DER1N_HRCONTRACT_HREMPLOYEE_HR"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"EMPLOYEEID"
referencedTableName=
"EMPLOYEE"
validate=
"true"
/>
</changeSet>
</changeSet>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-hrcontract-6
1
-39"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-hrcontract-6
7
-39"
>
<addForeignKeyConstraint
baseColumnNames=
"MGRORGANIZATIONID"
baseTableName=
"T_HRCONTRACT"
constraintName=
"DER1N_HRCONTRACT_HRORGANIZATIO"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"ORGANIZATIONID"
referencedTableName=
"ORGANIZATION"
validate=
"true"
/>
<addForeignKeyConstraint
baseColumnNames=
"MGRORGANIZATIONID"
baseTableName=
"T_HRCONTRACT"
constraintName=
"DER1N_HRCONTRACT_HRORGANIZATIO"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"ORGANIZATIONID"
referencedTableName=
"ORGANIZATION"
validate=
"true"
/>
</changeSet>
</changeSet>
<!--输出实体[HRDISTRIBUTION]外键关系 -->
<!--输出实体[HRDISTRIBUTION]外键关系 -->
...
@@ -1119,13 +1119,13 @@
...
@@ -1119,13 +1119,13 @@
</changeSet>
</changeSet>
<!--输出实体[HREMPSTATE]外键关系 -->
<!--输出实体[HREMPSTATE]外键关系 -->
<!--输出实体[HREMPLOYEE]外键关系 -->
<!--输出实体[HREMPLOYEE]外键关系 -->
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-hremployee-28
0
-47"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-hremployee-28
4
-47"
>
<addForeignKeyConstraint
baseColumnNames=
"ORGANIZATIONID"
baseTableName=
"EMPLOYEE"
constraintName=
"DER1N_EMPLOYEE_ORGANIZATION_OR"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"ORGANIZATIONID"
referencedTableName=
"ORGANIZATION"
validate=
"true"
/>
<addForeignKeyConstraint
baseColumnNames=
"ORGANIZATIONID"
baseTableName=
"EMPLOYEE"
constraintName=
"DER1N_EMPLOYEE_ORGANIZATION_OR"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"ORGANIZATIONID"
referencedTableName=
"ORGANIZATION"
validate=
"true"
/>
</changeSet>
</changeSet>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-hremployee-28
0
-48"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-hremployee-28
4
-48"
>
<addForeignKeyConstraint
baseColumnNames=
"EMPSTATE"
baseTableName=
"EMPLOYEE"
constraintName=
"DER1N_HREMPLOYEE_HREMPSTATE_EM"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"HREMPSTATEID"
referencedTableName=
"T_HREMPSTATE"
validate=
"true"
/>
<addForeignKeyConstraint
baseColumnNames=
"EMPSTATE"
baseTableName=
"EMPLOYEE"
constraintName=
"DER1N_HREMPLOYEE_HREMPSTATE_EM"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"HREMPSTATEID"
referencedTableName=
"T_HREMPSTATE"
validate=
"true"
/>
</changeSet>
</changeSet>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-hremployee-28
0
-49"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-hremployee-28
4
-49"
>
<addForeignKeyConstraint
baseColumnNames=
"HRPOSTID"
baseTableName=
"EMPLOYEE"
constraintName=
"DER1N_HREMPLOYEE_HRPOST_HRPOST"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"HRPOSTID"
referencedTableName=
"T_HRPOST"
validate=
"true"
/>
<addForeignKeyConstraint
baseColumnNames=
"HRPOSTID"
baseTableName=
"EMPLOYEE"
constraintName=
"DER1N_HREMPLOYEE_HRPOST_HRPOST"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"HRPOSTID"
referencedTableName=
"T_HRPOST"
validate=
"true"
/>
</changeSet>
</changeSet>
<!--输出实体[HRFAMILY]外键关系 -->
<!--输出实体[HRFAMILY]外键关系 -->
...
@@ -1173,10 +1173,10 @@
...
@@ -1173,10 +1173,10 @@
<addForeignKeyConstraint
baseColumnNames=
"HREMPLOYEEID"
baseTableName=
"T_HRPATENT"
constraintName=
"DER1N_HRPATENT_HREMPLOYEE_HREM"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"EMPLOYEEID"
referencedTableName=
"EMPLOYEE"
validate=
"true"
/>
<addForeignKeyConstraint
baseColumnNames=
"HREMPLOYEEID"
baseTableName=
"T_HRPATENT"
constraintName=
"DER1N_HRPATENT_HREMPLOYEE_HREM"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"EMPLOYEEID"
referencedTableName=
"EMPLOYEE"
validate=
"true"
/>
</changeSet>
</changeSet>
<!--输出实体[HRPOST]外键关系 -->
<!--输出实体[HRPOST]外键关系 -->
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-hrpost-10
8
-61"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-hrpost-10
9
-61"
>
<addForeignKeyConstraint
baseColumnNames=
"HRDUTYID"
baseTableName=
"T_HRPOST"
constraintName=
"DER1N_HRPOST_HRDUTY_HRDUTYID"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"HRDUTYID"
referencedTableName=
"T_HRDUTY"
validate=
"true"
/>
<addForeignKeyConstraint
baseColumnNames=
"HRDUTYID"
baseTableName=
"T_HRPOST"
constraintName=
"DER1N_HRPOST_HRDUTY_HRDUTYID"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"HRDUTYID"
referencedTableName=
"T_HRDUTY"
validate=
"true"
/>
</changeSet>
</changeSet>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-hrpost-10
8
-62"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-hrpost-10
9
-62"
>
<addForeignKeyConstraint
baseColumnNames=
"HRORGANIZATIONID"
baseTableName=
"T_HRPOST"
constraintName=
"DER1N_HRPOST_HRORGANIZATION_HR"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"ORGANIZATIONID"
referencedTableName=
"ORGANIZATION"
validate=
"true"
/>
<addForeignKeyConstraint
baseColumnNames=
"HRORGANIZATIONID"
baseTableName=
"T_HRPOST"
constraintName=
"DER1N_HRPOST_HRORGANIZATION_HR"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"ORGANIZATIONID"
referencedTableName=
"ORGANIZATION"
validate=
"true"
/>
</changeSet>
</changeSet>
<!--输出实体[HRPOSTREL]外键关系 -->
<!--输出实体[HRPOSTREL]外键关系 -->
...
@@ -1203,13 +1203,13 @@
...
@@ -1203,13 +1203,13 @@
<addForeignKeyConstraint
baseColumnNames=
"HREMPLOYEEID"
baseTableName=
"T_HRTRAININGRECORD"
constraintName=
"DER1N_HRTRAININGRECORD_HREMPLO"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"EMPLOYEEID"
referencedTableName=
"EMPLOYEE"
validate=
"true"
/>
<addForeignKeyConstraint
baseColumnNames=
"HREMPLOYEEID"
baseTableName=
"T_HRTRAININGRECORD"
constraintName=
"DER1N_HRTRAININGRECORD_HREMPLO"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"EMPLOYEEID"
referencedTableName=
"EMPLOYEE"
validate=
"true"
/>
</changeSet>
</changeSet>
<!--输出实体[HRTRANSFERAPPLY]外键关系 -->
<!--输出实体[HRTRANSFERAPPLY]外键关系 -->
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-hrtransferapply-
46
-69"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-hrtransferapply-
139
-69"
>
<addForeignKeyConstraint
baseColumnNames=
"HREMPLOYEEID"
baseTableName=
"T_HRTRANSFERAPPLY"
constraintName=
"DER1N_HRTRANSFERAPPLY_HREMPLOY"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"EMPLOYEEID"
referencedTableName=
"EMPLOYEE"
validate=
"true"
/>
<addForeignKeyConstraint
baseColumnNames=
"HREMPLOYEEID"
baseTableName=
"T_HRTRANSFERAPPLY"
constraintName=
"DER1N_HRTRANSFERAPPLY_HREMPLOY"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"EMPLOYEEID"
referencedTableName=
"EMPLOYEE"
validate=
"true"
/>
</changeSet>
</changeSet>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-hrtransferapply-
46
-70"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-hrtransferapply-
139
-70"
>
<addForeignKeyConstraint
baseColumnNames=
"HRORGANIZATIONID2"
baseTableName=
"T_HRTRANSFERAPPLY"
constraintName=
"DER1N_HRTRANSFERAPPLY_HRORGANI"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"ORGANIZATIONID"
referencedTableName=
"ORGANIZATION"
validate=
"true"
/>
<addForeignKeyConstraint
baseColumnNames=
"HRORGANIZATIONID2"
baseTableName=
"T_HRTRANSFERAPPLY"
constraintName=
"DER1N_HRTRANSFERAPPLY_HRORGANI"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"ORGANIZATIONID"
referencedTableName=
"ORGANIZATION"
validate=
"true"
/>
</changeSet>
</changeSet>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-hrtransferapply-
46
-71"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-hrtransferapply-
139
-71"
>
<addForeignKeyConstraint
baseColumnNames=
"HRPOSTID2"
baseTableName=
"T_HRTRANSFERAPPLY"
constraintName=
"DER1N_HRTRANSFERAPPLY_HRPOST_H"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"HRPOSTID"
referencedTableName=
"T_HRPOST"
validate=
"true"
/>
<addForeignKeyConstraint
baseColumnNames=
"HRPOSTID2"
baseTableName=
"T_HRTRANSFERAPPLY"
constraintName=
"DER1N_HRTRANSFERAPPLY_HRPOST_H"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"HRPOSTID"
referencedTableName=
"T_HRPOST"
validate=
"true"
/>
</changeSet>
</changeSet>
<!--输出实体[HRWORKRECORD]外键关系 -->
<!--输出实体[HRWORKRECORD]外键关系 -->
...
...
humanresource-core/src/main/resources/mapper/humanresource/hremployee/HREmployeeMapper.xml
浏览文件 @
0dec2ae6
...
@@ -121,6 +121,7 @@
...
@@ -121,6 +121,7 @@
<sql
id=
"NoContract"
databaseId=
"mysql"
>
<sql
id=
"NoContract"
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`, t41.`HRDUTYNAME`, t1.`HRPOSTID`, t31.`HRPOSTNAME`, 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.`PROBATIONTIME`, 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 LEFT JOIN T_HRPOST t31 ON t1.HRPOSTID = t31.HRPOSTID LEFT JOIN T_HRDUTY t41 ON t31.HRDUTYID = t41.HRDUTYID
<![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`, t41.`HRDUTYNAME`, t1.`HRPOSTID`, t31.`HRPOSTNAME`, 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.`PROBATIONTIME`, 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 LEFT JOIN T_HRPOST t31 ON t1.HRPOSTID = t31.HRPOSTID LEFT JOIN T_HRDUTY t41 ON t31.HRDUTYID = t41.HRDUTYID
WHERE NOT(EXISTS(SELECT * FROM T_HRCONTRACT t51 WHERE t1.EMPLOYEEID = t51.HREMPLOYEEID ))
WHERE NOT(EXISTS(SELECT * FROM T_HRCONTRACT t51 WHERE t1.EMPLOYEEID = t51.HREMPLOYEEID ))
AND ( t21.`JOBSTATE` = 'ONDUTY' )
]]>
]]>
</sql>
</sql>
<!--数据查询[OnDuty]-->
<!--数据查询[OnDuty]-->
...
...
humanresource-core/src/main/resources/permission/systemResource.json
浏览文件 @
0dec2ae6
...
@@ -265,7 +265,7 @@
...
@@ -265,7 +265,7 @@
{
{
"appid"
:
"PIM"
,
"appid"
:
"PIM"
,
"appname"
:
"基础管理"
,
"appname"
:
"基础管理"
,
"appmenu"
:[{
"menuid"
:
"PIM"
,
"menuname"
:
"PIM"
,
"menuitem"
:[{
"id"
:
"user_menus"
,
"name"
:
"用户菜单"
,
"items"
:[{
"id"
:
"menuitem3"
,
"name"
:
"设置"
}]},{
"id"
:
"top_menus"
,
"name"
:
"顶部菜单"
,
"items"
:[{
"id"
:
"menuitem1"
,
"name"
:
"-"
}]},{
"id"
:
"left_exp"
,
"name"
:
"左侧菜单"
,
"items"
:[{
"id"
:
"menuitem5"
,
"name"
:
"人员"
,
"items"
:[{
"id"
:
"menuitem15"
,
"name"
:
"员工"
},{
"id"
:
"menuitem8"
,
"name"
:
"合同"
}]},{
"id"
:
"menuitem2"
,
"name"
:
"组织"
,
"items"
:[{
"id"
:
"menuitem4"
,
"name"
:
"法人"
},{
"id"
:
"menuitem6"
,
"name"
:
"运营单位"
},{
"id"
:
"menuitem7"
,
"name"
:
"组织层次结构"
},{
"id"
:
"menuitem9"
,
"name"
:
"所有组织"
}]},{
"id"
:
"menuitem10"
,
"name"
:
"职位"
,
"items"
:[{
"id"
:
"menuitem11"
,
"name"
:
"职位"
},{
"id"
:
"menuitem12"
,
"name"
:
"职务"
}]}]},{
"id"
:
"bottom_exp"
,
"name"
:
"底部内容"
},{
"id"
:
"footer_left"
,
"name"
:
"底部左侧"
},{
"id"
:
"footer_center"
,
"name"
:
"底部中间"
},{
"id"
:
"footer_right"
,
"name"
:
"底部右侧"
}]
}]
"appmenu"
:[{
"menuid"
:
"PIM"
,
"menuname"
:
"PIM"
,
"menuitem"
:[{
"id"
:
"user_menus"
,
"name"
:
"用户菜单"
,
"items"
:[{
"id"
:
"menuitem3"
,
"name"
:
"设置"
}]},{
"id"
:
"top_menus"
,
"name"
:
"顶部菜单"
,
"items"
:[{
"id"
:
"menuitem1"
,
"name"
:
"-"
}]},{
"id"
:
"left_exp"
,
"name"
:
"左侧菜单"
,
"items"
:[{
"id"
:
"menuitem5"
,
"name"
:
"人员"
,
"items"
:[{
"id"
:
"menuitem15"
,
"name"
:
"员工"
},{
"id"
:
"menuitem8"
,
"name"
:
"合同"
}]},{
"id"
:
"menuitem2"
,
"name"
:
"组织"
,
"items"
:[{
"id"
:
"menuitem4"
,
"name"
:
"法人"
},{
"id"
:
"menuitem6"
,
"name"
:
"运营单位"
},{
"id"
:
"menuitem7"
,
"name"
:
"组织层次结构"
},{
"id"
:
"menuitem9"
,
"name"
:
"所有组织"
}]},{
"id"
:
"menuitem10"
,
"name"
:
"职位"
,
"items"
:[{
"id"
:
"menuitem11"
,
"name"
:
"职位"
},{
"id"
:
"menuitem12"
,
"name"
:
"职务"
}]}
,{
"id"
:
"menuitem13"
,
"name"
:
"调动"
,
"items"
:[{
"id"
:
"menuitem14"
,
"name"
:
"调动申请"
},{
"id"
:
"menuitem16"
,
"name"
:
"调动管理"
}]}
]},{
"id"
:
"bottom_exp"
,
"name"
:
"底部内容"
},{
"id"
:
"footer_left"
,
"name"
:
"底部左侧"
},{
"id"
:
"footer_center"
,
"name"
:
"底部中间"
},{
"id"
:
"footer_right"
,
"name"
:
"底部右侧"
}]
}]
}
}
]
]
}
}
humanresource-provider/humanresource-provider-hrapi/src/main/docker/Dockerfile
浏览文件 @
0dec2ae6
...
@@ -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
浏览文件 @
0dec2ae6
...
@@ -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/rest/HRTransferApplyResource.java
浏览文件 @
0dec2ae6
此差异已折叠。
点击以展开。
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录