liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!68 编制变更 

Merge pull request !68 from dxfeng/feature/dxf
This commit is contained in:
dxfeng 2022-06-08 02:26:26 +00:00 committed by Gitee
parent 4d9deca782 9877308b84
commit 153b34205d
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/engine/organization/mapper/staff/StaffMapper.xml
View File

@ -48,9 +48,10 @@
from jcl_org_staffs
where delete_type = 0
</select>
<select id="getStaffByFilter" resultType="com.engine.organization.entity.staff.po.StaffPO">
select staff_id
from jcl_org_staffs
<select id="getStaffByFilter" resultMap="BaseResultMap">
select
<include refid="baseColumns"/>
from jcl_org_staff t
where delete_type = 0
<if test="companyId != null">
and comp_id = #{companyId}
@ -58,8 +59,8 @@
<if test="departmentId != null">
and dept_id = #{departmentId}
</if>
<if test="JobId != null">
and job_id = #{companyId}
<if test="jobId != null">
and job_id = #{jobId}
</if>
</select>

11
src/weaver/interfaces/organization/action/StaffChangeAction.java
View File

@ -12,6 +12,9 @@ import weaver.interfaces.workflow.action.Action;
import weaver.soa.workflow.request.MainTableInfo;
import weaver.soa.workflow.request.Property;
import weaver.soa.workflow.request.RequestInfo;
import weaver.workflow.request.RequestManager;
import java.util.Date;
/**
* @description: TODO
@ -27,7 +30,8 @@ public class StaffChangeAction implements Action {
Long departmentId = null;
Long jobId = null;
Integer changeNum = null;
Integer businessSource = null;
RequestManager requestManager = requestInfo.getRequestManager();
int creator = requestManager.getCreater();
MainTableInfo mainTableInfo = requestInfo.getMainTableInfo();
Property[] property = mainTableInfo.getProperty();
// 取表单数据赋值
@ -49,9 +53,6 @@ public class StaffChangeAction implements Action {
case "bzbds":
changeNum = Integer.parseInt(value);
break;
case "ywly":
businessSource = Integer.parseInt(value);
break;
default:
break;
}
@ -64,7 +65,7 @@ public class StaffChangeAction implements Action {
if (null != staffPO) {
// 插入明细表
StaffsPO staffsPO = StaffsPO.builder().staffId(staffPO.getId()).businessType(2).changeNum(changeNum).businessSource(businessSource).requestId(requestid).build();
StaffsPO staffsPO = StaffsPO.builder().staffId(staffPO.getId()).businessType(2).changeNum(changeNum).businessSource(2).requestId(requestid).deleteType(0).creator((long) creator).createTime(new Date()).build();
MapperProxyFactory.getProxy(StaffsMapper.class).insertIgnoreNull(staffsPO);
// 更新编制表