|
@@ -105,7 +105,7 @@ public class PostProgrammeServiceImpl extends ServiceImpl<PostProgrammeMapper, P
|
105
|
105
|
}
|
106
|
106
|
|
107
|
107
|
/**
|
108
|
|
- * 审核1:岗检方案审核-HR
|
|
108
|
+ * 审核2:岗检方案审核-HR
|
109
|
109
|
*
|
110
|
110
|
* @param id 主键ID
|
111
|
111
|
* @param statusHr 1-人力资源审批-状态:1-待审核;3-通过;4-驳回;
|
|
@@ -136,16 +136,13 @@ public class PostProgrammeServiceImpl extends ServiceImpl<PostProgrammeMapper, P
|
136
|
136
|
data.setDateHr(DateUtils.getNowDate());
|
137
|
137
|
data.setStatusHrUserId(SecurityUtils.getUserId());
|
138
|
138
|
if (statusHr == PostPlanEnum.STATUS_HR_PASS.getValue()) {
|
139
|
|
- data.setStatus(PostProgrammeEnum.STATUS_ING.getValue());//审核中
|
140
|
139
|
data.setStep(PostProgrammeEnum.STEP_UP.getValue());
|
141
|
|
- } else {
|
142
|
|
- data.setStatus(PostPlanEnum.STATUS_BACK.getValue());//驳回
|
143
|
140
|
}
|
144
|
141
|
return postProgrammeMapper.updatePostProgramme(data);
|
145
|
142
|
}
|
146
|
143
|
|
147
|
144
|
/**
|
148
|
|
- * 审核2:岗检方案审核-Icfa
|
|
145
|
+ * 审核1:岗检方案审核-Icfa
|
149
|
146
|
*
|
150
|
147
|
* @param id 主键ID
|
151
|
148
|
* @param statusIcfa 2-内控法务部审批-状态:1-待审核;3-通过;4-驳回;
|
|
@@ -173,8 +170,11 @@ public class PostProgrammeServiceImpl extends ServiceImpl<PostProgrammeMapper, P
|
173
|
170
|
data.setStatusIcfa(statusIcfa);
|
174
|
171
|
data.setReasonIcfa(reasonIcfa);
|
175
|
172
|
data.setStatus(statusIcfa);//最终审核结果
|
176
|
|
- if (statusIcfa == PostProgrammeEnum.STATUS_ICFA_PASS.getValue()) {
|
|
173
|
+ if (statusIcfa == PostPlanEnum.STATUS_HR_PASS.getValue()) {
|
|
174
|
+ data.setStatus(PostProgrammeEnum.STATUS_ING.getValue());//审核中
|
177
|
175
|
data.setStep(PostProgrammeEnum.STEP.getValue());
|
|
176
|
+ } else {
|
|
177
|
+ data.setStatus(PostPlanEnum.STATUS_BACK.getValue());//驳回
|
178
|
178
|
}
|
179
|
179
|
data.setStatusIcfaUserId(SecurityUtils.getUserId());
|
180
|
180
|
data.setDateIcfa(DateUtils.getNowDate());
|