Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
iBizEHR
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
1
议题
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
iBizEHR解决方案
iBizEHR
提交
f20a8266
提交
f20a8266
编写于
5月 18, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibizdev提交
上级
f089fef5
变更
17
显示空白字符变更
内嵌
并排
正在显示
17 个修改的文件
包含
19778 行增加
和
36 行删除
+19778
-36
config.xml
config.xml
+5
-0
PCMDETAIL.java
...c/main/java/cn/ibizlab/ehr/core/pim/domain/PCMDETAIL.java
+4
-4
PIMEDUCATION.java
...ain/java/cn/ibizlab/ehr/core/pim/domain/PIMEDUCATION.java
+4
-4
PIMPERSON.java
...c/main/java/cn/ibizlab/ehr/core/pim/domain/PIMPERSON.java
+2
-2
PCMDETAILSearchContext.java
...n/ibizlab/ehr/core/pim/filter/PCMDETAILSearchContext.java
+2
-2
h2_table.xml
ehr-core/src/main/resources/liquibase/h2_table.xml
+17296
-7
view.xml
ehr-core/src/main/resources/liquibase/view.xml
+2385
-7
Dockerfile
...er/ehr-provider-parttimeperson/src/main/docker/Dockerfile
+1
-1
ehr-provider-parttimeperson.yaml
...meperson/src/main/docker/ehr-provider-parttimeperson.yaml
+15
-1
Dockerfile
...rovider/ehr-provider-saasadmin/src/main/docker/Dockerfile
+1
-1
ehr-provider-saasadmin.yaml
...der-saasadmin/src/main/docker/ehr-provider-saasadmin.yaml
+15
-1
Dockerfile
...vider/ehr-provider-specialrole/src/main/docker/Dockerfile
+1
-1
ehr-provider-specialrole.yaml
...specialrole/src/main/docker/ehr-provider-specialrole.yaml
+15
-1
Dockerfile
ehr-provider/ehr-provider-webapi/src/main/docker/Dockerfile
+1
-1
ehr-provider-webapi.yaml
...-provider-webapi/src/main/docker/ehr-provider-webapi.yaml
+15
-1
Dockerfile
...ovider/ehr-provider-wfcallback/src/main/docker/Dockerfile
+1
-1
ehr-provider-wfcallback.yaml
...r-wfcallback/src/main/docker/ehr-provider-wfcallback.yaml
+15
-1
未找到文件。
config.xml
浏览文件 @
f20a8266
...
...
@@ -38,6 +38,11 @@
git clone -b master $para2 ehr/
export NODE_OPTIONS=--max-old-space-size=4096
cd ehr/
mvn clean package -Pwebapi
cd ehr-provider/ehr-provider-webapi
mvn -Pwebapi docker:build
mvn -Pwebapi docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ehr-provider-webapi.yaml iBizEE --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
...
...
ehr-core/src/main/java/cn/ibizlab/ehr/core/pim/domain/PCMDETAIL.java
浏览文件 @
f20a8266
...
...
@@ -309,7 +309,7 @@ public class PCMDETAIL extends EntityMP implements Serializable {
@JsonProperty
(
"zgxllx"
)
private
String
zgxllx
;
/**
*
中建
系统工作时间
*
建筑
系统工作时间
*/
@TableField
(
value
=
"tozjdate"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
locale
=
"zh"
,
timezone
=
"GMT+8"
)
...
...
@@ -410,7 +410,7 @@ public class PCMDETAIL extends EntityMP implements Serializable {
@JsonProperty
(
"pimmajorsetypename"
)
private
String
pimmajorsetypename
;
/**
*
中建
系统工作年限
*
建筑
系统工作年限
*/
@TableField
(
value
=
"zjxtgznx"
)
@JSONField
(
name
=
"zjxtgznx"
)
...
...
@@ -817,7 +817,7 @@ public class PCMDETAIL extends EntityMP implements Serializable {
this
.
modify
(
"zgxllx"
,
zgxllx
);
}
/**
* 设置 [
中建
系统工作时间]
* 设置 [
建筑
系统工作时间]
*/
public
void
setTozjdate
(
Timestamp
tozjdate
){
this
.
tozjdate
=
tozjdate
;
...
...
@@ -915,7 +915,7 @@ public class PCMDETAIL extends EntityMP implements Serializable {
this
.
modify
(
"pimmajorsetypename"
,
pimmajorsetypename
);
}
/**
* 设置 [
中建
系统工作年限]
* 设置 [
建筑
系统工作年限]
*/
public
void
setZjxtgznx
(
Double
zjxtgznx
){
this
.
zjxtgznx
=
zjxtgznx
;
...
...
ehr-core/src/main/java/cn/ibizlab/ehr/core/pim/domain/PIMEDUCATION.java
浏览文件 @
f20a8266
...
...
@@ -184,7 +184,7 @@ public class PIMEDUCATION extends EntityMP implements Serializable {
@JsonProperty
(
"xxxz"
)
private
String
xxxz
;
/**
*
中建
系统工作时间
*
建筑
系统工作时间
*/
@TableField
(
value
=
"tozjdate"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
locale
=
"zh"
,
timezone
=
"GMT+8"
)
...
...
@@ -319,7 +319,7 @@ public class PIMEDUCATION extends EntityMP implements Serializable {
@JsonProperty
(
"dbdwsj"
)
private
Timestamp
dbdwsj
;
/**
*
中建
系统工作年限
*
建筑
系统工作年限
*/
@TableField
(
value
=
"zjxtgznx"
)
@JSONField
(
name
=
"zjxtgznx"
)
...
...
@@ -484,7 +484,7 @@ public class PIMEDUCATION extends EntityMP implements Serializable {
this
.
modify
(
"xxxz"
,
xxxz
);
}
/**
* 设置 [
中建
系统工作时间]
* 设置 [
建筑
系统工作时间]
*/
public
void
setTozjdate
(
Timestamp
tozjdate
){
this
.
tozjdate
=
tozjdate
;
...
...
@@ -582,7 +582,7 @@ public class PIMEDUCATION extends EntityMP implements Serializable {
this
.
modify
(
"dbdwsj"
,
dbdwsj
);
}
/**
* 设置 [
中建
系统工作年限]
* 设置 [
建筑
系统工作年限]
*/
public
void
setZjxtgznx
(
Double
zjxtgznx
){
this
.
zjxtgznx
=
zjxtgznx
;
...
...
ehr-core/src/main/java/cn/ibizlab/ehr/core/pim/domain/PIMPERSON.java
浏览文件 @
f20a8266
...
...
@@ -861,7 +861,7 @@ public class PIMPERSON extends EntityMP implements Serializable {
@JsonProperty
(
"orgsectorid"
)
private
String
orgsectorid
;
/**
* 到
中建
系统时间
* 到
建筑
系统时间
*/
@TableField
(
value
=
"tozjdate"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
locale
=
"zh"
,
timezone
=
"GMT+8"
)
...
...
@@ -1918,7 +1918,7 @@ public class PIMPERSON extends EntityMP implements Serializable {
this
.
modify
(
"gwksrq"
,
gwksrq
);
}
/**
* 设置 [到
中建
系统时间]
* 设置 [到
建筑
系统时间]
*/
public
void
setTozjdate
(
Timestamp
tozjdate
){
this
.
tozjdate
=
tozjdate
;
...
...
ehr-core/src/main/java/cn/ibizlab/ehr/core/pim/filter/PCMDETAILSearchContext.java
浏览文件 @
f20a8266
...
...
@@ -267,7 +267,7 @@ public class PCMDETAILSearchContext extends QueryWrapperContext<PCMDETAIL> {
}
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
@JSONField
(
format
=
"yyyy-MM-dd"
)
private
Timestamp
n_tozjdate_like
;
//[
中建
系统工作时间]
private
Timestamp
n_tozjdate_like
;
//[
建筑
系统工作时间]
public
void
setN_tozjdate_like
(
Timestamp
n_tozjdate_like
)
{
this
.
n_tozjdate_like
=
n_tozjdate_like
;
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_tozjdate_like
)){
...
...
@@ -369,7 +369,7 @@ public class PCMDETAILSearchContext extends QueryWrapperContext<PCMDETAIL> {
this
.
getSelectCond
().
like
(
"pimmajorsetypename"
,
n_pimmajorsetypename_like
);
}
}
private
Double
n_zjxtgznx_like
;
//[
中建
系统工作年限]
private
Double
n_zjxtgznx_like
;
//[
建筑
系统工作年限]
public
void
setN_zjxtgznx_like
(
Double
n_zjxtgznx_like
)
{
this
.
n_zjxtgznx_like
=
n_zjxtgznx_like
;
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_zjxtgznx_like
)){
...
...
ehr-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
f20a8266
因为 它太大了无法显示 源差异 。您可以改为
查看blob
。
ehr-core/src/main/resources/liquibase/view.xml
浏览文件 @
f20a8266
因为 它太大了无法显示 源差异 。您可以改为
查看blob
。
ehr-provider/ehr-provider-parttimeperson/src/main/docker/Dockerfile
浏览文件 @
f20a8266
...
...
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-provider-parttimeperson.jar
EXPOSE
8081
EXPOSE
5080
ADD
ehr-provider-parttimeperson.jar /ehr-provider-parttimeperson.jar
ehr-provider/ehr-provider-parttimeperson/src/main/docker/ehr-provider-parttimeperson.yaml
浏览文件 @
f20a8266
...
...
@@ -3,9 +3,23 @@ services:
ehr-provider-parttimeperson
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-parttimeperson:latest
ports
:
-
"
8081:8081
"
-
"
5080:5080
"
networks
:
-
agent_network
environment
:
-
SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-
SERVER_PORT=5080
-
SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-
SPRING_REDIS_HOST=172.16.100.243
-
SPRING_REDIS_PORT=6379
-
SPRING_REDIS_DATABASE=0
-
SPRING_DATASOURCE_USERNAME=BPMEHR
-
SPRING_DATASOURCE_PASSWORD=sys
-
SPRING_DATASOURCE_URL=jdbc:oracle:thin:@172.16.170.71:1521:localorcl
-
SPRING_DATASOURCE_DRIVER-CLASS-NAME=oracle.jdbc.driver.OracleDriver
-
SPRING_DATASOURCE_DEFAULTSCHEMA=BPMEHR
-
CAS=https://passport.ibizlab.cn
-
NACOS=172.16.240.110:8848
deploy
:
mode
:
replicated
replicas
:
1
...
...
ehr-provider/ehr-provider-saasadmin/src/main/docker/Dockerfile
浏览文件 @
f20a8266
...
...
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-provider-saasadmin.jar
EXPOSE
8081
EXPOSE
5080
ADD
ehr-provider-saasadmin.jar /ehr-provider-saasadmin.jar
ehr-provider/ehr-provider-saasadmin/src/main/docker/ehr-provider-saasadmin.yaml
浏览文件 @
f20a8266
...
...
@@ -3,9 +3,23 @@ services:
ehr-provider-saasadmin
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-saasadmin:latest
ports
:
-
"
8081:8081
"
-
"
5080:5080
"
networks
:
-
agent_network
environment
:
-
SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-
SERVER_PORT=5080
-
SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-
SPRING_REDIS_HOST=172.16.100.243
-
SPRING_REDIS_PORT=6379
-
SPRING_REDIS_DATABASE=0
-
SPRING_DATASOURCE_USERNAME=BPMEHR
-
SPRING_DATASOURCE_PASSWORD=sys
-
SPRING_DATASOURCE_URL=jdbc:oracle:thin:@172.16.170.71:1521:localorcl
-
SPRING_DATASOURCE_DRIVER-CLASS-NAME=oracle.jdbc.driver.OracleDriver
-
SPRING_DATASOURCE_DEFAULTSCHEMA=BPMEHR
-
CAS=https://passport.ibizlab.cn
-
NACOS=172.16.240.110:8848
deploy
:
mode
:
replicated
replicas
:
1
...
...
ehr-provider/ehr-provider-specialrole/src/main/docker/Dockerfile
浏览文件 @
f20a8266
...
...
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-provider-specialrole.jar
EXPOSE
8081
EXPOSE
5080
ADD
ehr-provider-specialrole.jar /ehr-provider-specialrole.jar
ehr-provider/ehr-provider-specialrole/src/main/docker/ehr-provider-specialrole.yaml
浏览文件 @
f20a8266
...
...
@@ -3,9 +3,23 @@ services:
ehr-provider-specialrole
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-specialrole:latest
ports
:
-
"
8081:8081
"
-
"
5080:5080
"
networks
:
-
agent_network
environment
:
-
SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-
SERVER_PORT=5080
-
SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-
SPRING_REDIS_HOST=172.16.100.243
-
SPRING_REDIS_PORT=6379
-
SPRING_REDIS_DATABASE=0
-
SPRING_DATASOURCE_USERNAME=BPMEHR
-
SPRING_DATASOURCE_PASSWORD=sys
-
SPRING_DATASOURCE_URL=jdbc:oracle:thin:@172.16.170.71:1521:localorcl
-
SPRING_DATASOURCE_DRIVER-CLASS-NAME=oracle.jdbc.driver.OracleDriver
-
SPRING_DATASOURCE_DEFAULTSCHEMA=BPMEHR
-
CAS=https://passport.ibizlab.cn
-
NACOS=172.16.240.110:8848
deploy
:
mode
:
replicated
replicas
:
1
...
...
ehr-provider/ehr-provider-webapi/src/main/docker/Dockerfile
浏览文件 @
f20a8266
...
...
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-provider-webapi.jar
EXPOSE
8081
EXPOSE
5080
ADD
ehr-provider-webapi.jar /ehr-provider-webapi.jar
ehr-provider/ehr-provider-webapi/src/main/docker/ehr-provider-webapi.yaml
浏览文件 @
f20a8266
...
...
@@ -3,9 +3,23 @@ services:
ehr-provider-webapi
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-webapi:latest
ports
:
-
"
8081:8081
"
-
"
5080:5080
"
networks
:
-
agent_network
environment
:
-
SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-
SERVER_PORT=5080
-
SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-
SPRING_REDIS_HOST=172.16.100.243
-
SPRING_REDIS_PORT=6379
-
SPRING_REDIS_DATABASE=0
-
SPRING_DATASOURCE_USERNAME=BPMEHR
-
SPRING_DATASOURCE_PASSWORD=sys
-
SPRING_DATASOURCE_URL=jdbc:oracle:thin:@172.16.170.71:1521:localorcl
-
SPRING_DATASOURCE_DRIVER-CLASS-NAME=oracle.jdbc.driver.OracleDriver
-
SPRING_DATASOURCE_DEFAULTSCHEMA=BPMEHR
-
CAS=https://passport.ibizlab.cn
-
NACOS=172.16.240.110:8848
deploy
:
mode
:
replicated
replicas
:
1
...
...
ehr-provider/ehr-provider-wfcallback/src/main/docker/Dockerfile
浏览文件 @
f20a8266
...
...
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-provider-wfcallback.jar
EXPOSE
8081
EXPOSE
5080
ADD
ehr-provider-wfcallback.jar /ehr-provider-wfcallback.jar
ehr-provider/ehr-provider-wfcallback/src/main/docker/ehr-provider-wfcallback.yaml
浏览文件 @
f20a8266
...
...
@@ -3,9 +3,23 @@ services:
ehr-provider-wfcallback
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-wfcallback:latest
ports
:
-
"
8081:8081
"
-
"
5080:5080
"
networks
:
-
agent_network
environment
:
-
SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-
SERVER_PORT=5080
-
SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-
SPRING_REDIS_HOST=172.16.100.243
-
SPRING_REDIS_PORT=6379
-
SPRING_REDIS_DATABASE=0
-
SPRING_DATASOURCE_USERNAME=BPMEHR
-
SPRING_DATASOURCE_PASSWORD=sys
-
SPRING_DATASOURCE_URL=jdbc:oracle:thin:@172.16.170.71:1521:localorcl
-
SPRING_DATASOURCE_DRIVER-CLASS-NAME=oracle.jdbc.driver.OracleDriver
-
SPRING_DATASOURCE_DEFAULTSCHEMA=BPMEHR
-
CAS=https://passport.ibizlab.cn
-
NACOS=172.16.240.110:8848
deploy
:
mode
:
replicated
replicas
:
1
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录