Skip to content

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

Miracle 部署微服务应用

上级 2f5e93c0
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 260 行增加 和 187 行删除
app_PIM/src/interface/entity/hrarchives.ts
浏览文件 @ ab819677
......@@ -189,4 +189,28 @@ export interface HRArchives {
* @memberof HRArchives
*/
memo?: any;
/**
* 档案借阅状态
*
* @returns {*}
* @memberof HRArchives
*/
borrowstate?: any;
/**
* 档案管理单位ID
*
* @returns {*}
* @memberof HRArchives
*/
hrorganizationid?: any;
/**
* 档案管理单位
*
* @returns {*}
* @memberof HRArchives
*/
hrorganizationname?: any;
}
\ No newline at end of file
app_PIM/src/locale/lanres/entities/hrarchives/hrarchives_en_US.ts
浏览文件 @ ab819677
......@@ -24,6 +24,9 @@ export default {
activeflag: "是否有效",
attachment: "人事档案目录",
memo: "备注",
borrowstate: "档案借阅状态",
hrorganizationid: "档案管理单位ID",
hrorganizationname: "档案管理单位",
},
views: {
editview: {
......@@ -61,9 +64,7 @@ export default {
},
main_grid: {
columns: {
hrarchivesname: "档案信息名称",
updateman: "更新人",
updatedate: "更新时间",
archivescode: "档案编号",
},
uiactions: {
},
......
app_PIM/src/locale/lanres/entities/hrarchives/hrarchives_zh_CN.ts
浏览文件 @ ab819677
......@@ -23,6 +23,9 @@ export default {
activeflag: "是否有效",
attachment: "人事档案目录",
memo: "备注",
borrowstate: "档案借阅状态",
hrorganizationid: "档案管理单位ID",
hrorganizationname: "档案管理单位",
},
views: {
editview: {
......@@ -60,9 +63,7 @@ export default {
},
main_grid: {
columns: {
hrarchivesname: "档案信息名称",
updateman: "更新人",
updatedate: "更新时间",
archivescode: "档案编号",
},
uiactions: {
},
......
app_PIM/src/locale/lanres/entities/hrtransfer-apply/hrtransfer-apply_en_US.ts
浏览文件 @ ab819677
......@@ -465,6 +465,10 @@ export default {
caption: "删除并关闭",
tip: "删除并关闭",
},
tbitem1_saveandstart: {
caption: "Start workflow",
tip: "Start workflow",
},
tbitem2: {
caption: "-",
tip: "",
......
app_PIM/src/locale/lanres/entities/hrtransfer-apply/hrtransfer-apply_zh_CN.ts
浏览文件 @ ab819677
......@@ -464,6 +464,10 @@ export default {
caption: "删除并关闭",
tip: "删除并关闭",
},
tbitem1_saveandstart: {
caption: "开始流程",
tip: "开始流程",
},
tbitem2: {
caption: "-",
tip: "",
......
app_PIM/src/pages/human-resource/hrtechnical-title-tab-exp-view/hrtechnical-title-tab-exp-view.html
浏览文件 @ ab819677
<studio-view-style2 viewName="hrtechnicaltitletabexpview" viewTitle="职称" class='detabexpview hrtechnical-title-tab-exp-view'>
<template slot='title'>
<span class='caption-info'>{{viewCaption}}</span>
</template>
<view_tabexppanel
:viewState="viewState"
:viewparams="viewparams"
......
app_PIM/src/pages/pcm/hrtransfer-apply-grid-view/hrtransfer-apply-grid-view.html
浏览文件 @ ab819677
<studio-view-style2 viewName="hrtransferapplygridview" viewTitle="调动申请表格视图" class='degridview hrtransfer-apply-grid-view'>
<template slot='title'>
<span class='caption-info'>{{viewCaption}}</span>
</template>
<i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="调动申请名称" search @on-search="onSearch($event)"/>
<template slot="toolbar">
<view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/> </template>
......
app_PIM/src/pages/pcm/hrtransfer-apply-v-005/hrtransfer-apply-v-005-base.tsx
浏览文件 @ ab819677
......@@ -104,6 +104,8 @@ export class HRTransferApplyV_005Base extends TabExpViewBase {
tbitem1_remove: { name: 'tbitem1_remove', caption: '删除并关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'SINGLEKEY', class: '' } },
tbitem1_saveandstart: { name: 'tbitem1_saveandstart', caption: '开始流程', 'isShowCaption': true, 'isShowIcon': true, tooltip: '开始流程', iconcls: 'fa fa-play', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndStart', target: '', class: '' } },
tbitem2: { name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem22: { name: 'tbitem22', caption: '关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '关闭', iconcls: 'fa fa-sign-out', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Exit', target: '', class: '' } },
......
app_PIM/src/widgets/hrarchives/main-grid/main-grid-base.tsx
浏览文件 @ ab819677
......@@ -93,25 +93,9 @@ export class MainGridBase extends GridControlBase {
*/
public allColumns: any[] = [
{
name: 'hrarchivesname',
label: '档案信息名称',
langtag: 'entities.hrarchives.main_grid.columns.hrarchivesname',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'updateman',
label: '更新人',
langtag: 'entities.hrarchives.main_grid.columns.updateman',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'updatedate',
label: '更新时间',
langtag: 'entities.hrarchives.main_grid.columns.updatedate',
name: 'archivescode',
label: '档案编号',
langtag: 'entities.hrarchives.main_grid.columns.archivescode',
show: true,
util: 'PX',
isEnableRowEdit: false,
......@@ -150,9 +134,7 @@ export class MainGridBase extends GridControlBase {
* @memberof MainBase
*/
public hasRowEdit: any = {
'hrarchivesname':false,
'updateman':false,
'updatedate':false,
'archivescode':false,
};
/**
......@@ -178,14 +160,6 @@ export class MainGridBase extends GridControlBase {
*/
public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
return super.formatExcelData(filterVal, jsonData, [
{
name: 'updateman',
srfkey: 'SysOperator',
codelistType : 'DYNAMIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
]);
}
......
app_PIM/src/widgets/hrarchives/main-grid/main-grid-model.ts
浏览文件 @ ab819677
......@@ -32,14 +32,14 @@ export default class MainModel {
dataType: 'PICKUP',
},
{
name: 'updateman',
prop: 'updateman',
dataType: 'TEXT',
name: 'hrorganizationid',
prop: 'hrorganizationid',
dataType: 'PICKUP',
},
{
name: 'updatedate',
prop: 'updatedate',
dataType: 'DATETIME',
name: 'archivescode',
prop: 'archivescode',
dataType: 'TEXT',
},
{
name: 'srfmajortext',
......@@ -57,11 +57,6 @@ export default class MainModel {
dataType: 'GUID',
isEditable:true
},
{
name: 'hrarchivesname',
prop: 'hrarchivesname',
dataType: 'TEXT',
},
{
name: 'hrarchives',
prop: 'hrarchivesid',
......
app_PIM/src/widgets/hrarchives/main-grid/main-grid.html
浏览文件 @ ab819677
......@@ -23,41 +23,15 @@
<template v-if="!isSingleSelect">
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</template>
<template v-if="getColumnState('hrarchivesname')">
<el-table-column show-overflow-tooltip :prop="'hrarchivesname'" :label="$t('entities.hrarchives.main_grid.columns.hrarchivesname')" :width="150" :align="'left'" :sortable="'custom'">
<template v-if="getColumnState('archivescode')">
<el-table-column show-overflow-tooltip :prop="'archivescode'" :label="$t('entities.hrarchives.main_grid.columns.archivescode')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrarchives.main_grid.columns.hrarchivesname')}}
{{$t('entities.hrarchives.main_grid.columns.archivescode')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.hrarchivesname}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('updateman')">
<el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.hrarchives.main_grid.columns.updateman')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrarchives.main_grid.columns.updateman')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template >
<codelist :value="row.updateman" tag='SysOperator' codelistType='DYNAMIC' ></codelist>
</template>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('updatedate')">
<el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.hrarchives.main_grid.columns.updatedate')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrarchives.main_grid.columns.updatedate')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<app-format-data format="YYYY-MM-DD HH:mm:ss" :data="row.updatedate"></app-format-data>
<span>{{row.archivescode}}</span>
</template>
</el-table-column>
</template>
......
app_PIM/src/widgets/hrtransfer-apply/ef-001-form/ef-001-form.html
浏览文件 @ ab819677
......@@ -96,56 +96,6 @@
<app-file-upload :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange($event)" :data="JSON.stringify(this.data)" name='attachment' :value="data.attachment" :disabled="detailsModel.attachment.disabled" :uploadparams='{}' :exportparams='{}' style="overflow: auto;"></app-file-upload>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.organizationname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='organizationname' :itemRules="this.rules.organizationname" class='' :caption="$t('entities.hrtransferapply.ef_001_form.details.organizationname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.organizationname.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='organizationname' :value="data.organizationname" dataType="PICKUPDATA" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.hrpostname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='hrpostname' :itemRules="this.rules.hrpostname" class='' :caption="$t('entities.hrtransferapply.ef_001_form.details.hrpostname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.hrpostname.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='hrpostname' :value="data.hrpostname" dataType="PICKUPDATA" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.hrdutyname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='hrdutyname' :itemRules="this.rules.hrdutyname" class='' :caption="$t('entities.hrtransferapply.ef_001_form.details.hrdutyname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.hrdutyname.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='hrdutyname' :value="data.hrdutyname" dataType="PICKUPDATA" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.hrdutyname2.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='hrdutyname2' :itemRules="this.rules.hrdutyname2" class='' :caption="$t('entities.hrtransferapply.ef_001_form.details.hrdutyname2')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.hrdutyname2.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='hrdutyname2' :value="data.hrdutyname2" dataType="PICKUPDATA" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.organizationid.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='organizationid' :itemRules="this.rules.organizationid" class='' :caption="$t('entities.hrtransferapply.ef_001_form.details.organizationid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.organizationid.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='organizationid' :value="data.organizationid" dataType="PICKUPDATA" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
</app-form-item>
</i-col>
</row>
......
app_PIM/src/widgets/hrtransfer-apply/if-001-form/if-001-form.html
浏览文件 @ ab819677
......@@ -91,16 +91,6 @@
<app-file-upload :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange($event)" :data="JSON.stringify(this.data)" name='attachment' :value="data.attachment" :disabled="detailsModel.attachment.disabled" :uploadparams='{}' :exportparams='{}' style="overflow: auto;"></app-file-upload>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.organizationid.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<app-form-item name='organizationid' :itemRules="this.rules.organizationid" class='' :caption="$t('entities.hrtransferapply.if_001_form.details.organizationid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.organizationid.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='organizationid' :value="data.organizationid" dataType="PICKUPDATA" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
</app-form-item>
</i-col>
</row>
......
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/base/service/impl/HROrganizationServiceImpl.java
浏览文件 @ ab819677
......@@ -50,6 +50,9 @@ public class HROrganizationServiceImpl extends ServiceImpl<HROrganizationMapper,
protected cn.ibizlab.humanresource.core.humanresource.service.IHREmployeeService hremployeeService;
@Autowired
@Lazy
protected cn.ibizlab.humanresource.core.humanresource.service.IHRArchivesService hrarchivesService;
@Autowired
@Lazy
protected cn.ibizlab.humanresource.core.humanresource.service.IHRCertificateService hrcertificateService;
@Autowired
@Lazy
......
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/domain/HRArchives.java
浏览文件 @ ab819677
......@@ -211,6 +211,27 @@ public class HRArchives extends EntityMP implements Serializable {
@JSONField(name = "memo")
@JsonProperty("memo")
private String memo;
/**
* 档案借阅状态
*/
@TableField(value = "borrowstate")
@JSONField(name = "borrowstate")
@JsonProperty("borrowstate")
private String borrowstate;
/**
* 档案管理单位ID
*/
@TableField(value = "hrorganizationid")
@JSONField(name = "hrorganizationid")
@JsonProperty("hrorganizationid")
private String hrorganizationid;
/**
* 档案管理单位
*/
@TableField(exist = false)
@JSONField(name = "hrorganizationname")
@JsonProperty("hrorganizationname")
private String hrorganizationname;
/**
* 员工
......@@ -220,6 +241,14 @@ public class HRArchives extends EntityMP implements Serializable {
@TableField(exist = false)
private cn.ibizlab.humanresource.core.humanresource.domain.HREmployee hremployee;
/**
* 档案管理单位
*/
@JsonIgnore
@JSONField(serialize = false)
@TableField(exist = false)
private cn.ibizlab.humanresource.core.base.domain.HROrganization hrorganization;
/**
......@@ -356,6 +385,22 @@ public class HRArchives extends EntityMP implements Serializable {
this.modify("memo",memo);
}
/**
* 设置 [档案借阅状态]
*/
public void setBorrowstate(String borrowstate){
this.borrowstate = borrowstate ;
this.modify("borrowstate",borrowstate);
}
/**
* 设置 [档案管理单位ID]
*/
public void setHrorganizationid(String hrorganizationid){
this.hrorganizationid = hrorganizationid ;
this.modify("hrorganizationid",hrorganizationid);
}
}
......
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/filter/HRArchivesSearchContext.java
浏览文件 @ ab819677
......@@ -69,6 +69,34 @@ public class HRArchivesSearchContext extends QueryWrapperContext<HRArchives> {
this.getSearchCond().eq("degree", n_degree_eq);
}
}
private String n_borrowstate_eq;//[档案借阅状态]
public void setN_borrowstate_eq(String n_borrowstate_eq) {
this.n_borrowstate_eq = n_borrowstate_eq;
if(!ObjectUtils.isEmpty(this.n_borrowstate_eq)){
this.getSearchCond().eq("borrowstate", n_borrowstate_eq);
}
}
private String n_hrorganizationid_eq;//[档案管理单位ID]
public void setN_hrorganizationid_eq(String n_hrorganizationid_eq) {
this.n_hrorganizationid_eq = n_hrorganizationid_eq;
if(!ObjectUtils.isEmpty(this.n_hrorganizationid_eq)){
this.getSearchCond().eq("hrorganizationid", n_hrorganizationid_eq);
}
}
private String n_hrorganizationname_eq;//[档案管理单位]
public void setN_hrorganizationname_eq(String n_hrorganizationname_eq) {
this.n_hrorganizationname_eq = n_hrorganizationname_eq;
if(!ObjectUtils.isEmpty(this.n_hrorganizationname_eq)){
this.getSearchCond().eq("hrorganizationname", n_hrorganizationname_eq);
}
}
private String n_hrorganizationname_like;//[档案管理单位]
public void setN_hrorganizationname_like(String n_hrorganizationname_like) {
this.n_hrorganizationname_like = n_hrorganizationname_like;
if(!ObjectUtils.isEmpty(this.n_hrorganizationname_like)){
this.getSearchCond().like("hrorganizationname", n_hrorganizationname_like);
}
}
/**
* 启用快速搜索
......
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/mapper/HRArchivesMapper.java
浏览文件 @ ab819677
......@@ -64,4 +64,6 @@ public interface HRArchivesMapper extends BaseMapper<HRArchives>{
List<HRArchives> selectByHremployeeid(@Param("employeeid") Serializable employeeid) ;
List<HRArchives> selectByHrorganizationid(@Param("organizationid") Serializable organizationid) ;
}
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/service/IHRArchivesService.java
浏览文件 @ ab819677
......@@ -39,6 +39,8 @@ public interface IHRArchivesService extends IService<HRArchives>{
Page<HRArchives> searchDefault(HRArchivesSearchContext context) ;
List<HRArchives> selectByHremployeeid(String employeeid) ;
void removeByHremployeeid(String employeeid) ;
List<HRArchives> selectByHrorganizationid(String organizationid) ;
void removeByHrorganizationid(String organizationid) ;
/**
*自定义查询SQL
* @param sql select * from table where id =#{et.param}
......
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/service/impl/HRArchivesServiceImpl.java
浏览文件 @ ab819677
......@@ -48,6 +48,9 @@ public class HRArchivesServiceImpl extends ServiceImpl<HRArchivesMapper, HRArchi
@Autowired
@Lazy
protected cn.ibizlab.humanresource.core.humanresource.service.IHREmployeeService hremployeeService;
@Autowired
@Lazy
protected cn.ibizlab.humanresource.core.base.service.IHROrganizationService hrorganizationService;
protected int batchSize = 500;
......@@ -160,6 +163,16 @@ public class HRArchivesServiceImpl extends ServiceImpl<HRArchivesMapper, HRArchi
this.remove(new QueryWrapper<HRArchives>().eq("hremployeeid",employeeid));
}
@Override
public List<HRArchives> selectByHrorganizationid(String organizationid) {
return baseMapper.selectByHrorganizationid(organizationid);
}
@Override
public void removeByHrorganizationid(String organizationid) {
this.remove(new QueryWrapper<HRArchives>().eq("hrorganizationid",organizationid));
}
/**
* 查询集合 DEFAULT
......@@ -191,6 +204,16 @@ public class HRArchivesServiceImpl extends ServiceImpl<HRArchivesMapper, HRArchi
et.setOrganizationid(hremployee.getOrganizationid());
et.setEmpstate(hremployee.getEmpstate());
}
//实体关系[DER1N_HRARCHIVES_HRORGANIZATION_HRORGANIZATIONID_6BD9DC]
if(!ObjectUtils.isEmpty(et.getHrorganizationid())){
cn.ibizlab.humanresource.core.base.domain.HROrganization hrorganization=et.getHrorganization();
if(ObjectUtils.isEmpty(hrorganization)){
cn.ibizlab.humanresource.core.base.domain.HROrganization majorEntity=hrorganizationService.get(et.getHrorganizationid());
et.setHrorganization(majorEntity);
hrorganization=majorEntity;
}
et.setHrorganizationname(hrorganization.getOrganizationname());
}
}
......
humanresource-core/src/main/resources/mapper/humanresource/hrarchives/HRArchivesMapper.xml
浏览文件 @ ab819677
......@@ -5,17 +5,20 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="HRArchivesResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`ACTIVEFLAG`, t1.`ARCHIVESCODE`, t1.`ARCHIVESPLACE`, t1.`ARCHIVESPLACETYPE`, t1.`ARCHIVESROOM`, t1.`ATTACHMENT`, t1.`BIRTHDAY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEGREE`, t11.`EMPLOYEECODE`, t11.`EMPSTATE`, t1.`HRARCHIVESID`, t1.`HRARCHIVESNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MEMO`, t11.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`POLITICALTIME`, t1.`STARTWORKTIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRARCHIVES` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID ) t1 where hrarchivesid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.`ACTIVEFLAG`, t1.`ARCHIVESCODE`, t1.`ARCHIVESPLACE`, t1.`ARCHIVESPLACETYPE`, t1.`ARCHIVESROOM`, t1.`ATTACHMENT`, t1.`BIRTHDAY`, t1.`BORROWSTATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEGREE`, t11.`EMPLOYEECODE`, t11.`EMPSTATE`, t1.`HRARCHIVESID`, t1.`HRARCHIVESNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRORGANIZATIONID`, t31.`ORGANIZATIONNAME` AS `HRORGANIZATIONNAME`, t1.`MEMO`, t11.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`POLITICALTIME`, t1.`STARTWORKTIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRARCHIVES` 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.HRORGANIZATIONID = t31.ORGANIZATIONID ) t1 where hrarchivesid=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
<resultMap id="HRArchivesResultMap" type="cn.ibizlab.humanresource.core.humanresource.domain.HRArchives" autoMapping="true">
<id property="hrarchivesid" column="hrarchivesid" /><!--主键字段映射-->
<result property="hremployeeid" column="hremployeeid" />
<result property="hrorganizationid" column="hrorganizationid" />
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="hremployee" javaType="cn.ibizlab.humanresource.core.humanresource.domain.HREmployee" column="hremployeeid" select="cn.ibizlab.humanresource.core.humanresource.mapper.HREmployeeMapper.selectById" fetchType="lazy"></association>
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="hrorganization" javaType="cn.ibizlab.humanresource.core.base.domain.HROrganization" column="hrorganizationid" select="cn.ibizlab.humanresource.core.base.mapper.HROrganizationMapper.selectById" fetchType="lazy"></association>
</resultMap>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_HRARCHIVES_HREMPLOYEE_HREMPLOYEEID_327A4D] -->
......@@ -24,6 +27,13 @@
<include refid="Default" />
) t1
where hremployeeid=#{employeeid}
</select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_HRARCHIVES_HRORGANIZATION_HRORGANIZATIONID_6BD9DC] -->
<select id="selectByHrorganizationid" resultMap="HRArchivesResultMap">
select t1.* from (
<include refid="Default" />
) t1
where hrorganizationid=#{organizationid}
</select>
<!--数据集合[Default]-->
......@@ -37,12 +47,12 @@
<!--数据查询[Default]-->
<sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`ACTIVEFLAG`, t1.`ARCHIVESCODE`, t1.`ARCHIVESPLACE`, t1.`ARCHIVESPLACETYPE`, t1.`ARCHIVESROOM`, t1.`ATTACHMENT`, t1.`BIRTHDAY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEGREE`, t11.`EMPLOYEECODE`, t11.`EMPSTATE`, t1.`HRARCHIVESID`, t1.`HRARCHIVESNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MEMO`, t11.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`POLITICALTIME`, t1.`STARTWORKTIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRARCHIVES` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID
<![CDATA[ SELECT t1.`ACTIVEFLAG`, t1.`ARCHIVESCODE`, t1.`ARCHIVESPLACE`, t1.`ARCHIVESPLACETYPE`, t1.`ARCHIVESROOM`, t1.`ATTACHMENT`, t1.`BIRTHDAY`, t1.`BORROWSTATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEGREE`, t11.`EMPLOYEECODE`, t11.`EMPSTATE`, t1.`HRARCHIVESID`, t1.`HRARCHIVESNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRORGANIZATIONID`, t31.`ORGANIZATIONNAME` AS `HRORGANIZATIONNAME`, t1.`MEMO`, t11.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`POLITICALTIME`, t1.`STARTWORKTIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRARCHIVES` 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.HRORGANIZATIONID = t31.ORGANIZATIONID
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`ACTIVEFLAG`, t1.`ARCHIVESCODE`, t1.`ARCHIVESPLACE`, t1.`ARCHIVESPLACETYPE`, t1.`ARCHIVESROOM`, t1.`ATTACHMENT`, t1.`BIRTHDAY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEGREE`, t11.`EMPLOYEECODE`, t11.`EMPSTATE`, t1.`HRARCHIVESID`, t1.`HRARCHIVESNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MEMO`, t11.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`POLITICALTIME`, t1.`STARTWORKTIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRARCHIVES` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID
<![CDATA[ SELECT t1.`ACTIVEFLAG`, t1.`ARCHIVESCODE`, t1.`ARCHIVESPLACE`, t1.`ARCHIVESPLACETYPE`, t1.`ARCHIVESROOM`, t1.`ATTACHMENT`, t1.`BIRTHDAY`, t1.`BORROWSTATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEGREE`, t11.`EMPLOYEECODE`, t11.`EMPSTATE`, t1.`HRARCHIVESID`, t1.`HRARCHIVESNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRORGANIZATIONID`, t31.`ORGANIZATIONNAME` AS `HRORGANIZATIONNAME`, t1.`MEMO`, t11.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`POLITICALTIME`, t1.`STARTWORKTIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRARCHIVES` 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.HRORGANIZATIONID = t31.ORGANIZATIONID
]]>
</sql>
</mapper>
......
humanresource-provider/humanresource-provider-hrapi/src/main/java/cn/ibizlab/humanresource/hrapi/dto/HRArchivesDTO.java
浏览文件 @ ab819677
......@@ -213,6 +213,30 @@ public class HRArchivesDTO extends DTOBase implements Serializable {
@JsonProperty("memo")
private String memo;
/**
* 属性 [BORROWSTATE]
*
*/
@JSONField(name = "borrowstate")
@JsonProperty("borrowstate")
private String borrowstate;
/**
* 属性 [HRORGANIZATIONID]
*
*/
@JSONField(name = "hrorganizationid")
@JsonProperty("hrorganizationid")
private String hrorganizationid;
/**
* 属性 [HRORGANIZATIONNAME]
*
*/
@JSONField(name = "hrorganizationname")
@JsonProperty("hrorganizationname")
private String hrorganizationname;
/**
* 设置 [HRARCHIVESNAME]
......@@ -318,6 +342,22 @@ public class HRArchivesDTO extends DTOBase implements Serializable {
this.modify("memo",memo);
}
/**
* 设置 [BORROWSTATE]
*/
public void setBorrowstate(String borrowstate){
this.borrowstate = borrowstate ;
this.modify("borrowstate",borrowstate);
}
/**
* 设置 [HRORGANIZATIONID]
*/
public void setHrorganizationid(String hrorganizationid){
this.hrorganizationid = hrorganizationid ;
this.modify("hrorganizationid",hrorganizationid);
}
}
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或