Skip to content

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

jackwang 部署微服务接口

上级 df820808
隐藏空白字符变更
内嵌 并排
正在显示 包含 109 行增加 和 3 行删除
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/pcm/domain/HRTransferApply.java
浏览文件 @ c11d8535
......@@ -188,6 +188,27 @@ public class HRTransferApply extends EntityMP implements Serializable {
@JSONField(name = "wfinstanceid")
@JsonProperty("wfinstanceid")
private String wfinstanceid;
/**
* 工作流版本
*/
@TableField(value = "wfversion")
@JSONField(name = "wfversion")
@JsonProperty("wfversion")
private String wfversion;
/**
* 工作流步骤
*/
@TableField(value = "wfstep")
@JSONField(name = "wfstep")
@JsonProperty("wfstep")
private String wfstep;
/**
* 工作流状态
*/
@TableField(value = "wfstate")
@JSONField(name = "wfstate")
@JsonProperty("wfstate")
private Integer wfstate;
/**
* 员工
......@@ -305,6 +326,30 @@ public class HRTransferApply extends EntityMP implements Serializable {
this.modify("wfinstanceid",wfinstanceid);
}
/**
* 设置 [工作流版本]
*/
public void setWfversion(String wfversion){
this.wfversion = wfversion ;
this.modify("wfversion",wfversion);
}
/**
* 设置 [工作流步骤]
*/
public void setWfstep(String wfstep){
this.wfstep = wfstep ;
this.modify("wfstep",wfstep);
}
/**
* 设置 [工作流状态]
*/
public void setWfstate(Integer wfstate){
this.wfstate = wfstate ;
this.modify("wfstate",wfstate);
}
}
......
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/pcm/filter/HRTransferApplySearchContext.java
浏览文件 @ c11d8535
......@@ -97,6 +97,13 @@ public class HRTransferApplySearchContext extends QueryWrapperContext<HRTransfer
this.getSearchCond().like("hrpostname2", n_hrpostname2_like);
}
}
private String n_wfstep_eq;//[工作流步骤]
public void setN_wfstep_eq(String n_wfstep_eq) {
this.n_wfstep_eq = n_wfstep_eq;
if(!ObjectUtils.isEmpty(this.n_wfstep_eq)){
this.getSearchCond().eq("wfstep", n_wfstep_eq);
}
}
/**
* 启用快速搜索
......
humanresource-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ c11d8535
......@@ -1021,6 +1021,12 @@
</column>
<column name="WFINSTANCEID" remarks="" type="VARCHAR(100)">
</column>
<column name="WFVERSION" remarks="" type="VARCHAR(100)">
</column>
<column name="WFSTEP" remarks="" type="VARCHAR(60)">
</column>
<column name="WFSTATE" remarks="" type="INT">
</column>
</createTable>
</changeSet>
......
humanresource-core/src/main/resources/mapper/pcm/hrtransferapply/HRTransferApplyMapper.xml
浏览文件 @ c11d8535
......@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="HRTransferApplyResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`ACTIVETIME`, t1.`ATTACHMENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HRDUTYNAME`, t1.`HRDUTYNAME2`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRORGANIZATIONID2`, t31.`ORGANIZATIONNAME` AS `HRORGANIZATIONNAME2`, t1.`HRPOSTID2`, t1.`HRPOSTNAME`, t41.`HRPOSTNAME` AS `HRPOSTNAME2`, t1.`HRTRANSFERAPPLYID`, t1.`HRTRANSFERAPPLYNAME`, t11.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRTRANSFERAPPLY` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t1.HRORGANIZATIONID2 = t31.ORGANIZATIONID LEFT JOIN T_HRPOST t41 ON t1.HRPOSTID2 = t41.HRPOSTID ) t1 where hrtransferapplyid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.`ACTIVETIME`, t1.`ATTACHMENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HRDUTYNAME`, t1.`HRDUTYNAME2`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRORGANIZATIONID2`, t31.`ORGANIZATIONNAME` AS `HRORGANIZATIONNAME2`, t1.`HRPOSTID2`, t1.`HRPOSTNAME`, t41.`HRPOSTNAME` AS `HRPOSTNAME2`, t1.`HRTRANSFERAPPLYID`, t1.`HRTRANSFERAPPLYNAME`, t11.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WFINSTANCEID`, t1.`WFSTATE`, t1.`WFSTEP`, t1.`WFVERSION` FROM `T_HRTRANSFERAPPLY` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t1.HRORGANIZATIONID2 = t31.ORGANIZATIONID LEFT JOIN T_HRPOST t41 ON t1.HRPOSTID2 = t41.HRPOSTID ) t1 where hrtransferapplyid=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
......@@ -57,12 +57,12 @@
<!--数据查询[Default]-->
<sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`ACTIVETIME`, t1.`ATTACHMENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HRDUTYNAME`, t1.`HRDUTYNAME2`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRORGANIZATIONID2`, t31.`ORGANIZATIONNAME` AS `HRORGANIZATIONNAME2`, t1.`HRPOSTID2`, t1.`HRPOSTNAME`, t41.`HRPOSTNAME` AS `HRPOSTNAME2`, t1.`HRTRANSFERAPPLYID`, t1.`HRTRANSFERAPPLYNAME`, t11.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRTRANSFERAPPLY` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t1.HRORGANIZATIONID2 = t31.ORGANIZATIONID LEFT JOIN T_HRPOST t41 ON t1.HRPOSTID2 = t41.HRPOSTID
<![CDATA[ SELECT t1.`ACTIVETIME`, t1.`ATTACHMENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HRDUTYNAME`, t1.`HRDUTYNAME2`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRORGANIZATIONID2`, t31.`ORGANIZATIONNAME` AS `HRORGANIZATIONNAME2`, t1.`HRPOSTID2`, t1.`HRPOSTNAME`, t41.`HRPOSTNAME` AS `HRPOSTNAME2`, t1.`HRTRANSFERAPPLYID`, t1.`HRTRANSFERAPPLYNAME`, t11.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WFINSTANCEID`, t1.`WFSTATE`, t1.`WFSTEP`, t1.`WFVERSION` FROM `T_HRTRANSFERAPPLY` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t1.HRORGANIZATIONID2 = t31.ORGANIZATIONID LEFT JOIN T_HRPOST t41 ON t1.HRPOSTID2 = t41.HRPOSTID
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`ACTIVETIME`, t1.`ATTACHMENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HRDUTYNAME`, t1.`HRDUTYNAME2`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRORGANIZATIONID2`, t31.`ORGANIZATIONNAME` AS `HRORGANIZATIONNAME2`, t1.`HRPOSTID2`, t1.`HRPOSTNAME`, t41.`HRPOSTNAME` AS `HRPOSTNAME2`, t1.`HRTRANSFERAPPLYID`, t1.`HRTRANSFERAPPLYNAME`, t11.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRTRANSFERAPPLY` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t1.HRORGANIZATIONID2 = t31.ORGANIZATIONID LEFT JOIN T_HRPOST t41 ON t1.HRPOSTID2 = t41.HRPOSTID
<![CDATA[ SELECT t1.`ACTIVETIME`, t1.`ATTACHMENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HRDUTYNAME`, t1.`HRDUTYNAME2`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRORGANIZATIONID2`, t31.`ORGANIZATIONNAME` AS `HRORGANIZATIONNAME2`, t1.`HRPOSTID2`, t1.`HRPOSTNAME`, t41.`HRPOSTNAME` AS `HRPOSTNAME2`, t1.`HRTRANSFERAPPLYID`, t1.`HRTRANSFERAPPLYNAME`, t11.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WFINSTANCEID`, t1.`WFSTATE`, t1.`WFSTEP`, t1.`WFVERSION` FROM `T_HRTRANSFERAPPLY` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t1.HRORGANIZATIONID2 = t31.ORGANIZATIONID LEFT JOIN T_HRPOST t41 ON t1.HRPOSTID2 = t41.HRPOSTID
]]>
</sql>
</mapper>
......
humanresource-provider/humanresource-provider-hrapi/src/main/java/cn/ibizlab/humanresource/hrapi/dto/HRTransferApplyDTO.java
浏览文件 @ c11d8535
......@@ -187,6 +187,30 @@ public class HRTransferApplyDTO extends DTOBase implements Serializable {
@JsonProperty("wfinstanceid")
private String wfinstanceid;
/**
* 属性 [WFVERSION]
*
*/
@JSONField(name = "wfversion")
@JsonProperty("wfversion")
private String wfversion;
/**
* 属性 [WFSTEP]
*
*/
@JSONField(name = "wfstep")
@JsonProperty("wfstep")
private String wfstep;
/**
* 属性 [WFSTATE]
*
*/
@JSONField(name = "wfstate")
@JsonProperty("wfstate")
private Integer wfstate;
/**
* 设置 [HRTRANSFERAPPLYNAME]
......@@ -268,6 +292,30 @@ public class HRTransferApplyDTO extends DTOBase implements Serializable {
this.modify("wfinstanceid",wfinstanceid);
}
/**
* 设置 [WFVERSION]
*/
public void setWfversion(String wfversion){
this.wfversion = wfversion ;
this.modify("wfversion",wfversion);
}
/**
* 设置 [WFSTEP]
*/
public void setWfstep(String wfstep){
this.wfstep = wfstep ;
this.modify("wfstep",wfstep);
}
/**
* 设置 [WFSTATE]
*/
public void setWfstate(Integer wfstate){
this.wfstate = wfstate ;
this.modify("wfstate",wfstate);
}
}
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或