|
@@ -6,6 +6,7 @@ import java.util.Optional;
|
6
|
6
|
import javax.servlet.http.HttpServletResponse;
|
7
|
7
|
|
8
|
8
|
import com.ruoyi.common.constant.HttpStatus;
|
|
9
|
+import com.ruoyi.common.constant.PostProgrammeEnum;
|
9
|
10
|
import com.ruoyi.common.core.domain.entity.SysDept;
|
10
|
11
|
import com.ruoyi.common.core.domain.model.LoginUser;
|
11
|
12
|
import com.ruoyi.common.enums.DeptCode;
|
|
@@ -209,8 +210,8 @@ public class PostProgrammeController extends BaseController {
|
209
|
210
|
PostProgramme postProgramme = postProgrammeService.selectPostProgrammeById(id);
|
210
|
211
|
// 审核过得不在审核
|
211
|
212
|
|
212
|
|
- if (postProgramme.getStatusHr() == 3) {
|
213
|
|
- return AjaxResult.error(HttpStatus.SUCCESS, "审核失败,请勿重复审核!");
|
|
213
|
+ if (postProgramme.getStatusHr() == PostProgrammeEnum.STATUS_HR_PASS.getValue()) {
|
|
214
|
+ return AjaxResult.error("审核失败,请勿重复审核!");
|
214
|
215
|
}
|
215
|
216
|
// 判断审核的权限
|
216
|
217
|
LoginUser loginUser = SecurityUtils.getLoginUser();
|
|
@@ -241,12 +242,13 @@ public class PostProgrammeController extends BaseController {
|
241
|
242
|
// 判断当前状态
|
242
|
243
|
PostProgramme postProgramme = postProgrammeService.selectPostProgrammeById(id);
|
243
|
244
|
// 审核过得不在审核
|
244
|
|
- if (postProgramme.getStatusHr() != 3) {
|
245
|
|
- return AjaxResult.error(HttpStatus.SUCCESS,"审核失败,审核流程有误!!");
|
|
245
|
+ if (postProgramme.getStatusHr() != PostProgrammeEnum.STATUS_PASS.getValue()
|
|
246
|
+ && postProgramme.getStatus() == PostProgrammeEnum.STATUS_ING.getValue()) {
|
|
247
|
+ return AjaxResult.error(HttpStatus.WARN,"审核失败,审核流程有误!!");
|
246
|
248
|
}
|
247
|
249
|
|
248
|
|
- if (postProgramme.getStatusIcfa() == 3) {
|
249
|
|
- return AjaxResult.error(HttpStatus.SUCCESS,"审核失败,请勿重复审核!");
|
|
250
|
+ if (postProgramme.getStatusIcfa() == PostProgrammeEnum.STATUS_ICFA_PASS.getValue()) {
|
|
251
|
+ return AjaxResult.error("审核失败,请勿重复审核!");
|
250
|
252
|
}
|
251
|
253
|
// 判断审核的权限
|
252
|
254
|
LoginUser loginUser = SecurityUtils.getLoginUser();
|