Skip to content

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

jackwang 部署微服务应用

上级 569c60fb
隐藏空白字符变更
内嵌 并排
正在显示 包含 309 行增加 和 6 行删除
app_PIM/src/interface/entity/hrcontract.ts
浏览文件 @ 55e19c15
......@@ -69,4 +69,52 @@ export interface HRContract {
* @memberof HRContract
*/
hremployeename?: any;
/**
* 合同编号
*
* @returns {*}
* @memberof HRContract
*/
contractcode?: any;
/**
* 合同类别
*
* @returns {*}
* @memberof HRContract
*/
contractmode?: any;
/**
* 合同类型
*
* @returns {*}
* @memberof HRContract
*/
contracttype?: any;
/**
* 开始日期
*
* @returns {*}
* @memberof HRContract
*/
begintime?: any;
/**
* 结束日期
*
* @returns {*}
* @memberof HRContract
*/
endtime?: any;
/**
* 合同状态
*
* @returns {*}
* @memberof HRContract
*/
contractstate?: any;
}
\ No newline at end of file
app_PIM/src/locale/lanres/entities/hrcontract/hrcontract_en_US.ts
浏览文件 @ 55e19c15
......@@ -9,6 +9,12 @@ export default {
updateman: "更新人",
hremployeeid: "员工标识",
hremployeename: "员工姓名",
contractcode: "合同编号",
contractmode: "合同类别",
contracttype: "合同类型",
begintime: "开始日期",
endtime: "结束日期",
contractstate: "合同状态",
},
views: {
gridview: {
......
app_PIM/src/locale/lanres/entities/hrcontract/hrcontract_zh_CN.ts
浏览文件 @ 55e19c15
......@@ -8,6 +8,12 @@ export default {
updateman: "更新人",
hremployeeid: "员工标识",
hremployeename: "员工姓名",
contractcode: "合同编号",
contractmode: "合同类别",
contracttype: "合同类型",
begintime: "开始日期",
endtime: "结束日期",
contractstate: "合同状态",
},
views: {
gridview: {
......
app_PIM/src/studio-core/view/ViewBase.tsx
浏览文件 @ 55e19c15
......@@ -27,7 +27,7 @@ export class ViewBase extends Vue {
*/
get viewCaption(): string {
if (isExistAndNotEmpty(this.model.dataInfo)) {
return `${this.model.srfCaption} - ${this.model.dataInfo}`
return `${this.model.srfCaption} - ${this.model.dataInfo}`;
}
return this.model.srfCaption;
}
......@@ -368,13 +368,13 @@ export class ViewBase extends Vue {
}
if (this.model) {
if (isExistAndNotEmpty(this.model.srfTitle)) {
this.model.srfCaption = this.$t(this.model.srfTitle);
this.model.srfTitle = this.$t(this.model.srfTitle);
}
if (isExistAndNotEmpty(this.model.srfCaption)) {
this.model.srfCaption = this.$t(this.model.srfCaption);
}
if (isExistAndNotEmpty(this.model.srfSubTitle)) {
this.model.srfCaption = this.$t(this.model.srfSubTitle);
this.model.srfSubTitle = this.$t(this.model.srfSubTitle);
}
}
this.viewCreated();
......
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/domain/HRContract.java
浏览文件 @ 55e19c15
......@@ -103,6 +103,50 @@ public class HRContract extends EntityMP implements Serializable {
@JSONField(name = "hremployeename")
@JsonProperty("hremployeename")
private String hremployeename;
/**
* 合同编号
*/
@TableField(value = "contractcode")
@JSONField(name = "contractcode")
@JsonProperty("contractcode")
private String contractcode;
/**
* 合同类别
*/
@TableField(value = "contractmode")
@JSONField(name = "contractmode")
@JsonProperty("contractmode")
private String contractmode;
/**
* 合同类型
*/
@TableField(value = "contracttype")
@JSONField(name = "contracttype")
@JsonProperty("contracttype")
private String contracttype;
/**
* 开始日期
*/
@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 = "contractstate")
@JSONField(name = "contractstate")
@JsonProperty("contractstate")
private String contractstate;
/**
* 员工
......@@ -130,6 +174,74 @@ public class HRContract extends EntityMP implements Serializable {
this.modify("hremployeeid",hremployeeid);
}
/**
* 设置 [合同编号]
*/
public void setContractcode(String contractcode){
this.contractcode = contractcode ;
this.modify("contractcode",contractcode);
}
/**
* 设置 [合同类别]
*/
public void setContractmode(String contractmode){
this.contractmode = contractmode ;
this.modify("contractmode",contractmode);
}
/**
* 设置 [合同类型]
*/
public void setContracttype(String contracttype){
this.contracttype = contracttype ;
this.modify("contracttype",contracttype);
}
/**
* 设置 [开始日期]
*/
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 setContractstate(String contractstate){
this.contractstate = contractstate ;
this.modify("contractstate",contractstate);
}
}
......
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/filter/HRContractSearchContext.java
浏览文件 @ 55e19c15
......@@ -55,6 +55,27 @@ public class HRContractSearchContext extends QueryWrapperContext<HRContract> {
this.getSearchCond().like("hremployeename", n_hremployeename_like);
}
}
private String n_contractmode_eq;//[合同类别]
public void setN_contractmode_eq(String n_contractmode_eq) {
this.n_contractmode_eq = n_contractmode_eq;
if(!ObjectUtils.isEmpty(this.n_contractmode_eq)){
this.getSearchCond().eq("contractmode", n_contractmode_eq);
}
}
private String n_contracttype_eq;//[合同类型]
public void setN_contracttype_eq(String n_contracttype_eq) {
this.n_contracttype_eq = n_contracttype_eq;
if(!ObjectUtils.isEmpty(this.n_contracttype_eq)){
this.getSearchCond().eq("contracttype", n_contracttype_eq);
}
}
private String n_contractstate_eq;//[合同状态]
public void setN_contractstate_eq(String n_contractstate_eq) {
this.n_contractstate_eq = n_contractstate_eq;
if(!ObjectUtils.isEmpty(this.n_contractstate_eq)){
this.getSearchCond().eq("contractstate", n_contractstate_eq);
}
}
/**
* 启用快速搜索
......
humanresource-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 55e19c15
......@@ -85,6 +85,18 @@
</column>
<column name="HREMPLOYEEID" remarks="" type="VARCHAR(100)">
</column>
<column name="CONTRACTCODE" remarks="" type="VARCHAR(100)">
</column>
<column name="CONTRACTMODE" remarks="" type="VARCHAR(60)">
</column>
<column name="CONTRACTTYPE" remarks="" type="VARCHAR(60)">
</column>
<column name="BEGINTIME" remarks="" type="DATETIME">
</column>
<column name="ENDTIME" remarks="" type="DATETIME">
</column>
<column name="CONTRACTSTATE" remarks="" type="VARCHAR(60)">
</column>
</createTable>
</changeSet>
......
humanresource-core/src/main/resources/mapper/humanresource/hrcontract/HRContractMapper.xml
浏览文件 @ 55e19c15
......@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="HRContractResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HRCONTRACTID`, t1.`HRCONTRACTNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCONTRACT` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID ) t1 where hrcontractid=#{id}]]>
<![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.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCONTRACT` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID ) t1 where hrcontractid=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
......@@ -37,12 +37,12 @@
<!--数据查询[Default]-->
<sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HRCONTRACTID`, t1.`HRCONTRACTNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCONTRACT` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID
<![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.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCONTRACT` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HRCONTRACTID`, t1.`HRCONTRACTNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCONTRACT` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID
<![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.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCONTRACT` 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/HRContractDTO.java
浏览文件 @ 55e19c15
......@@ -90,6 +90,56 @@ public class HRContractDTO extends DTOBase implements Serializable {
@JsonProperty("hremployeename")
private String hremployeename;
/**
* 属性 [CONTRACTCODE]
*
*/
@JSONField(name = "contractcode")
@JsonProperty("contractcode")
private String contractcode;
/**
* 属性 [CONTRACTMODE]
*
*/
@JSONField(name = "contractmode")
@JsonProperty("contractmode")
private String contractmode;
/**
* 属性 [CONTRACTTYPE]
*
*/
@JSONField(name = "contracttype")
@JsonProperty("contracttype")
private String contracttype;
/**
* 属性 [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;
/**
* 属性 [CONTRACTSTATE]
*
*/
@JSONField(name = "contractstate")
@JsonProperty("contractstate")
private String contractstate;
/**
* 设置 [HRCONTRACTNAME]
......@@ -107,6 +157,54 @@ public class HRContractDTO extends DTOBase implements Serializable {
this.modify("hremployeeid",hremployeeid);
}
/**
* 设置 [CONTRACTCODE]
*/
public void setContractcode(String contractcode){
this.contractcode = contractcode ;
this.modify("contractcode",contractcode);
}
/**
* 设置 [CONTRACTMODE]
*/
public void setContractmode(String contractmode){
this.contractmode = contractmode ;
this.modify("contractmode",contractmode);
}
/**
* 设置 [CONTRACTTYPE]
*/
public void setContracttype(String contracttype){
this.contracttype = contracttype ;
this.modify("contracttype",contracttype);
}
/**
* 设置 [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);
}
/**
* 设置 [CONTRACTSTATE]
*/
public void setContractstate(String contractstate){
this.contractstate = contractstate ;
this.modify("contractstate",contractstate);
}
}
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或