Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
iBiz人力资源
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
iBiz企业套件
iBiz人力资源
提交
502947a7
提交
502947a7
编写于
8月 10, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
xignzi006 发布系统代码
上级
f81c2287
变更
17
展开全部
隐藏空白字符变更
内嵌
并排
正在显示
17 个修改的文件
包含
225 行增加
和
26 行删除
+225
-26
hremployee.ts
app_PIM/src/interface/entity/hremployee.ts
+24
-0
hremployee_en_US.ts
...src/locale/lanres/entities/hremployee/hremployee_en_US.ts
+3
-0
hremployee_zh_CN.ts
...src/locale/lanres/entities/hremployee/hremployee_zh_CN.ts
+3
-0
main-grid-model.ts
app_PIM/src/widgets/hremployee/main-grid/main-grid-model.ts
+5
-0
pickup-viewpickupviewpanel-pickupviewpanel-model.ts
...panel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
+9
-0
tree-001-treeview-model.ts
...s/hremployee/tree-001-treeview/tree-001-treeview-model.ts
+9
-0
tree-exp-viewtreeexpbar-treeexpbar-model.ts
...ar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar-model.ts
+9
-0
HREmployee.java
...b/humanresource/core/humanresource/domain/HREmployee.java
+37
-0
HREmployeeSearchContext.java
...ce/core/humanresource/filter/HREmployeeSearchContext.java
+21
-0
HREmployeeMapper.java
...nresource/core/humanresource/mapper/HREmployeeMapper.java
+2
-0
IHREmployeeService.java
...source/core/humanresource/service/IHREmployeeService.java
+2
-0
HREmployeeServiceImpl.java
...ore/humanresource/service/impl/HREmployeeServiceImpl.java
+24
-0
HRPostServiceImpl.java
...ce/core/humanresource/service/impl/HRPostServiceImpl.java
+3
-0
h2_table.xml
humanresource-core/src/main/resources/liquibase/h2_table.xml
+28
-23
HREmployeeMapper.xml
...rces/mapper/humanresource/hremployee/HREmployeeMapper.xml
+13
-3
systemResource.json
...ce-core/src/main/resources/permission/systemResource.json
+1
-0
HREmployeeDTO.java
...ava/cn/ibizlab/humanresource/hrapi/dto/HREmployeeDTO.java
+32
-0
未找到文件。
app_PIM/src/interface/entity/hremployee.ts
浏览文件 @
502947a7
...
@@ -317,4 +317,28 @@ export interface HREmployee {
...
@@ -317,4 +317,28 @@ export interface HREmployee {
* @memberof HREmployee
* @memberof HREmployee
*/
*/
nativeplace
?:
any
;
nativeplace
?:
any
;
/**
* 职位标识
*
* @returns {*}
* @memberof HREmployee
*/
hrpostid
?:
any
;
/**
* 职位
*
* @returns {*}
* @memberof HREmployee
*/
hrpostname
?:
any
;
/**
* 职务
*
* @returns {*}
* @memberof HREmployee
*/
hrdutyname
?:
any
;
}
}
\ No newline at end of file
app_PIM/src/locale/lanres/entities/hremployee/hremployee_en_US.ts
浏览文件 @
502947a7
...
@@ -40,6 +40,9 @@ export default {
...
@@ -40,6 +40,9 @@ export default {
empstate
:
"员工状态"
,
empstate
:
"员工状态"
,
jobstate
:
"在岗状态"
,
jobstate
:
"在岗状态"
,
nativeplace
:
"籍贯"
,
nativeplace
:
"籍贯"
,
hrpostid
:
"职位标识"
,
hrpostname
:
"职位"
,
hrdutyname
:
"职务"
,
},
},
views
:
{
views
:
{
v_001
:
{
v_001
:
{
...
...
app_PIM/src/locale/lanres/entities/hremployee/hremployee_zh_CN.ts
浏览文件 @
502947a7
...
@@ -39,6 +39,9 @@ export default {
...
@@ -39,6 +39,9 @@ export default {
empstate
:
"员工状态"
,
empstate
:
"员工状态"
,
jobstate
:
"在岗状态"
,
jobstate
:
"在岗状态"
,
nativeplace
:
"籍贯"
,
nativeplace
:
"籍贯"
,
hrpostid
:
"职位标识"
,
hrpostname
:
"职位"
,
hrdutyname
:
"职务"
,
},
},
views
:
{
views
:
{
v_001
:
{
v_001
:
{
...
...
app_PIM/src/widgets/hremployee/main-grid/main-grid-model.ts
浏览文件 @
502947a7
...
@@ -31,6 +31,11 @@ export default class MainModel {
...
@@ -31,6 +31,11 @@ export default class MainModel {
prop
:
'organizationname'
,
prop
:
'organizationname'
,
dataType
:
'PICKUPTEXT'
,
dataType
:
'PICKUPTEXT'
,
},
},
{
name
:
'hrpostid'
,
prop
:
'hrpostid'
,
dataType
:
'PICKUP'
,
},
{
{
name
:
'birthday'
,
name
:
'birthday'
,
prop
:
'birthday'
,
prop
:
'birthday'
,
...
...
app_PIM/src/widgets/hremployee/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @
502947a7
...
@@ -132,6 +132,15 @@ export default class PickupViewpickupviewpanelModel {
...
@@ -132,6 +132,15 @@ export default class PickupViewpickupviewpanelModel {
{
{
name
:
'nativeplace'
,
name
:
'nativeplace'
,
},
},
{
name
:
'hrpostid'
,
},
{
name
:
'hrpostname'
,
},
{
name
:
'hrdutyname'
,
},
]
]
}
}
...
...
app_PIM/src/widgets/hremployee/tree-001-treeview/tree-001-treeview-model.ts
浏览文件 @
502947a7
...
@@ -132,6 +132,15 @@ export default class TREE_001Model {
...
@@ -132,6 +132,15 @@ export default class TREE_001Model {
{
{
name
:
'nativeplace'
,
name
:
'nativeplace'
,
},
},
{
name
:
'hrpostid'
,
},
{
name
:
'hrpostname'
,
},
{
name
:
'hrdutyname'
,
},
]
]
}
}
...
...
app_PIM/src/widgets/hremployee/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar-model.ts
浏览文件 @
502947a7
...
@@ -132,6 +132,15 @@ export default class TreeExpViewtreeexpbarModel {
...
@@ -132,6 +132,15 @@ export default class TreeExpViewtreeexpbarModel {
{
{
name
:
'nativeplace'
,
name
:
'nativeplace'
,
},
},
{
name
:
'hrpostid'
,
},
{
name
:
'hrpostname'
,
},
{
name
:
'hrdutyname'
,
},
]
]
}
}
...
...
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/domain/HREmployee.java
浏览文件 @
502947a7
...
@@ -324,6 +324,27 @@ public class HREmployee extends EntityMP implements Serializable {
...
@@ -324,6 +324,27 @@ public class HREmployee extends EntityMP implements Serializable {
@JSONField
(
name
=
"nativeplace"
)
@JSONField
(
name
=
"nativeplace"
)
@JsonProperty
(
"nativeplace"
)
@JsonProperty
(
"nativeplace"
)
private
String
nativeplace
;
private
String
nativeplace
;
/**
* 职位标识
*/
@TableField
(
value
=
"hrpostid"
)
@JSONField
(
name
=
"hrpostid"
)
@JsonProperty
(
"hrpostid"
)
private
String
hrpostid
;
/**
* 职位
*/
@TableField
(
exist
=
false
)
@JSONField
(
name
=
"hrpostname"
)
@JsonProperty
(
"hrpostname"
)
private
String
hrpostname
;
/**
* 职务
*/
@TableField
(
exist
=
false
)
@JSONField
(
name
=
"hrdutyname"
)
@JsonProperty
(
"hrdutyname"
)
private
String
hrdutyname
;
/**
/**
*
*
...
@@ -341,6 +362,14 @@ public class HREmployee extends EntityMP implements Serializable {
...
@@ -341,6 +362,14 @@ public class HREmployee extends EntityMP implements Serializable {
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
cn
.
ibizlab
.
humanresource
.
core
.
humanresource
.
domain
.
HREmpState
hrempstate
;
private
cn
.
ibizlab
.
humanresource
.
core
.
humanresource
.
domain
.
HREmpState
hrempstate
;
/**
* 职位
*/
@JsonIgnore
@JSONField
(
serialize
=
false
)
@TableField
(
exist
=
false
)
private
cn
.
ibizlab
.
humanresource
.
core
.
humanresource
.
domain
.
HRPost
hrpost
;
/**
/**
...
@@ -631,6 +660,14 @@ public class HREmployee extends EntityMP implements Serializable {
...
@@ -631,6 +660,14 @@ public class HREmployee extends EntityMP implements Serializable {
this
.
modify
(
"nativeplace"
,
nativeplace
);
this
.
modify
(
"nativeplace"
,
nativeplace
);
}
}
/**
* 设置 [职位标识]
*/
public
void
setHrpostid
(
String
hrpostid
){
this
.
hrpostid
=
hrpostid
;
this
.
modify
(
"hrpostid"
,
hrpostid
);
}
}
}
...
...
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/filter/HREmployeeSearchContext.java
浏览文件 @
502947a7
...
@@ -132,6 +132,27 @@ public class HREmployeeSearchContext extends QueryWrapperContext<HREmployee> {
...
@@ -132,6 +132,27 @@ public class HREmployeeSearchContext extends QueryWrapperContext<HREmployee> {
this
.
getSearchCond
().
eq
(
"empstate"
,
n_empstate_eq
);
this
.
getSearchCond
().
eq
(
"empstate"
,
n_empstate_eq
);
}
}
}
}
private
String
n_hrpostid_eq
;
//[职位标识]
public
void
setN_hrpostid_eq
(
String
n_hrpostid_eq
)
{
this
.
n_hrpostid_eq
=
n_hrpostid_eq
;
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_hrpostid_eq
)){
this
.
getSearchCond
().
eq
(
"hrpostid"
,
n_hrpostid_eq
);
}
}
private
String
n_hrpostname_eq
;
//[职位]
public
void
setN_hrpostname_eq
(
String
n_hrpostname_eq
)
{
this
.
n_hrpostname_eq
=
n_hrpostname_eq
;
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_hrpostname_eq
)){
this
.
getSearchCond
().
eq
(
"hrpostname"
,
n_hrpostname_eq
);
}
}
private
String
n_hrpostname_like
;
//[职位]
public
void
setN_hrpostname_like
(
String
n_hrpostname_like
)
{
this
.
n_hrpostname_like
=
n_hrpostname_like
;
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_hrpostname_like
)){
this
.
getSearchCond
().
like
(
"hrpostname"
,
n_hrpostname_like
);
}
}
/**
/**
* 启用快速搜索
* 启用快速搜索
...
...
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/mapper/HREmployeeMapper.java
浏览文件 @
502947a7
...
@@ -66,4 +66,6 @@ public interface HREmployeeMapper extends BaseMapper<HREmployee>{
...
@@ -66,4 +66,6 @@ public interface HREmployeeMapper extends BaseMapper<HREmployee>{
List
<
HREmployee
>
selectByEmpstate
(
@Param
(
"hrempstateid"
)
Serializable
hrempstateid
)
;
List
<
HREmployee
>
selectByEmpstate
(
@Param
(
"hrempstateid"
)
Serializable
hrempstateid
)
;
List
<
HREmployee
>
selectByHrpostid
(
@Param
(
"hrpostid"
)
Serializable
hrpostid
)
;
}
}
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/service/IHREmployeeService.java
浏览文件 @
502947a7
...
@@ -41,6 +41,8 @@ public interface IHREmployeeService extends IService<HREmployee>{
...
@@ -41,6 +41,8 @@ public interface IHREmployeeService extends IService<HREmployee>{
void
removeByOrganizationid
(
String
organizationid
)
;
void
removeByOrganizationid
(
String
organizationid
)
;
List
<
HREmployee
>
selectByEmpstate
(
String
hrempstateid
)
;
List
<
HREmployee
>
selectByEmpstate
(
String
hrempstateid
)
;
void
removeByEmpstate
(
String
hrempstateid
)
;
void
removeByEmpstate
(
String
hrempstateid
)
;
List
<
HREmployee
>
selectByHrpostid
(
String
hrpostid
)
;
void
removeByHrpostid
(
String
hrpostid
)
;
/**
/**
*自定义查询SQL
*自定义查询SQL
* @param sql select * from table where id =#{et.param}
* @param sql select * from table where id =#{et.param}
...
...
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/service/impl/HREmployeeServiceImpl.java
浏览文件 @
502947a7
...
@@ -93,6 +93,9 @@ public class HREmployeeServiceImpl extends ServiceImpl<HREmployeeMapper, HREmplo
...
@@ -93,6 +93,9 @@ public class HREmployeeServiceImpl extends ServiceImpl<HREmployeeMapper, HREmplo
@Autowired
@Autowired
@Lazy
@Lazy
protected
cn
.
ibizlab
.
humanresource
.
core
.
humanresource
.
service
.
IHREmpStateService
hrempstateService
;
protected
cn
.
ibizlab
.
humanresource
.
core
.
humanresource
.
service
.
IHREmpStateService
hrempstateService
;
@Autowired
@Lazy
protected
cn
.
ibizlab
.
humanresource
.
core
.
humanresource
.
service
.
IHRPostService
hrpostService
;
protected
int
batchSize
=
500
;
protected
int
batchSize
=
500
;
...
@@ -215,6 +218,16 @@ public class HREmployeeServiceImpl extends ServiceImpl<HREmployeeMapper, HREmplo
...
@@ -215,6 +218,16 @@ public class HREmployeeServiceImpl extends ServiceImpl<HREmployeeMapper, HREmplo
this
.
remove
(
new
QueryWrapper
<
HREmployee
>().
eq
(
"empstate"
,
hrempstateid
));
this
.
remove
(
new
QueryWrapper
<
HREmployee
>().
eq
(
"empstate"
,
hrempstateid
));
}
}
@Override
public
List
<
HREmployee
>
selectByHrpostid
(
String
hrpostid
)
{
return
baseMapper
.
selectByHrpostid
(
hrpostid
);
}
@Override
public
void
removeByHrpostid
(
String
hrpostid
)
{
this
.
remove
(
new
QueryWrapper
<
HREmployee
>().
eq
(
"hrpostid"
,
hrpostid
));
}
/**
/**
* 查询集合 DEFAULT
* 查询集合 DEFAULT
...
@@ -252,6 +265,17 @@ public class HREmployeeServiceImpl extends ServiceImpl<HREmployeeMapper, HREmplo
...
@@ -252,6 +265,17 @@ public class HREmployeeServiceImpl extends ServiceImpl<HREmployeeMapper, HREmplo
}
}
et
.
setJobstate
(
hrempstate
.
getJobstate
());
et
.
setJobstate
(
hrempstate
.
getJobstate
());
}
}
//实体关系[DER1N_HREMPLOYEE_HRPOST_HRPOSTID_BE6FB0]
if
(!
ObjectUtils
.
isEmpty
(
et
.
getHrpostid
())){
cn
.
ibizlab
.
humanresource
.
core
.
humanresource
.
domain
.
HRPost
hrpost
=
et
.
getHrpost
();
if
(
ObjectUtils
.
isEmpty
(
hrpost
)){
cn
.
ibizlab
.
humanresource
.
core
.
humanresource
.
domain
.
HRPost
majorEntity
=
hrpostService
.
get
(
et
.
getHrpostid
());
et
.
setHrpost
(
majorEntity
);
hrpost
=
majorEntity
;
}
et
.
setHrpostname
(
hrpost
.
getHrpostname
());
et
.
setHrdutyname
(
hrpost
.
getHrdutyname
());
}
}
}
...
...
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/service/impl/HRPostServiceImpl.java
浏览文件 @
502947a7
...
@@ -50,6 +50,9 @@ public class HRPostServiceImpl extends ServiceImpl<HRPostMapper, HRPost> impleme
...
@@ -50,6 +50,9 @@ public class HRPostServiceImpl extends ServiceImpl<HRPostMapper, HRPost> impleme
protected
cn
.
ibizlab
.
humanresource
.
core
.
humanresource
.
service
.
IHRDistributionService
hrdistributionService
;
protected
cn
.
ibizlab
.
humanresource
.
core
.
humanresource
.
service
.
IHRDistributionService
hrdistributionService
;
@Autowired
@Autowired
@Lazy
@Lazy
protected
cn
.
ibizlab
.
humanresource
.
core
.
humanresource
.
service
.
IHREmployeeService
hremployeeService
;
@Autowired
@Lazy
protected
cn
.
ibizlab
.
humanresource
.
core
.
humanresource
.
service
.
IHRPostRelService
hrpostrelService
;
protected
cn
.
ibizlab
.
humanresource
.
core
.
humanresource
.
service
.
IHRPostRelService
hrpostrelService
;
@Autowired
@Autowired
@Lazy
@Lazy
...
...
humanresource-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
502947a7
此差异已折叠。
点击以展开。
humanresource-core/src/main/resources/mapper/humanresource/hremployee/HREmployeeMapper.xml
浏览文件 @
502947a7
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<select
id=
"selectById"
resultMap=
"HREmployeeResultMap"
databaseId=
"mysql"
>
<select
id=
"selectById"
resultMap=
"HREmployeeResultMap"
databaseId=
"mysql"
>
<![CDATA[select t1.* from (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`, t
21.`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.`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.HREMPSTATE
ID ) t1 where employeeid=#{id}]]>
<![CDATA[select t1.* from (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`, t
41.`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.`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.HRDUTY
ID ) t1 where employeeid=#{id}]]>
</select>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
...
@@ -13,12 +13,15 @@
...
@@ -13,12 +13,15 @@
<id
property=
"employeeid"
column=
"employeeid"
/>
<!--主键字段映射-->
<id
property=
"employeeid"
column=
"employeeid"
/>
<!--主键字段映射-->
<result
property=
"organizationid"
column=
"organizationid"
/>
<result
property=
"organizationid"
column=
"organizationid"
/>
<result
property=
"empstate"
column=
"empstate"
/>
<result
property=
"empstate"
column=
"empstate"
/>
<result
property=
"hrpostid"
column=
"hrpostid"
/>
<!--通过mybatis自动注入关系属性[主实体],fetchType="lazy"为懒加载配置 -->
<!--通过mybatis自动注入关系属性[主实体],fetchType="lazy"为懒加载配置 -->
<association
property=
"organization"
javaType=
"cn.ibizlab.humanresource.core.base.domain.HROrganization"
column=
"organizationid"
select=
"cn.ibizlab.humanresource.core.base.mapper.HROrganizationMapper.selectById"
fetchType=
"lazy"
></association>
<association
property=
"organization"
javaType=
"cn.ibizlab.humanresource.core.base.domain.HROrganization"
column=
"organizationid"
select=
"cn.ibizlab.humanresource.core.base.mapper.HROrganizationMapper.selectById"
fetchType=
"lazy"
></association>
<!--通过mybatis自动注入关系属性[主实体],fetchType="lazy"为懒加载配置 -->
<!--通过mybatis自动注入关系属性[主实体],fetchType="lazy"为懒加载配置 -->
<association
property=
"hrempstate"
javaType=
"cn.ibizlab.humanresource.core.humanresource.domain.HREmpState"
column=
"empstate"
select=
"cn.ibizlab.humanresource.core.humanresource.mapper.HREmpStateMapper.selectById"
fetchType=
"lazy"
></association>
<association
property=
"hrempstate"
javaType=
"cn.ibizlab.humanresource.core.humanresource.domain.HREmpState"
column=
"empstate"
select=
"cn.ibizlab.humanresource.core.humanresource.mapper.HREmpStateMapper.selectById"
fetchType=
"lazy"
></association>
<!--通过mybatis自动注入关系属性[主实体],fetchType="lazy"为懒加载配置 -->
<association
property=
"hrpost"
javaType=
"cn.ibizlab.humanresource.core.humanresource.domain.HRPost"
column=
"hrpostid"
select=
"cn.ibizlab.humanresource.core.humanresource.mapper.HRPostMapper.selectById"
fetchType=
"lazy"
></association>
</resultMap>
</resultMap>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_EMPLOYEE_ORGANIZATION_ORGANIZATIONID] -->
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_EMPLOYEE_ORGANIZATION_ORGANIZATIONID] -->
...
@@ -34,6 +37,13 @@
...
@@ -34,6 +37,13 @@
<include
refid=
"Default"
/>
<include
refid=
"Default"
/>
) t1
) t1
where empstate=#{hrempstateid}
where empstate=#{hrempstateid}
</select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_HREMPLOYEE_HRPOST_HRPOSTID_BE6FB0] -->
<select
id=
"selectByHrpostid"
resultMap=
"HREmployeeResultMap"
>
select t1.* from (
<include
refid=
"Default"
/>
) t1
where hrpostid=#{hrpostid}
</select>
</select>
<!--数据集合[Default]-->
<!--数据集合[Default]-->
...
@@ -47,12 +57,12 @@
...
@@ -47,12 +57,12 @@
<!--数据查询[Default]-->
<!--数据查询[Default]-->
<sql
id=
"Default"
databaseId=
"mysql"
>
<sql
id=
"Default"
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`, t
21.`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.`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.HREMPSTATE
ID
<![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`, t
41.`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.`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.HRDUTY
ID
]]>
]]>
</sql>
</sql>
<!--数据查询[View]-->
<!--数据查询[View]-->
<sql
id=
"View"
databaseId=
"mysql"
>
<sql
id=
"View"
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`, t
21.`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.`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.HREMPSTATE
ID
<![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`, t
41.`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.`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.HRDUTY
ID
]]>
]]>
</sql>
</sql>
</mapper>
</mapper>
...
...
humanresource-core/src/main/resources/permission/systemResource.json
浏览文件 @
502947a7
{
{
"systemid"
:
"iBizHumanResources"
,
"systemid"
:
"iBizHumanResources"
,
"systemname"
:
"iBiz人力资源"
,
"unires"
:[
"unires"
:[
],
],
"entities"
:[
"entities"
:[
...
...
humanresource-provider/humanresource-provider-hrapi/src/main/java/cn/ibizlab/humanresource/hrapi/dto/HREmployeeDTO.java
浏览文件 @
502947a7
...
@@ -342,6 +342,30 @@ public class HREmployeeDTO extends DTOBase implements Serializable {
...
@@ -342,6 +342,30 @@ public class HREmployeeDTO extends DTOBase implements Serializable {
@JsonProperty
(
"nativeplace"
)
@JsonProperty
(
"nativeplace"
)
private
String
nativeplace
;
private
String
nativeplace
;
/**
* 属性 [HRPOSTID]
*
*/
@JSONField
(
name
=
"hrpostid"
)
@JsonProperty
(
"hrpostid"
)
private
String
hrpostid
;
/**
* 属性 [HRPOSTNAME]
*
*/
@JSONField
(
name
=
"hrpostname"
)
@JsonProperty
(
"hrpostname"
)
private
String
hrpostname
;
/**
* 属性 [HRDUTYNAME]
*
*/
@JSONField
(
name
=
"hrdutyname"
)
@JsonProperty
(
"hrdutyname"
)
private
String
hrdutyname
;
/**
/**
* 设置 [EMPLOYEENAME]
* 设置 [EMPLOYEENAME]
...
@@ -591,6 +615,14 @@ public class HREmployeeDTO extends DTOBase implements Serializable {
...
@@ -591,6 +615,14 @@ public class HREmployeeDTO extends DTOBase implements Serializable {
this
.
modify
(
"nativeplace"
,
nativeplace
);
this
.
modify
(
"nativeplace"
,
nativeplace
);
}
}
/**
* 设置 [HRPOSTID]
*/
public
void
setHrpostid
(
String
hrpostid
){
this
.
hrpostid
=
hrpostid
;
this
.
modify
(
"hrpostid"
,
hrpostid
);
}
}
}
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录