提交 f02dfd9f 编写于 作者: ibizdev's avatar ibizdev

jackwang 部署微服务应用

上级 c11d8535
...@@ -157,4 +157,28 @@ export interface HRContract { ...@@ -157,4 +157,28 @@ export interface HRContract {
* @memberof HRContract * @memberof HRContract
*/ */
probationtime?: any; probationtime?: any;
/**
* 签订类型
*
* @returns {*}
* @memberof HRContract
*/
contractsigntype?: any;
/**
* 备注
*
* @returns {*}
* @memberof HRContract
*/
memo?: any;
/**
* 合同签订次数
*
* @returns {*}
* @memberof HRContract
*/
contractsignnum?: any;
} }
\ No newline at end of file
...@@ -157,4 +157,44 @@ export interface HRTransferApply { ...@@ -157,4 +157,44 @@ export interface HRTransferApply {
* @memberof HRTransferApply * @memberof HRTransferApply
*/ */
attachment?: any; attachment?: any;
/**
* 工作流实例
*
* @returns {*}
* @memberof HRTransferApply
*/
wfinstanceid?: any;
/**
* 工作流版本
*
* @returns {*}
* @memberof HRTransferApply
*/
wfversion?: any;
/**
* 工作流步骤
*
* @returns {*}
* @memberof HRTransferApply
*/
wfstep?: any;
/**
* 工作流状态
*
* @returns {*}
* @memberof HRTransferApply
*/
wfstate?: any;
/**
* 工作流业务状态
*
* @returns {*}
* @memberof HRTransferApply
*/
checkstatus?: any;
} }
\ No newline at end of file
...@@ -20,6 +20,9 @@ export default { ...@@ -20,6 +20,9 @@ export default {
signorganizationid: "合同签约单位ID", signorganizationid: "合同签约单位ID",
signorganizationname: "合同签约单位", signorganizationname: "合同签约单位",
probationtime: "试用期", probationtime: "试用期",
contractsigntype: "签订类型",
memo: "备注",
contractsignnum: "合同签订次数",
}, },
views: { views: {
gridview: { gridview: {
......
...@@ -19,6 +19,9 @@ export default { ...@@ -19,6 +19,9 @@ export default {
signorganizationid: "合同签约单位ID", signorganizationid: "合同签约单位ID",
signorganizationname: "合同签约单位", signorganizationname: "合同签约单位",
probationtime: "试用期", probationtime: "试用期",
contractsigntype: "签订类型",
memo: "备注",
contractsignnum: "合同签订次数",
}, },
views: { views: {
gridview: { gridview: {
......
...@@ -374,7 +374,7 @@ export default { ...@@ -374,7 +374,7 @@ export default {
tip: "Filter", tip: "Filter",
}, },
}, },
v_005toolbar_toolbar: { v_003toolbar_toolbar: {
tbitem1_ff_002: { tbitem1_ff_002: {
caption: "新建", caption: "新建",
tip: "新建", tip: "新建",
...@@ -416,7 +416,7 @@ export default { ...@@ -416,7 +416,7 @@ export default {
tip: "Filter", tip: "Filter",
}, },
}, },
gridviewtoolbar_toolbar: { v_005toolbar_toolbar: {
tbitem1_ff_002: { tbitem1_ff_002: {
caption: "新建", caption: "新建",
tip: "新建", tip: "新建",
...@@ -458,7 +458,7 @@ export default { ...@@ -458,7 +458,7 @@ export default {
tip: "Filter", tip: "Filter",
}, },
}, },
v_003toolbar_toolbar: { gridviewtoolbar_toolbar: {
tbitem1_ff_002: { tbitem1_ff_002: {
caption: "新建", caption: "新建",
tip: "新建", tip: "新建",
......
...@@ -373,7 +373,7 @@ export default { ...@@ -373,7 +373,7 @@ export default {
tip: "过滤", tip: "过滤",
}, },
}, },
v_005toolbar_toolbar: { v_003toolbar_toolbar: {
tbitem1_ff_002: { tbitem1_ff_002: {
caption: "新建", caption: "新建",
tip: "新建", tip: "新建",
...@@ -415,7 +415,7 @@ export default { ...@@ -415,7 +415,7 @@ export default {
tip: "过滤", tip: "过滤",
}, },
}, },
gridviewtoolbar_toolbar: { v_005toolbar_toolbar: {
tbitem1_ff_002: { tbitem1_ff_002: {
caption: "新建", caption: "新建",
tip: "新建", tip: "新建",
...@@ -457,7 +457,7 @@ export default { ...@@ -457,7 +457,7 @@ export default {
tip: "过滤", tip: "过滤",
}, },
}, },
v_003toolbar_toolbar: { gridviewtoolbar_toolbar: {
tbitem1_ff_002: { tbitem1_ff_002: {
caption: "新建", caption: "新建",
tip: "新建", tip: "新建",
......
...@@ -20,5 +20,10 @@ export default { ...@@ -20,5 +20,10 @@ export default {
hrdutyname2: "新职务", hrdutyname2: "新职务",
activetime: "生效日期", activetime: "生效日期",
attachment: "任职文件", attachment: "任职文件",
wfinstanceid: "工作流实例",
wfversion: "工作流版本",
wfstep: "工作流步骤",
wfstate: "工作流状态",
checkstatus: "工作流业务状态",
}, },
}; };
\ No newline at end of file
...@@ -19,5 +19,10 @@ export default { ...@@ -19,5 +19,10 @@ export default {
hrdutyname2: "新职务", hrdutyname2: "新职务",
activetime: "生效日期", activetime: "生效日期",
attachment: "任职文件", attachment: "任职文件",
wfinstanceid: "工作流实例",
wfversion: "工作流版本",
wfstep: "工作流步骤",
wfstate: "工作流状态",
checkstatus: "工作流业务状态",
}, },
}; };
\ No newline at end of file
...@@ -65,11 +65,11 @@ export class TabExpViewtabexppanelTabexppanelBase extends TabExpPanelControlBase ...@@ -65,11 +65,11 @@ export class TabExpViewtabexppanelTabexppanelBase extends TabExpPanelControlBase
* @memberof TabExpViewtabexppanel * @memberof TabExpViewtabexppanel
*/ */
protected isInit: any = { protected isInit: any = {
tabviewpanel5: true , tabviewpanel: true ,
tabviewpanel4: false ,
tabviewpanel3: false , tabviewpanel3: false ,
tabviewpanel: false , tabviewpanel4: false ,
tabviewpanel2: false , tabviewpanel2: false ,
tabviewpanel5: false ,
} }
/** /**
...@@ -79,7 +79,7 @@ export class TabExpViewtabexppanelTabexppanelBase extends TabExpPanelControlBase ...@@ -79,7 +79,7 @@ export class TabExpViewtabexppanelTabexppanelBase extends TabExpPanelControlBase
* @type {string} * @type {string}
* @memberof TabExpViewtabexppanel * @memberof TabExpViewtabexppanel
*/ */
protected activatedTabViewPanel: string = 'tabviewpanel5'; protected activatedTabViewPanel: string = 'tabviewpanel';
/** /**
* 组件创建完毕 * 组件创建完毕
......
<div class='tabviewpanel'> <div class='tabviewpanel'>
<tabs :value="activatedTabViewPanel" :animated="false" class='tabexppanel' name='tabexpviewtabexppanel' @on-click="tabPanelClick($event)"> <tabs :value="activatedTabViewPanel" :animated="false" class='tabexppanel' name='tabexpviewtabexppanel' @on-click="tabPanelClick($event)">
<tab-pane :index="0" name='tabviewpanel5' tab='tabexpviewtabexppanel' class='' <tab-pane :index="0" name='tabviewpanel' tab='tabexpviewtabexppanel' class=''
:label="(h) =>{ :label="(h) =>{
return h('div', [ return h('div', [
h('i',{ h('i',{
class:'fa fa-list', class:'fa fa-user',
style:{ style:{
'margin-right' : '2px' 'margin-right' : '2px'
} }
}), }),
h('span', '全部员工'), h('span', '在岗员工'),
h('Badge', { h('Badge', {
props: { props: {
count: undefined, count: undefined,
...@@ -18,28 +18,28 @@ ...@@ -18,28 +18,28 @@
}) })
]) ])
}" > }" >
<view_tabviewpanel5 <view_tabviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))" :viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="JSON.parse(JSON.stringify(context))" :context="JSON.parse(JSON.stringify(context))"
v-if="isInit.tabviewpanel5" v-if="isInit.tabviewpanel"
name="tabviewpanel5" name="tabviewpanel"
ref='tabviewpanel5' ref='tabviewpanel'
:expActive="activatedTabViewPanel === 'tabviewpanel5'" :expActive="activatedTabViewPanel === 'tabviewpanel'"
@viewpanelDatasChange = "tabViewPanelDatasChange" @viewpanelDatasChange = "tabViewPanelDatasChange"
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_tabviewpanel5> </view_tabviewpanel>
</tab-pane> </tab-pane>
<tab-pane :index="1" name='tabviewpanel4' tab='tabexpviewtabexppanel' class='' <tab-pane :index="1" name='tabviewpanel3' tab='tabexpviewtabexppanel' class=''
:label="(h) =>{ :label="(h) =>{
return h('div', [ return h('div', [
h('i',{ h('i',{
class:'fa fa-check-square-o', class:'fa fa-edit',
style:{ style:{
'margin-right' : '2px' 'margin-right' : '2px'
} }
}), }),
h('span', '已过试用期员工'), h('span', '待定工作员工'),
h('Badge', { h('Badge', {
props: { props: {
count: undefined, count: undefined,
...@@ -48,28 +48,28 @@ ...@@ -48,28 +48,28 @@
}) })
]) ])
}" > }" >
<view_tabviewpanel4 <view_tabviewpanel3
:viewState="viewState" :viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))" :viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="JSON.parse(JSON.stringify(context))" :context="JSON.parse(JSON.stringify(context))"
v-if="isInit.tabviewpanel4" v-if="isInit.tabviewpanel3"
name="tabviewpanel4" name="tabviewpanel3"
ref='tabviewpanel4' ref='tabviewpanel3'
:expActive="activatedTabViewPanel === 'tabviewpanel4'" :expActive="activatedTabViewPanel === 'tabviewpanel3'"
@viewpanelDatasChange = "tabViewPanelDatasChange" @viewpanelDatasChange = "tabViewPanelDatasChange"
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_tabviewpanel4> </view_tabviewpanel3>
</tab-pane> </tab-pane>
<tab-pane :index="2" name='tabviewpanel3' tab='tabexpviewtabexppanel' class='' <tab-pane :index="2" name='tabviewpanel4' tab='tabexpviewtabexppanel' class=''
:label="(h) =>{ :label="(h) =>{
return h('div', [ return h('div', [
h('i',{ h('i',{
class:'fa fa-edit', class:'fa fa-check-square-o',
style:{ style:{
'margin-right' : '2px' 'margin-right' : '2px'
} }
}), }),
h('span', '待定工作员工'), h('span', '已过试用期员工'),
h('Badge', { h('Badge', {
props: { props: {
count: undefined, count: undefined,
...@@ -78,28 +78,28 @@ ...@@ -78,28 +78,28 @@
}) })
]) ])
}" > }" >
<view_tabviewpanel3 <view_tabviewpanel4
:viewState="viewState" :viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))" :viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="JSON.parse(JSON.stringify(context))" :context="JSON.parse(JSON.stringify(context))"
v-if="isInit.tabviewpanel3" v-if="isInit.tabviewpanel4"
name="tabviewpanel3" name="tabviewpanel4"
ref='tabviewpanel3' ref='tabviewpanel4'
:expActive="activatedTabViewPanel === 'tabviewpanel3'" :expActive="activatedTabViewPanel === 'tabviewpanel4'"
@viewpanelDatasChange = "tabViewPanelDatasChange" @viewpanelDatasChange = "tabViewPanelDatasChange"
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_tabviewpanel3> </view_tabviewpanel4>
</tab-pane> </tab-pane>
<tab-pane :index="3" name='tabviewpanel' tab='tabexpviewtabexppanel' class='' <tab-pane :index="3" name='tabviewpanel2' tab='tabexpviewtabexppanel' class=''
:label="(h) =>{ :label="(h) =>{
return h('div', [ return h('div', [
h('i',{ h('i',{
class:'fa fa-user', class:'fa fa-user-times',
style:{ style:{
'margin-right' : '2px' 'margin-right' : '2px'
} }
}), }),
h('span', '在岗员工'), h('span', '员工'),
h('Badge', { h('Badge', {
props: { props: {
count: undefined, count: undefined,
...@@ -108,28 +108,28 @@ ...@@ -108,28 +108,28 @@
}) })
]) ])
}" > }" >
<view_tabviewpanel <view_tabviewpanel2
:viewState="viewState" :viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))" :viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="JSON.parse(JSON.stringify(context))" :context="JSON.parse(JSON.stringify(context))"
v-if="isInit.tabviewpanel" v-if="isInit.tabviewpanel2"
name="tabviewpanel" name="tabviewpanel2"
ref='tabviewpanel' ref='tabviewpanel2'
:expActive="activatedTabViewPanel === 'tabviewpanel'" :expActive="activatedTabViewPanel === 'tabviewpanel2'"
@viewpanelDatasChange = "tabViewPanelDatasChange" @viewpanelDatasChange = "tabViewPanelDatasChange"
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_tabviewpanel> </view_tabviewpanel2>
</tab-pane> </tab-pane>
<tab-pane :index="4" name='tabviewpanel2' tab='tabexpviewtabexppanel' class='' <tab-pane :index="4" name='tabviewpanel5' tab='tabexpviewtabexppanel' class=''
:label="(h) =>{ :label="(h) =>{
return h('div', [ return h('div', [
h('i',{ h('i',{
class:'fa fa-user-times', class:'fa fa-list',
style:{ style:{
'margin-right' : '2px' 'margin-right' : '2px'
} }
}), }),
h('span', '员工'), h('span', '全部员工'),
h('Badge', { h('Badge', {
props: { props: {
count: undefined, count: undefined,
...@@ -138,17 +138,17 @@ ...@@ -138,17 +138,17 @@
}) })
]) ])
}" > }" >
<view_tabviewpanel2 <view_tabviewpanel5
:viewState="viewState" :viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))" :viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="JSON.parse(JSON.stringify(context))" :context="JSON.parse(JSON.stringify(context))"
v-if="isInit.tabviewpanel2" v-if="isInit.tabviewpanel5"
name="tabviewpanel2" name="tabviewpanel5"
ref='tabviewpanel2' ref='tabviewpanel5'
:expActive="activatedTabViewPanel === 'tabviewpanel2'" :expActive="activatedTabViewPanel === 'tabviewpanel5'"
@viewpanelDatasChange = "tabViewPanelDatasChange" @viewpanelDatasChange = "tabViewPanelDatasChange"
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_tabviewpanel2> </view_tabviewpanel5>
</tab-pane> </tab-pane>
</tabs> </tabs>
</div> </div>
\ No newline at end of file
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
import { Component } from 'vue-property-decorator'; import { Component } from 'vue-property-decorator';
import { VueLifeCycleProcessing } from '@/studio-core'; import { VueLifeCycleProcessing } from '@/studio-core';
import { TabExpViewtabexppanelTabexppanelBase } from './tab-exp-viewtabexppanel-tabexppanel-base'; import { TabExpViewtabexppanelTabexppanelBase } from './tab-exp-viewtabexppanel-tabexppanel-base';
import view_tabviewpanel5 from '@widgets/hremployee/tab-exp-viewtabviewpanel5-tabviewpanel/tab-exp-viewtabviewpanel5-tabviewpanel.vue';
import view_tabviewpanel4 from '@widgets/hremployee/tab-exp-viewtabviewpanel4-tabviewpanel/tab-exp-viewtabviewpanel4-tabviewpanel.vue';
import view_tabviewpanel3 from '@widgets/hremployee/tab-exp-viewtabviewpanel3-tabviewpanel/tab-exp-viewtabviewpanel3-tabviewpanel.vue';
import view_tabviewpanel from '@widgets/hremployee/tab-exp-viewtabviewpanel-tabviewpanel/tab-exp-viewtabviewpanel-tabviewpanel.vue'; import view_tabviewpanel from '@widgets/hremployee/tab-exp-viewtabviewpanel-tabviewpanel/tab-exp-viewtabviewpanel-tabviewpanel.vue';
import view_tabviewpanel3 from '@widgets/hremployee/tab-exp-viewtabviewpanel3-tabviewpanel/tab-exp-viewtabviewpanel3-tabviewpanel.vue';
import view_tabviewpanel4 from '@widgets/hremployee/tab-exp-viewtabviewpanel4-tabviewpanel/tab-exp-viewtabviewpanel4-tabviewpanel.vue';
import view_tabviewpanel2 from '@widgets/hremployee/tab-exp-viewtabviewpanel2-tabviewpanel/tab-exp-viewtabviewpanel2-tabviewpanel.vue'; import view_tabviewpanel2 from '@widgets/hremployee/tab-exp-viewtabviewpanel2-tabviewpanel/tab-exp-viewtabviewpanel2-tabviewpanel.vue';
import view_tabviewpanel5 from '@widgets/hremployee/tab-exp-viewtabviewpanel5-tabviewpanel/tab-exp-viewtabviewpanel5-tabviewpanel.vue';
/** /**
...@@ -19,11 +19,11 @@ import view_tabviewpanel2 from '@widgets/hremployee/tab-exp-viewtabviewpanel2-ta ...@@ -19,11 +19,11 @@ import view_tabviewpanel2 from '@widgets/hremployee/tab-exp-viewtabviewpanel2-ta
*/ */
@Component({ @Component({
components: { components: {
view_tabviewpanel5,
view_tabviewpanel4,
view_tabviewpanel3,
view_tabviewpanel, view_tabviewpanel,
view_tabviewpanel3,
view_tabviewpanel4,
view_tabviewpanel2, view_tabviewpanel2,
view_tabviewpanel5,
} }
}) })
......
...@@ -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 -Phrapi mvn clean package -Ppim
cd humanresource-provider/humanresource-provider-hrapi cd humanresource-app/humanresource-app-pim
mvn -Phrapi docker:build mvn -Ppim docker:build
mvn -Phrapi docker:push mvn -Ppim docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-provider-hrapi.yaml iBizEE --with-registry-auth docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-app-pim.yaml iBizEE --with-registry-auth
</command> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
...@@ -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 8080 EXPOSE 10327
ADD humanresource-app-pim.jar /humanresource-app-pim.jar ADD humanresource-app-pim.jar /humanresource-app-pim.jar
...@@ -3,9 +3,25 @@ services: ...@@ -3,9 +3,25 @@ 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:
- "8080:8080" - "10327:10327"
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:
......
...@@ -135,6 +135,10 @@ zuul: ...@@ -135,6 +135,10 @@ zuul:
path: /hrarchives/** path: /hrarchives/**
serviceId: ${ibiz.ref.service.ibizhumanresources-hrapi:ibizhumanresources-hrapi} serviceId: ${ibiz.ref.service.ibizhumanresources-hrapi:ibizhumanresources-hrapi}
stripPrefix: false stripPrefix: false
wfcore:
path: /wfcore/**
serviceId: ${ibiz.ref.service.wf:ibzwf-api}
stripPrefix: true
loginv7: loginv7:
path: /v7/login path: /v7/login
serviceId: ${ibiz.ref.service.uaa:ibzuaa-api} serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
......
...@@ -4,6 +4,10 @@ server: ...@@ -4,6 +4,10 @@ server:
#zuul网关路由设置 #zuul网关路由设置
zuul: zuul:
routes: routes:
wfcore:
path: /wfcore/**
serviceId: ${ibiz.ref.service.wf:ibzwf-api}
stripPrefix: true
loginv7: loginv7:
path: /v7/login path: /v7/login
serviceId: ${ibiz.ref.service.uaa:ibzuaa-api} serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
......
...@@ -183,6 +183,27 @@ public class HRContract extends EntityMP implements Serializable { ...@@ -183,6 +183,27 @@ public class HRContract extends EntityMP implements Serializable {
@JSONField(name = "probationtime" , format="yyyy-MM-dd") @JSONField(name = "probationtime" , format="yyyy-MM-dd")
@JsonProperty("probationtime") @JsonProperty("probationtime")
private Timestamp probationtime; private Timestamp probationtime;
/**
* 签订类型
*/
@TableField(value = "contractsigntype")
@JSONField(name = "contractsigntype")
@JsonProperty("contractsigntype")
private String contractsigntype;
/**
* 备注
*/
@TableField(value = "memo")
@JSONField(name = "memo")
@JsonProperty("memo")
private String memo;
/**
* 合同签订次数
*/
@TableField(value = "contractsignnum")
@JSONField(name = "contractsignnum")
@JsonProperty("contractsignnum")
private BigInteger contractsignnum;
/** /**
* 员工 * 员工
...@@ -328,6 +349,30 @@ public class HRContract extends EntityMP implements Serializable { ...@@ -328,6 +349,30 @@ public class HRContract extends EntityMP implements Serializable {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
return sdf.format(probationtime); return sdf.format(probationtime);
} }
/**
* 设置 [签订类型]
*/
public void setContractsigntype(String contractsigntype){
this.contractsigntype = contractsigntype ;
this.modify("contractsigntype",contractsigntype);
}
/**
* 设置 [备注]
*/
public void setMemo(String memo){
this.memo = memo ;
this.modify("memo",memo);
}
/**
* 设置 [合同签订次数]
*/
public void setContractsignnum(BigInteger contractsignnum){
this.contractsignnum = contractsignnum ;
this.modify("contractsignnum",contractsignnum);
}
} }
......
...@@ -118,6 +118,13 @@ public class HRContractSearchContext extends QueryWrapperContext<HRContract> { ...@@ -118,6 +118,13 @@ public class HRContractSearchContext extends QueryWrapperContext<HRContract> {
this.getSearchCond().like("signorganizationname", n_signorganizationname_like); this.getSearchCond().like("signorganizationname", n_signorganizationname_like);
} }
} }
private String n_contractsigntype_eq;//[签订类型]
public void setN_contractsigntype_eq(String n_contractsigntype_eq) {
this.n_contractsigntype_eq = n_contractsigntype_eq;
if(!ObjectUtils.isEmpty(this.n_contractsigntype_eq)){
this.getSearchCond().eq("contractsigntype", n_contractsigntype_eq);
}
}
/** /**
* 启用快速搜索 * 启用快速搜索
......
...@@ -209,6 +209,14 @@ public class HRTransferApply extends EntityMP implements Serializable { ...@@ -209,6 +209,14 @@ public class HRTransferApply extends EntityMP implements Serializable {
@JSONField(name = "wfstate") @JSONField(name = "wfstate")
@JsonProperty("wfstate") @JsonProperty("wfstate")
private Integer wfstate; private Integer wfstate;
/**
* 工作流业务状态
*/
@DEField(defaultValue = "10" , defaultValueType = DEFieldDefaultValueType.PARAM)
@TableField(value = "checkstatus")
@JSONField(name = "checkstatus")
@JsonProperty("checkstatus")
private String checkstatus;
/** /**
* 员工 * 员工
...@@ -350,6 +358,14 @@ public class HRTransferApply extends EntityMP implements Serializable { ...@@ -350,6 +358,14 @@ public class HRTransferApply extends EntityMP implements Serializable {
this.modify("wfstate",wfstate); this.modify("wfstate",wfstate);
} }
/**
* 设置 [工作流业务状态]
*/
public void setCheckstatus(String checkstatus){
this.checkstatus = checkstatus ;
this.modify("checkstatus",checkstatus);
}
} }
......
...@@ -104,6 +104,13 @@ public class HRTransferApplySearchContext extends QueryWrapperContext<HRTransfer ...@@ -104,6 +104,13 @@ public class HRTransferApplySearchContext extends QueryWrapperContext<HRTransfer
this.getSearchCond().eq("wfstep", n_wfstep_eq); this.getSearchCond().eq("wfstep", n_wfstep_eq);
} }
} }
private String n_checkstatus_eq;//[工作流业务状态]
public void setN_checkstatus_eq(String n_checkstatus_eq) {
this.n_checkstatus_eq = n_checkstatus_eq;
if(!ObjectUtils.isEmpty(this.n_checkstatus_eq)){
this.getSearchCond().eq("checkstatus", n_checkstatus_eq);
}
}
/** /**
* 启用快速搜索 * 启用快速搜索
......
...@@ -192,11 +192,31 @@ public class HRTransferApplyServiceImpl extends ServiceImpl<HRTransferApplyMappe ...@@ -192,11 +192,31 @@ public class HRTransferApplyServiceImpl extends ServiceImpl<HRTransferApplyMappe
*/ */
@Override @Override
public Page<HRTransferApply> searchDefault(HRTransferApplySearchContext context) { public Page<HRTransferApply> searchDefault(HRTransferApplySearchContext context) {
fillWFTaskContext(context);
com.baomidou.mybatisplus.extension.plugins.pagination.Page<HRTransferApply> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond()); com.baomidou.mybatisplus.extension.plugins.pagination.Page<HRTransferApply> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
return new PageImpl<HRTransferApply>(pages.getRecords(), context.getPageable(), pages.getTotal()); return new PageImpl<HRTransferApply>(pages.getRecords(), context.getPageable(), pages.getTotal());
} }
@Autowired
private cn.ibizlab.humanresource.util.client.IBZWFFeignClient ibzwfFeignClient;
/**
* 查询工作流待办
* @param context
*/
private void fillWFTaskContext(HRTransferApplySearchContext context){
if(!StringUtils.isEmpty(context.getUserTaskId()) && !StringUtils.isEmpty(context.getProcessDefinitionKey())){
List<String> businessKeys= ibzwfFeignClient.getbusinesskeysByUserId("ibizhumanresources", cn.ibizlab.humanresource.util.security.AuthenticationUser.getAuthenticationUser().getUserid(),"hrtransferapplies",context.getProcessDefinitionKey(),context.getUserTaskId());
if(businessKeys.size()>0){
context.getSelectCond().in("hrtransferapplyid",businessKeys);
}
else{
context.getSelectCond().apply("1<>1");
}
}
}
/** /**
* 为当前实体填充父数据(外键值文本、外键值附加数据) * 为当前实体填充父数据(外键值文本、外键值附加数据)
......
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
<!--输出实体[HRCONTRACT]数据结构 --> <!--输出实体[HRCONTRACT]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrcontract-24-4"> <changeSet author="a_LAB01_e85d8801c" id="tab-hrcontract-29-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>
...@@ -121,6 +121,12 @@ ...@@ -121,6 +121,12 @@
</column> </column>
<column name="PROBATIONTIME" remarks="" type="DATETIME"> <column name="PROBATIONTIME" remarks="" type="DATETIME">
</column> </column>
<column name="CONTRACTSIGNTYPE" remarks="" type="VARCHAR(60)">
</column>
<column name="MEMO" remarks="" type="VARCHAR(2000)">
</column>
<column name="CONTRACTSIGNNUM" remarks="" type="BIGINT">
</column>
</createTable> </createTable>
</changeSet> </changeSet>
...@@ -332,7 +338,7 @@ ...@@ -332,7 +338,7 @@
<!--输出实体[HREMPLOYEE]数据结构 --> <!--输出实体[HREMPLOYEE]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hremployee-263-12"> <changeSet author="a_LAB01_e85d8801c" id="tab-hremployee-266-12">
<createTable tableName="EMPLOYEE"> <createTable tableName="EMPLOYEE">
<column name="EMPLOYEENAME" remarks="" type="VARCHAR(200)"> <column name="EMPLOYEENAME" remarks="" type="VARCHAR(200)">
</column> </column>
...@@ -988,7 +994,7 @@ ...@@ -988,7 +994,7 @@
<!--输出实体[HRTRANSFERAPPLY]数据结构 --> <!--输出实体[HRTRANSFERAPPLY]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrtransferapply-31-33"> <changeSet author="a_LAB01_e85d8801c" id="tab-hrtransferapply-46-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"/>
...@@ -1027,6 +1033,8 @@ ...@@ -1027,6 +1033,8 @@
</column> </column>
<column name="WFSTATE" remarks="" type="INT"> <column name="WFSTATE" remarks="" type="INT">
</column> </column>
<column name="CHECKSTATUS" remarks="" type="VARCHAR(60)">
</column>
</createTable> </createTable>
</changeSet> </changeSet>
...@@ -1079,10 +1087,10 @@ ...@@ -1079,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-24-38"> <changeSet author="a_LAB01_e85d8801c" id="fk-hrcontract-29-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-24-39"> <changeSet author="a_LAB01_e85d8801c" id="fk-hrcontract-29-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]外键关系 -->
...@@ -1111,13 +1119,13 @@ ...@@ -1111,13 +1119,13 @@
</changeSet> </changeSet>
<!--输出实体[HREMPSTATE]外键关系 --> <!--输出实体[HREMPSTATE]外键关系 -->
<!--输出实体[HREMPLOYEE]外键关系 --> <!--输出实体[HREMPLOYEE]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-263-47"> <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-266-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-263-48"> <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-266-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-263-49"> <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-266-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]外键关系 -->
...@@ -1195,13 +1203,13 @@ ...@@ -1195,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-31-69"> <changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-46-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-31-70"> <changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-46-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-31-71"> <changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-46-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]外键关系 -->
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性--> <!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<select id="selectById" resultMap="HRContractResultMap" databaseId="mysql"> <select id="selectById" resultMap="HRContractResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`BEGINTIME`, t1.`CONTRACTCODE`, t1.`CONTRACTMODE`, t1.`CONTRACTSTATE`, t1.`CONTRACTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENDTIME`, t1.`HRCONTRACTID`, t1.`HRCONTRACTNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MGRORGANIZATIONID`, t21.`ORGANIZATIONNAME` AS `MGRORGANIZATIONNAME`, t1.`PROBATIONTIME`, t1.`SIGNORGANIZATIONID`, t31.`ORGANIZATIONNAME` AS `SIGNORGANIZATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCONTRACT` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t1.MGRORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t1.SIGNORGANIZATIONID = t31.ORGANIZATIONID ) t1 where hrcontractid=#{id}]]> <![CDATA[select t1.* from (SELECT t1.`BEGINTIME`, t1.`CONTRACTCODE`, t1.`CONTRACTMODE`, t1.`CONTRACTSIGNNUM`, t1.`CONTRACTSIGNTYPE`, t1.`CONTRACTSTATE`, t1.`CONTRACTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENDTIME`, t1.`HRCONTRACTID`, t1.`HRCONTRACTNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MEMO`, t1.`MGRORGANIZATIONID`, t21.`ORGANIZATIONNAME` AS `MGRORGANIZATIONNAME`, t1.`PROBATIONTIME`, t1.`SIGNORGANIZATIONID`, t31.`ORGANIZATIONNAME` AS `SIGNORGANIZATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCONTRACT` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t1.MGRORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t1.SIGNORGANIZATIONID = t31.ORGANIZATIONID ) t1 where hrcontractid=#{id}]]>
</select> </select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 --> <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
...@@ -57,12 +57,12 @@ ...@@ -57,12 +57,12 @@
<!--数据查询[Default]--> <!--数据查询[Default]-->
<sql id="Default" databaseId="mysql"> <sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`BEGINTIME`, t1.`CONTRACTCODE`, t1.`CONTRACTMODE`, t1.`CONTRACTSTATE`, t1.`CONTRACTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENDTIME`, t1.`HRCONTRACTID`, t1.`HRCONTRACTNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MGRORGANIZATIONID`, t21.`ORGANIZATIONNAME` AS `MGRORGANIZATIONNAME`, t1.`PROBATIONTIME`, t1.`SIGNORGANIZATIONID`, t31.`ORGANIZATIONNAME` AS `SIGNORGANIZATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCONTRACT` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t1.MGRORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t1.SIGNORGANIZATIONID = t31.ORGANIZATIONID <![CDATA[ SELECT t1.`BEGINTIME`, t1.`CONTRACTCODE`, t1.`CONTRACTMODE`, t1.`CONTRACTSIGNNUM`, t1.`CONTRACTSIGNTYPE`, t1.`CONTRACTSTATE`, t1.`CONTRACTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENDTIME`, t1.`HRCONTRACTID`, t1.`HRCONTRACTNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MEMO`, t1.`MGRORGANIZATIONID`, t21.`ORGANIZATIONNAME` AS `MGRORGANIZATIONNAME`, t1.`PROBATIONTIME`, t1.`SIGNORGANIZATIONID`, t31.`ORGANIZATIONNAME` AS `SIGNORGANIZATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCONTRACT` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t1.MGRORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t1.SIGNORGANIZATIONID = t31.ORGANIZATIONID
]]> ]]>
</sql> </sql>
<!--数据查询[View]--> <!--数据查询[View]-->
<sql id="View" databaseId="mysql"> <sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`BEGINTIME`, t1.`CONTRACTCODE`, t1.`CONTRACTMODE`, t1.`CONTRACTSTATE`, t1.`CONTRACTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENDTIME`, t1.`HRCONTRACTID`, t1.`HRCONTRACTNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MGRORGANIZATIONID`, t21.`ORGANIZATIONNAME` AS `MGRORGANIZATIONNAME`, t1.`PROBATIONTIME`, t1.`SIGNORGANIZATIONID`, t31.`ORGANIZATIONNAME` AS `SIGNORGANIZATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCONTRACT` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t1.MGRORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t1.SIGNORGANIZATIONID = t31.ORGANIZATIONID <![CDATA[ SELECT t1.`BEGINTIME`, t1.`CONTRACTCODE`, t1.`CONTRACTMODE`, t1.`CONTRACTSIGNNUM`, t1.`CONTRACTSIGNTYPE`, t1.`CONTRACTSTATE`, t1.`CONTRACTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENDTIME`, t1.`HRCONTRACTID`, t1.`HRCONTRACTNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MEMO`, t1.`MGRORGANIZATIONID`, t21.`ORGANIZATIONNAME` AS `MGRORGANIZATIONNAME`, t1.`PROBATIONTIME`, t1.`SIGNORGANIZATIONID`, t31.`ORGANIZATIONNAME` AS `SIGNORGANIZATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCONTRACT` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t1.MGRORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t1.SIGNORGANIZATIONID = t31.ORGANIZATIONID
]]> ]]>
</sql> </sql>
</mapper> </mapper>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性--> <!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<select id="selectById" resultMap="HRTransferApplyResultMap" databaseId="mysql"> <select id="selectById" resultMap="HRTransferApplyResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`ACTIVETIME`, t1.`ATTACHMENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HRDUTYNAME`, t1.`HRDUTYNAME2`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRORGANIZATIONID2`, t31.`ORGANIZATIONNAME` AS `HRORGANIZATIONNAME2`, t1.`HRPOSTID2`, t1.`HRPOSTNAME`, t41.`HRPOSTNAME` AS `HRPOSTNAME2`, t1.`HRTRANSFERAPPLYID`, t1.`HRTRANSFERAPPLYNAME`, t11.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WFINSTANCEID`, t1.`WFSTATE`, t1.`WFSTEP`, t1.`WFVERSION` FROM `T_HRTRANSFERAPPLY` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t1.HRORGANIZATIONID2 = t31.ORGANIZATIONID LEFT JOIN T_HRPOST t41 ON t1.HRPOSTID2 = t41.HRPOSTID ) t1 where hrtransferapplyid=#{id}]]> <![CDATA[select t1.* from (SELECT t1.`ACTIVETIME`, t1.`ATTACHMENT`, t1.`CHECKSTATUS`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HRDUTYNAME`, t1.`HRDUTYNAME2`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRORGANIZATIONID2`, t31.`ORGANIZATIONNAME` AS `HRORGANIZATIONNAME2`, t1.`HRPOSTID2`, t1.`HRPOSTNAME`, t41.`HRPOSTNAME` AS `HRPOSTNAME2`, t1.`HRTRANSFERAPPLYID`, t1.`HRTRANSFERAPPLYNAME`, t11.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WFINSTANCEID`, t1.`WFSTATE`, t1.`WFSTEP`, t1.`WFVERSION` FROM `T_HRTRANSFERAPPLY` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t1.HRORGANIZATIONID2 = t31.ORGANIZATIONID LEFT JOIN T_HRPOST t41 ON t1.HRPOSTID2 = t41.HRPOSTID ) t1 where hrtransferapplyid=#{id}]]>
</select> </select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 --> <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
...@@ -57,12 +57,12 @@ ...@@ -57,12 +57,12 @@
<!--数据查询[Default]--> <!--数据查询[Default]-->
<sql id="Default" databaseId="mysql"> <sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`ACTIVETIME`, t1.`ATTACHMENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HRDUTYNAME`, t1.`HRDUTYNAME2`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRORGANIZATIONID2`, t31.`ORGANIZATIONNAME` AS `HRORGANIZATIONNAME2`, t1.`HRPOSTID2`, t1.`HRPOSTNAME`, t41.`HRPOSTNAME` AS `HRPOSTNAME2`, t1.`HRTRANSFERAPPLYID`, t1.`HRTRANSFERAPPLYNAME`, t11.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WFINSTANCEID`, t1.`WFSTATE`, t1.`WFSTEP`, t1.`WFVERSION` FROM `T_HRTRANSFERAPPLY` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t1.HRORGANIZATIONID2 = t31.ORGANIZATIONID LEFT JOIN T_HRPOST t41 ON t1.HRPOSTID2 = t41.HRPOSTID <![CDATA[ SELECT t1.`ACTIVETIME`, t1.`ATTACHMENT`, t1.`CHECKSTATUS`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HRDUTYNAME`, t1.`HRDUTYNAME2`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRORGANIZATIONID2`, t31.`ORGANIZATIONNAME` AS `HRORGANIZATIONNAME2`, t1.`HRPOSTID2`, t1.`HRPOSTNAME`, t41.`HRPOSTNAME` AS `HRPOSTNAME2`, t1.`HRTRANSFERAPPLYID`, t1.`HRTRANSFERAPPLYNAME`, t11.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WFINSTANCEID`, t1.`WFSTATE`, t1.`WFSTEP`, t1.`WFVERSION` FROM `T_HRTRANSFERAPPLY` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t1.HRORGANIZATIONID2 = t31.ORGANIZATIONID LEFT JOIN T_HRPOST t41 ON t1.HRPOSTID2 = t41.HRPOSTID
]]> ]]>
</sql> </sql>
<!--数据查询[View]--> <!--数据查询[View]-->
<sql id="View" databaseId="mysql"> <sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`ACTIVETIME`, t1.`ATTACHMENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HRDUTYNAME`, t1.`HRDUTYNAME2`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRORGANIZATIONID2`, t31.`ORGANIZATIONNAME` AS `HRORGANIZATIONNAME2`, t1.`HRPOSTID2`, t1.`HRPOSTNAME`, t41.`HRPOSTNAME` AS `HRPOSTNAME2`, t1.`HRTRANSFERAPPLYID`, t1.`HRTRANSFERAPPLYNAME`, t11.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WFINSTANCEID`, t1.`WFSTATE`, t1.`WFSTEP`, t1.`WFVERSION` FROM `T_HRTRANSFERAPPLY` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t1.HRORGANIZATIONID2 = t31.ORGANIZATIONID LEFT JOIN T_HRPOST t41 ON t1.HRPOSTID2 = t41.HRPOSTID <![CDATA[ SELECT t1.`ACTIVETIME`, t1.`ATTACHMENT`, t1.`CHECKSTATUS`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HRDUTYNAME`, t1.`HRDUTYNAME2`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRORGANIZATIONID2`, t31.`ORGANIZATIONNAME` AS `HRORGANIZATIONNAME2`, t1.`HRPOSTID2`, t1.`HRPOSTNAME`, t41.`HRPOSTNAME` AS `HRPOSTNAME2`, t1.`HRTRANSFERAPPLYID`, t1.`HRTRANSFERAPPLYNAME`, t11.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WFINSTANCEID`, t1.`WFSTATE`, t1.`WFSTEP`, t1.`WFVERSION` FROM `T_HRTRANSFERAPPLY` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t1.HRORGANIZATIONID2 = t31.ORGANIZATIONID LEFT JOIN T_HRPOST t41 ON t1.HRPOSTID2 = t41.HRPOSTID
]]> ]]>
</sql> </sql>
</mapper> </mapper>
......
...@@ -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 10317 EXPOSE 8081
ADD humanresource-provider-hrapi.jar /humanresource-provider-hrapi.jar ADD humanresource-provider-hrapi.jar /humanresource-provider-hrapi.jar
...@@ -3,25 +3,9 @@ services: ...@@ -3,25 +3,9 @@ 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:
- "10317:10317" - "8081:8081"
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:
......
...@@ -181,6 +181,30 @@ public class HRContractDTO extends DTOBase implements Serializable { ...@@ -181,6 +181,30 @@ public class HRContractDTO extends DTOBase implements Serializable {
@JsonProperty("probationtime") @JsonProperty("probationtime")
private Timestamp probationtime; private Timestamp probationtime;
/**
* 属性 [CONTRACTSIGNTYPE]
*
*/
@JSONField(name = "contractsigntype")
@JsonProperty("contractsigntype")
private String contractsigntype;
/**
* 属性 [MEMO]
*
*/
@JSONField(name = "memo")
@JsonProperty("memo")
private String memo;
/**
* 属性 [CONTRACTSIGNNUM]
*
*/
@JSONField(name = "contractsignnum")
@JsonProperty("contractsignnum")
private BigInteger contractsignnum;
/** /**
* 设置 [HRCONTRACTNAME] * 设置 [HRCONTRACTNAME]
...@@ -270,6 +294,30 @@ public class HRContractDTO extends DTOBase implements Serializable { ...@@ -270,6 +294,30 @@ public class HRContractDTO extends DTOBase implements Serializable {
this.modify("probationtime",probationtime); this.modify("probationtime",probationtime);
} }
/**
* 设置 [CONTRACTSIGNTYPE]
*/
public void setContractsigntype(String contractsigntype){
this.contractsigntype = contractsigntype ;
this.modify("contractsigntype",contractsigntype);
}
/**
* 设置 [MEMO]
*/
public void setMemo(String memo){
this.memo = memo ;
this.modify("memo",memo);
}
/**
* 设置 [CONTRACTSIGNNUM]
*/
public void setContractsignnum(BigInteger contractsignnum){
this.contractsignnum = contractsignnum ;
this.modify("contractsignnum",contractsignnum);
}
} }
...@@ -211,6 +211,14 @@ public class HRTransferApplyDTO extends DTOBase implements Serializable { ...@@ -211,6 +211,14 @@ public class HRTransferApplyDTO extends DTOBase implements Serializable {
@JsonProperty("wfstate") @JsonProperty("wfstate")
private Integer wfstate; private Integer wfstate;
/**
* 属性 [CHECKSTATUS]
*
*/
@JSONField(name = "checkstatus")
@JsonProperty("checkstatus")
private String checkstatus;
/** /**
* 设置 [HRTRANSFERAPPLYNAME] * 设置 [HRTRANSFERAPPLYNAME]
...@@ -316,6 +324,14 @@ public class HRTransferApplyDTO extends DTOBase implements Serializable { ...@@ -316,6 +324,14 @@ public class HRTransferApplyDTO extends DTOBase implements Serializable {
this.modify("wfstate",wfstate); this.modify("wfstate",wfstate);
} }
/**
* 设置 [CHECKSTATUS]
*/
public void setCheckstatus(String checkstatus){
this.checkstatus = checkstatus ;
this.modify("checkstatus",checkstatus);
}
} }
...@@ -33,6 +33,9 @@ public class PermissionSyncJob implements ApplicationRunner { ...@@ -33,6 +33,9 @@ public class PermissionSyncJob implements ApplicationRunner {
@Value("${ibiz.systemname:iBiz人力资源}") @Value("${ibiz.systemname:iBiz人力资源}")
private String systemName; private String systemName;
@Autowired
@Lazy
private cn.ibizlab.humanresource.util.client.IBZWFFeignClient client2;
@Override @Override
public void run(ApplicationArguments args) { public void run(ApplicationArguments args) {
...@@ -55,5 +58,16 @@ public class PermissionSyncJob implements ApplicationRunner { ...@@ -55,5 +58,16 @@ public class PermissionSyncJob implements ApplicationRunner {
log.error(String.format("向[UAA]同步系统资源失败,请检查[UAA]服务是否正常! [%s]",ex)); log.error(String.format("向[UAA]同步系统资源失败,请检查[UAA]服务是否正常! [%s]",ex));
} }
try{
List<Map<String,Object>> bpmnfiles=new ArrayList();
bpmnfiles.add(new HashMap<String,Object>(){{put("TransferApplicationApprovalv1.bpmn",IOUtils.toString(this.getClass().getResourceAsStream("/workflow/TransferApplicationApprovalv1.bpmn"),"UTF-8"));}});
if(client2.deployBpmnFile(bpmnfiles)){
log.info("部署流程成功");
}else{
log.error("部署流程失败");
}
}catch(Exception ex){
log.error(String.format("部署流程失败,请检查[WF]服务是否正常! [%s]",ex));
}
} }
} }
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册