Skip to content

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

jackwang 部署微服务应用

上级 58f59ccb
显示空白字符变更
内嵌 并排
正在显示 包含 804 行增加 和 27 行删除
app_PIM/src/interface/entity/hrfamily.ts
浏览文件 @ 569c60fb
......@@ -15,7 +15,7 @@ export interface HRFamily {
createdate?: any;
/**
* 家庭情况名称
* 姓名
*
* @returns {*}
* @memberof HRFamily
......@@ -69,4 +69,84 @@ export interface HRFamily {
* @memberof HRFamily
*/
hremployeename?: any;
/**
* 与本人关系
*
* @returns {*}
* @memberof HRFamily
*/
relationship?: any;
/**
* 证件类型
*
* @returns {*}
* @memberof HRFamily
*/
certtype?: any;
/**
* 证件号码
*
* @returns {*}
* @memberof HRFamily
*/
certnum?: any;
/**
* 性别
*
* @returns {*}
* @memberof HRFamily
*/
sex?: any;
/**
* 出生日期
*
* @returns {*}
* @memberof HRFamily
*/
birthday?: any;
/**
* 年龄
*
* @returns {*}
* @memberof HRFamily
*/
age?: any;
/**
* 工作单位
*
* @returns {*}
* @memberof HRFamily
*/
workorganization?: any;
/**
* 职务
*
* @returns {*}
* @memberof HRFamily
*/
duty?: any;
/**
* 政治面貌
*
* @returns {*}
* @memberof HRFamily
*/
political?: any;
/**
* 是否紧急联系人
*
* @returns {*}
* @memberof HRFamily
*/
emergencyflag?: any;
}
\ No newline at end of file
app_PIM/src/interface/entity/hrwork-record.ts
浏览文件 @ 569c60fb
......@@ -69,4 +69,60 @@ export interface HRWorkRecord {
* @memberof HRWorkRecord
*/
hremployeename?: any;
/**
* 开始时间
*
* @returns {*}
* @memberof HRWorkRecord
*/
begintime?: any;
/**
* 结束时间
*
* @returns {*}
* @memberof HRWorkRecord
*/
endtime?: any;
/**
* 工作单位
*
* @returns {*}
* @memberof HRWorkRecord
*/
workorganization?: any;
/**
* 部门
*
* @returns {*}
* @memberof HRWorkRecord
*/
workdepartment?: any;
/**
* 职务
*
* @returns {*}
* @memberof HRWorkRecord
*/
duty?: any;
/**
* 职位
*
* @returns {*}
* @memberof HRWorkRecord
*/
post?: any;
/**
* 主要经历
*
* @returns {*}
* @memberof HRWorkRecord
*/
mainwork?: any;
}
\ No newline at end of file
app_PIM/src/locale/lanres/entities/hrfamily/hrfamily_en_US.ts
浏览文件 @ 569c60fb
......@@ -2,13 +2,23 @@
export default {
fields: {
createdate: "建立时间",
hrfamilyname: "家庭情况名称",
hrfamilyname: "姓名",
createman: "建立人",
updateman: "更新人",
hrfamilyid: "家庭情况标识",
updatedate: "更新时间",
hremployeeid: "员工标识",
hremployeename: "员工姓名",
relationship: "与本人关系",
certtype: "证件类型",
certnum: "证件号码",
sex: "性别",
birthday: "出生日期",
age: "年龄",
workorganization: "工作单位",
duty: "职务",
political: "政治面貌",
emergencyflag: "是否紧急联系人",
},
views: {
gridview: {
......@@ -29,12 +39,12 @@ export default {
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "家庭情况标识",
srfmajortext: "家庭情况名称",
srfmajortext: "姓名",
srftempmode: "",
srfuf: "",
srfdeid: "",
srfsourcekey: "",
hrfamilyname: "家庭情况名称",
hrfamilyname: "姓名",
createman: "建立人",
createdate: "建立时间",
updateman: "更新人",
......@@ -46,7 +56,7 @@ export default {
},
main_grid: {
columns: {
hrfamilyname: "家庭情况名称",
hrfamilyname: "姓名",
updateman: "更新人",
updatedate: "更新时间",
},
......
app_PIM/src/locale/lanres/entities/hrfamily/hrfamily_zh_CN.ts
浏览文件 @ 569c60fb
export default {
fields: {
createdate: "建立时间",
hrfamilyname: "家庭情况名称",
hrfamilyname: "姓名",
createman: "建立人",
updateman: "更新人",
hrfamilyid: "家庭情况标识",
updatedate: "更新时间",
hremployeeid: "员工标识",
hremployeename: "员工姓名",
relationship: "与本人关系",
certtype: "证件类型",
certnum: "证件号码",
sex: "性别",
birthday: "出生日期",
age: "年龄",
workorganization: "工作单位",
duty: "职务",
political: "政治面貌",
emergencyflag: "是否紧急联系人",
},
views: {
gridview: {
......@@ -28,12 +38,12 @@ export default {
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "家庭情况标识",
srfmajortext: "家庭情况名称",
srfmajortext: "姓名",
srftempmode: "",
srfuf: "",
srfdeid: "",
srfsourcekey: "",
hrfamilyname: "家庭情况名称",
hrfamilyname: "姓名",
createman: "建立人",
createdate: "建立时间",
updateman: "更新人",
......@@ -45,7 +55,7 @@ export default {
},
main_grid: {
columns: {
hrfamilyname: "家庭情况名称",
hrfamilyname: "姓名",
updateman: "更新人",
updatedate: "更新时间",
},
......
app_PIM/src/locale/lanres/entities/hrwork-record/hrwork-record_en_US.ts
浏览文件 @ 569c60fb
......@@ -9,6 +9,13 @@ export default {
updatedate: "更新时间",
hremployeeid: "员工标识",
hremployeename: "员工姓名",
begintime: "开始时间",
endtime: "结束时间",
workorganization: "工作单位",
workdepartment: "部门",
duty: "职务",
post: "职位",
mainwork: "主要经历",
},
views: {
gridview: {
......
app_PIM/src/locale/lanres/entities/hrwork-record/hrwork-record_zh_CN.ts
浏览文件 @ 569c60fb
......@@ -8,6 +8,13 @@ export default {
updatedate: "更新时间",
hremployeeid: "员工标识",
hremployeename: "员工姓名",
begintime: "开始时间",
endtime: "结束时间",
workorganization: "工作单位",
workdepartment: "部门",
duty: "职务",
post: "职位",
mainwork: "主要经历",
},
views: {
gridview: {
......
app_PIM/src/pages/human-resource/hrfamily-grid-view/hrfamily-grid-view.html
浏览文件 @ 569c60fb
<studio-view-style2 viewName="hrfamilygridview" viewTitle="家庭情况表格视图" class='degridview hrfamily-grid-view'>
<i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="家庭情况名称" search @on-search="onSearch($event)"/>
<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>
<template slot="searchForm">
......
app_PIM/src/widgets/hrfamily/main-form/main-form-base.tsx
浏览文件 @ 569c60fb
......@@ -130,7 +130,7 @@ export class MainEditFormBase extends EditFormControlBase {
srfkey: new FormItemModel({ caption: '家庭情况标识', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
srfmajortext: new FormItemModel({ caption: '家庭情况名称', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
srfmajortext: new FormItemModel({ caption: '姓名', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
srftempmode: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srftempmode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
......@@ -140,7 +140,7 @@ export class MainEditFormBase extends EditFormControlBase {
srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
hrfamilyname: new FormItemModel({ caption: '家庭情况名称', detailType: 'FORMITEM', name: 'hrfamilyname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
hrfamilyname: new FormItemModel({ caption: '姓名', detailType: 'FORMITEM', name: 'hrfamilyname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
createman: new FormItemModel({ caption: '建立人', detailType: 'FORMITEM', name: 'createman', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
......
app_PIM/src/widgets/hrfamily/main-grid/main-grid-base.tsx
浏览文件 @ 569c60fb
......@@ -94,7 +94,7 @@ export class MainGridBase extends GridControlBase {
public allColumns: any[] = [
{
name: 'hrfamilyname',
label: '家庭情况名称',
label: '姓名',
langtag: 'entities.hrfamily.main_grid.columns.hrfamilyname',
show: true,
util: 'PX',
......
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/domain/HRFamily.java
浏览文件 @ 569c60fb
......@@ -50,7 +50,7 @@ public class HRFamily extends EntityMP implements Serializable {
@JsonProperty("createdate")
private Timestamp createdate;
/**
* 家庭情况名称
* 姓名
*/
@TableField(value = "hrfamilyname")
@JSONField(name = "hrfamilyname")
......@@ -103,6 +103,77 @@ public class HRFamily extends EntityMP implements Serializable {
@JSONField(name = "hremployeename")
@JsonProperty("hremployeename")
private String hremployeename;
/**
* 与本人关系
*/
@TableField(value = "relationship")
@JSONField(name = "relationship")
@JsonProperty("relationship")
private String relationship;
/**
* 证件类型
*/
@TableField(value = "certtype")
@JSONField(name = "certtype")
@JsonProperty("certtype")
private String certtype;
/**
* 证件号码
*/
@TableField(value = "certnum")
@JSONField(name = "certnum")
@JsonProperty("certnum")
private String certnum;
/**
* 性别
*/
@TableField(value = "sex")
@JSONField(name = "sex")
@JsonProperty("sex")
private String sex;
/**
* 出生日期
*/
@TableField(value = "birthday")
@JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
@JSONField(name = "birthday" , format="yyyy-MM-dd")
@JsonProperty("birthday")
private Timestamp birthday;
/**
* 年龄
*/
@TableField(exist = false)
@JSONField(name = "age")
@JsonProperty("age")
private String age;
/**
* 工作单位
*/
@TableField(value = "workorganization")
@JSONField(name = "workorganization")
@JsonProperty("workorganization")
private String workorganization;
/**
* 职务
*/
@TableField(value = "duty")
@JSONField(name = "duty")
@JsonProperty("duty")
private String duty;
/**
* 政治面貌
*/
@TableField(value = "political")
@JSONField(name = "political")
@JsonProperty("political")
private String political;
/**
* 是否紧急联系人
*/
@TableField(value = "emergencyflag")
@JSONField(name = "emergencyflag")
@JsonProperty("emergencyflag")
private Integer emergencyflag;
/**
* 员工
......@@ -115,7 +186,7 @@ public class HRFamily extends EntityMP implements Serializable {
/**
* 设置 [家庭情况名称]
* 设置 [姓名]
*/
public void setHrfamilyname(String hrfamilyname){
this.hrfamilyname = hrfamilyname ;
......@@ -130,6 +201,88 @@ public class HRFamily extends EntityMP implements Serializable {
this.modify("hremployeeid",hremployeeid);
}
/**
* 设置 [与本人关系]
*/
public void setRelationship(String relationship){
this.relationship = relationship ;
this.modify("relationship",relationship);
}
/**
* 设置 [证件类型]
*/
public void setCerttype(String certtype){
this.certtype = certtype ;
this.modify("certtype",certtype);
}
/**
* 设置 [证件号码]
*/
public void setCertnum(String certnum){
this.certnum = certnum ;
this.modify("certnum",certnum);
}
/**
* 设置 [性别]
*/
public void setSex(String sex){
this.sex = sex ;
this.modify("sex",sex);
}
/**
* 设置 [出生日期]
*/
public void setBirthday(Timestamp birthday){
this.birthday = birthday ;
this.modify("birthday",birthday);
}
/**
* 格式化日期 [出生日期]
*/
public String formatBirthday(){
if (this.birthday == null) {
return null;
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
return sdf.format(birthday);
}
/**
* 设置 [工作单位]
*/
public void setWorkorganization(String workorganization){
this.workorganization = workorganization ;
this.modify("workorganization",workorganization);
}
/**
* 设置 [职务]
*/
public void setDuty(String duty){
this.duty = duty ;
this.modify("duty",duty);
}
/**
* 设置 [政治面貌]
*/
public void setPolitical(String political){
this.political = political ;
this.modify("political",political);
}
/**
* 设置 [是否紧急联系人]
*/
public void setEmergencyflag(Integer emergencyflag){
this.emergencyflag = emergencyflag ;
this.modify("emergencyflag",emergencyflag);
}
}
......
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/domain/HRWorkRecord.java
浏览文件 @ 569c60fb
......@@ -103,6 +103,57 @@ public class HRWorkRecord extends EntityMP implements Serializable {
@JSONField(name = "hremployeename")
@JsonProperty("hremployeename")
private String hremployeename;
/**
* 开始时间
*/
@TableField(value = "begintime")
@JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
@JSONField(name = "begintime" , format="yyyy-MM-dd")
@JsonProperty("begintime")
private Timestamp begintime;
/**
* 结束时间
*/
@TableField(value = "endtime")
@JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
@JSONField(name = "endtime" , format="yyyy-MM-dd")
@JsonProperty("endtime")
private Timestamp endtime;
/**
* 工作单位
*/
@TableField(value = "workorganization")
@JSONField(name = "workorganization")
@JsonProperty("workorganization")
private String workorganization;
/**
* 部门
*/
@TableField(value = "workdepartment")
@JSONField(name = "workdepartment")
@JsonProperty("workdepartment")
private String workdepartment;
/**
* 职务
*/
@TableField(value = "duty")
@JSONField(name = "duty")
@JsonProperty("duty")
private String duty;
/**
* 职位
*/
@TableField(value = "post")
@JSONField(name = "post")
@JsonProperty("post")
private String post;
/**
* 主要经历
*/
@TableField(value = "mainwork")
@JSONField(name = "mainwork")
@JsonProperty("mainwork")
private Integer mainwork;
/**
* 员工
......@@ -130,6 +181,82 @@ public class HRWorkRecord extends EntityMP implements Serializable {
this.modify("hremployeeid",hremployeeid);
}
/**
* 设置 [开始时间]
*/
public void setBegintime(Timestamp begintime){
this.begintime = begintime ;
this.modify("begintime",begintime);
}
/**
* 格式化日期 [开始时间]
*/
public String formatBegintime(){
if (this.begintime == null) {
return null;
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
return sdf.format(begintime);
}
/**
* 设置 [结束时间]
*/
public void setEndtime(Timestamp endtime){
this.endtime = endtime ;
this.modify("endtime",endtime);
}
/**
* 格式化日期 [结束时间]
*/
public String formatEndtime(){
if (this.endtime == null) {
return null;
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
return sdf.format(endtime);
}
/**
* 设置 [工作单位]
*/
public void setWorkorganization(String workorganization){
this.workorganization = workorganization ;
this.modify("workorganization",workorganization);
}
/**
* 设置 [部门]
*/
public void setWorkdepartment(String workdepartment){
this.workdepartment = workdepartment ;
this.modify("workdepartment",workdepartment);
}
/**
* 设置 [职务]
*/
public void setDuty(String duty){
this.duty = duty ;
this.modify("duty",duty);
}
/**
* 设置 [职位]
*/
public void setPost(String post){
this.post = post ;
this.modify("post",post);
}
/**
* 设置 [主要经历]
*/
public void setMainwork(Integer mainwork){
this.mainwork = mainwork ;
this.modify("mainwork",mainwork);
}
}
......
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/filter/HRFamilySearchContext.java
浏览文件 @ 569c60fb
......@@ -27,7 +27,7 @@ import cn.ibizlab.humanresource.core.humanresource.domain.HRFamily;
@Data
public class HRFamilySearchContext extends QueryWrapperContext<HRFamily> {
private String n_hrfamilyname_like;//[家庭情况名称]
private String n_hrfamilyname_like;//[姓名]
public void setN_hrfamilyname_like(String n_hrfamilyname_like) {
this.n_hrfamilyname_like = n_hrfamilyname_like;
if(!ObjectUtils.isEmpty(this.n_hrfamilyname_like)){
......@@ -55,6 +55,34 @@ public class HRFamilySearchContext extends QueryWrapperContext<HRFamily> {
this.getSearchCond().like("hremployeename", n_hremployeename_like);
}
}
private String n_relationship_eq;//[与本人关系]
public void setN_relationship_eq(String n_relationship_eq) {
this.n_relationship_eq = n_relationship_eq;
if(!ObjectUtils.isEmpty(this.n_relationship_eq)){
this.getSearchCond().eq("relationship", n_relationship_eq);
}
}
private String n_certtype_eq;//[证件类型]
public void setN_certtype_eq(String n_certtype_eq) {
this.n_certtype_eq = n_certtype_eq;
if(!ObjectUtils.isEmpty(this.n_certtype_eq)){
this.getSearchCond().eq("certtype", n_certtype_eq);
}
}
private String n_sex_eq;//[性别]
public void setN_sex_eq(String n_sex_eq) {
this.n_sex_eq = n_sex_eq;
if(!ObjectUtils.isEmpty(this.n_sex_eq)){
this.getSearchCond().eq("sex", n_sex_eq);
}
}
private String n_political_eq;//[政治面貌]
public void setN_political_eq(String n_political_eq) {
this.n_political_eq = n_political_eq;
if(!ObjectUtils.isEmpty(this.n_political_eq)){
this.getSearchCond().eq("political", n_political_eq);
}
}
/**
* 启用快速搜索
......
humanresource-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 569c60fb
......@@ -378,7 +378,7 @@
<!--输出实体[HRFAMILY]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrfamily-8-13">
<changeSet author="a_LAB01_e85d8801c" id="tab-hrfamily-20-13">
<createTable tableName="T_HRFAMILY">
<column name="CREATEDATE" remarks="" type="DATETIME">
</column>
......@@ -395,6 +395,24 @@
</column>
<column name="HREMPLOYEEID" remarks="" type="VARCHAR(100)">
</column>
<column name="RELATIONSHIP" remarks="" type="VARCHAR(60)">
</column>
<column name="CERTTYPE" remarks="" type="VARCHAR(60)">
</column>
<column name="CERTNUM" remarks="" type="VARCHAR(100)">
</column>
<column name="SEX" remarks="" type="VARCHAR(60)">
</column>
<column name="BIRTHDAY" remarks="" type="DATETIME">
</column>
<column name="WORKORGANIZATION" remarks="" type="VARCHAR(100)">
</column>
<column name="DUTY" remarks="" type="VARCHAR(100)">
</column>
<column name="POLITICAL" remarks="" type="VARCHAR(60)">
</column>
<column name="EMERGENCYFLAG" remarks="" type="INT">
</column>
</createTable>
</changeSet>
......@@ -912,7 +930,7 @@
<!--输出实体[HRWORKRECORD]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrworkrecord-8-34">
<changeSet author="a_LAB01_e85d8801c" id="tab-hrworkrecord-15-34">
<createTable tableName="T_HRWORKRECORD">
<column name="HRWORKRECORDID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_HRWORKRECORD_HRWORKRECORDID"/>
......@@ -929,6 +947,20 @@
</column>
<column name="HREMPLOYEEID" remarks="" type="VARCHAR(100)">
</column>
<column name="BEGINTIME" remarks="" type="DATETIME">
</column>
<column name="ENDTIME" remarks="" type="DATETIME">
</column>
<column name="WORKORGANIZATION" remarks="" type="VARCHAR(100)">
</column>
<column name="WORKDEPARTMENT" remarks="" type="VARCHAR(100)">
</column>
<column name="DUTY" remarks="" type="VARCHAR(100)">
</column>
<column name="POST" remarks="" type="VARCHAR(100)">
</column>
<column name="MAINWORK" remarks="" type="INT">
</column>
</createTable>
</changeSet>
......@@ -981,7 +1013,7 @@
<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>
<!--输出实体[HRFAMILY]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-hrfamily-8-47">
<changeSet author="a_LAB01_e85d8801c" id="fk-hrfamily-20-47">
<addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRFAMILY" constraintName="DER1N_HRFAMILY_HREMPLOYEE_HREM" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
</changeSet>
<!--输出实体[HRLANGUAGEABILITY]外键关系 -->
......@@ -1065,7 +1097,7 @@
<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>
<!--输出实体[HRWORKRECORD]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-hrworkrecord-8-69">
<changeSet author="a_LAB01_e85d8801c" id="fk-hrworkrecord-15-69">
<addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRWORKRECORD" constraintName="DER1N_HRWORKRECORD_HREMPLOYEE_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
</changeSet>
......
humanresource-core/src/main/resources/mapper/humanresource/hrfamily/HRFamilyMapper.xml
浏览文件 @ 569c60fb
......@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="HRFamilyResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRFAMILYID`, t1.`HRFAMILYNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRFAMILY` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID ) t1 where hrfamilyid=#{id}]]>
<![CDATA[select t1.* from (SELECT (TIMESTAMPDIFF(YEAR, t1.`BIRTHDAY`, CURDATE())) AS `AGE`, t1.`BIRTHDAY`, t1.`CERTNUM`, t1.`CERTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DUTY`, t1.`EMERGENCYFLAG`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRFAMILYID`, t1.`HRFAMILYNAME`, t1.`POLITICAL`, t1.`RELATIONSHIP`, t1.`SEX`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WORKORGANIZATION` FROM `T_HRFAMILY` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID ) t1 where hrfamilyid=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
......@@ -37,12 +37,12 @@
<!--数据查询[Default]-->
<sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRFAMILYID`, t1.`HRFAMILYNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRFAMILY` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID
<![CDATA[ SELECT (TIMESTAMPDIFF(YEAR, t1.`BIRTHDAY`, CURDATE())) AS `AGE`, t1.`BIRTHDAY`, t1.`CERTNUM`, t1.`CERTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DUTY`, t1.`EMERGENCYFLAG`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRFAMILYID`, t1.`HRFAMILYNAME`, t1.`POLITICAL`, t1.`RELATIONSHIP`, t1.`SEX`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WORKORGANIZATION` FROM `T_HRFAMILY` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRFAMILYID`, t1.`HRFAMILYNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRFAMILY` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID
<![CDATA[ SELECT (TIMESTAMPDIFF(YEAR, t1.`BIRTHDAY`, CURDATE())) AS `AGE`, t1.`BIRTHDAY`, t1.`CERTNUM`, t1.`CERTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DUTY`, t1.`EMERGENCYFLAG`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRFAMILYID`, t1.`HRFAMILYNAME`, t1.`POLITICAL`, t1.`RELATIONSHIP`, t1.`SEX`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WORKORGANIZATION` FROM `T_HRFAMILY` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID
]]>
</sql>
</mapper>
......
humanresource-core/src/main/resources/mapper/humanresource/hrworkrecord/HRWorkRecordMapper.xml
浏览文件 @ 569c60fb
......@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="HRWorkRecordResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRWORKRECORDID`, t1.`HRWORKRECORDNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRWORKRECORD` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID ) t1 where hrworkrecordid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.`BEGINTIME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DUTY`, t1.`ENDTIME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRWORKRECORDID`, t1.`HRWORKRECORDNAME`, t1.`MAINWORK`, t1.`POST`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WORKDEPARTMENT`, t1.`WORKORGANIZATION` FROM `T_HRWORKRECORD` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID ) t1 where hrworkrecordid=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
......@@ -37,12 +37,12 @@
<!--数据查询[Default]-->
<sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRWORKRECORDID`, t1.`HRWORKRECORDNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRWORKRECORD` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID
<![CDATA[ SELECT t1.`BEGINTIME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DUTY`, t1.`ENDTIME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRWORKRECORDID`, t1.`HRWORKRECORDNAME`, t1.`MAINWORK`, t1.`POST`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WORKDEPARTMENT`, t1.`WORKORGANIZATION` FROM `T_HRWORKRECORD` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRWORKRECORDID`, t1.`HRWORKRECORDNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRWORKRECORD` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID
<![CDATA[ SELECT t1.`BEGINTIME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DUTY`, t1.`ENDTIME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRWORKRECORDID`, t1.`HRWORKRECORDNAME`, t1.`MAINWORK`, t1.`POST`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WORKDEPARTMENT`, t1.`WORKORGANIZATION` FROM `T_HRWORKRECORD` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID
]]>
</sql>
</mapper>
......
humanresource-provider/humanresource-provider-hrapi/src/main/java/cn/ibizlab/humanresource/hrapi/dto/HRFamilyDTO.java
浏览文件 @ 569c60fb
......@@ -90,6 +90,87 @@ public class HRFamilyDTO extends DTOBase implements Serializable {
@JsonProperty("hremployeename")
private String hremployeename;
/**
* 属性 [RELATIONSHIP]
*
*/
@JSONField(name = "relationship")
@JsonProperty("relationship")
private String relationship;
/**
* 属性 [CERTTYPE]
*
*/
@JSONField(name = "certtype")
@JsonProperty("certtype")
private String certtype;
/**
* 属性 [CERTNUM]
*
*/
@JSONField(name = "certnum")
@JsonProperty("certnum")
private String certnum;
/**
* 属性 [SEX]
*
*/
@JSONField(name = "sex")
@JsonProperty("sex")
private String sex;
/**
* 属性 [BIRTHDAY]
*
*/
@JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
@JSONField(name = "birthday" , format="yyyy-MM-dd")
@JsonProperty("birthday")
private Timestamp birthday;
/**
* 属性 [AGE]
*
*/
@JSONField(name = "age")
@JsonProperty("age")
private String age;
/**
* 属性 [WORKORGANIZATION]
*
*/
@JSONField(name = "workorganization")
@JsonProperty("workorganization")
private String workorganization;
/**
* 属性 [DUTY]
*
*/
@JSONField(name = "duty")
@JsonProperty("duty")
private String duty;
/**
* 属性 [POLITICAL]
*
*/
@JSONField(name = "political")
@JsonProperty("political")
private String political;
/**
* 属性 [EMERGENCYFLAG]
*
*/
@JSONField(name = "emergencyflag")
@JsonProperty("emergencyflag")
private Integer emergencyflag;
/**
* 设置 [HRFAMILYNAME]
......@@ -107,6 +188,78 @@ public class HRFamilyDTO extends DTOBase implements Serializable {
this.modify("hremployeeid",hremployeeid);
}
/**
* 设置 [RELATIONSHIP]
*/
public void setRelationship(String relationship){
this.relationship = relationship ;
this.modify("relationship",relationship);
}
/**
* 设置 [CERTTYPE]
*/
public void setCerttype(String certtype){
this.certtype = certtype ;
this.modify("certtype",certtype);
}
/**
* 设置 [CERTNUM]
*/
public void setCertnum(String certnum){
this.certnum = certnum ;
this.modify("certnum",certnum);
}
/**
* 设置 [SEX]
*/
public void setSex(String sex){
this.sex = sex ;
this.modify("sex",sex);
}
/**
* 设置 [BIRTHDAY]
*/
public void setBirthday(Timestamp birthday){
this.birthday = birthday ;
this.modify("birthday",birthday);
}
/**
* 设置 [WORKORGANIZATION]
*/
public void setWorkorganization(String workorganization){
this.workorganization = workorganization ;
this.modify("workorganization",workorganization);
}
/**
* 设置 [DUTY]
*/
public void setDuty(String duty){
this.duty = duty ;
this.modify("duty",duty);
}
/**
* 设置 [POLITICAL]
*/
public void setPolitical(String political){
this.political = political ;
this.modify("political",political);
}
/**
* 设置 [EMERGENCYFLAG]
*/
public void setEmergencyflag(Integer emergencyflag){
this.emergencyflag = emergencyflag ;
this.modify("emergencyflag",emergencyflag);
}
}
humanresource-provider/humanresource-provider-hrapi/src/main/java/cn/ibizlab/humanresource/hrapi/dto/HRWorkRecordDTO.java
浏览文件 @ 569c60fb
......@@ -90,6 +90,64 @@ public class HRWorkRecordDTO extends DTOBase implements Serializable {
@JsonProperty("hremployeename")
private String hremployeename;
/**
* 属性 [BEGINTIME]
*
*/
@JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
@JSONField(name = "begintime" , format="yyyy-MM-dd")
@JsonProperty("begintime")
private Timestamp begintime;
/**
* 属性 [ENDTIME]
*
*/
@JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
@JSONField(name = "endtime" , format="yyyy-MM-dd")
@JsonProperty("endtime")
private Timestamp endtime;
/**
* 属性 [WORKORGANIZATION]
*
*/
@JSONField(name = "workorganization")
@JsonProperty("workorganization")
private String workorganization;
/**
* 属性 [WORKDEPARTMENT]
*
*/
@JSONField(name = "workdepartment")
@JsonProperty("workdepartment")
private String workdepartment;
/**
* 属性 [DUTY]
*
*/
@JSONField(name = "duty")
@JsonProperty("duty")
private String duty;
/**
* 属性 [POST]
*
*/
@JSONField(name = "post")
@JsonProperty("post")
private String post;
/**
* 属性 [MAINWORK]
*
*/
@JSONField(name = "mainwork")
@JsonProperty("mainwork")
private Integer mainwork;
/**
* 设置 [HRWORKRECORDNAME]
......@@ -107,6 +165,62 @@ public class HRWorkRecordDTO extends DTOBase implements Serializable {
this.modify("hremployeeid",hremployeeid);
}
/**
* 设置 [BEGINTIME]
*/
public void setBegintime(Timestamp begintime){
this.begintime = begintime ;
this.modify("begintime",begintime);
}
/**
* 设置 [ENDTIME]
*/
public void setEndtime(Timestamp endtime){
this.endtime = endtime ;
this.modify("endtime",endtime);
}
/**
* 设置 [WORKORGANIZATION]
*/
public void setWorkorganization(String workorganization){
this.workorganization = workorganization ;
this.modify("workorganization",workorganization);
}
/**
* 设置 [WORKDEPARTMENT]
*/
public void setWorkdepartment(String workdepartment){
this.workdepartment = workdepartment ;
this.modify("workdepartment",workdepartment);
}
/**
* 设置 [DUTY]
*/
public void setDuty(String duty){
this.duty = duty ;
this.modify("duty",duty);
}
/**
* 设置 [POST]
*/
public void setPost(String post){
this.post = post ;
this.modify("post",post);
}
/**
* 设置 [MAINWORK]
*/
public void setMainwork(Integer mainwork){
this.mainwork = mainwork ;
this.modify("mainwork",mainwork);
}
}
humanresource-util/src/main/java/cn/ibizlab/humanresource/util/job/PermissionSyncJob.java
浏览文件 @ 569c60fb
......@@ -30,7 +30,7 @@ public class PermissionSyncJob implements ApplicationRunner {
@Value("${ibiz.systemid:iBizHumanResources}")
private String systemId;
@Value("${ibiz.systemid:iBiz人力资源}")
@Value("${ibiz.systemname:iBiz人力资源}")
private String systemName;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或