修改业绩指标计划、业绩指标考评任务中心点击同意待审核问题

ims-service/ims-eval/src/main/java/com/ims/eval/controller/DepartmentalPerformanceIndicatorAssessmentController.java

@@ -2,6 +2,7 @@ package com.ims.eval.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ims.common.utils.StringUtils;
 import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.EvaluationDept;
 import com.ims.eval.entity.EvaluationDeptBusinessAssessment;
@@ -200,29 +201,6 @@ public class DepartmentalPerformanceIndicatorAssessmentController {
 	}
 
 	/**
-	 * 校验审核状态
-	 *
-	 * @param id 主键
-	 * @return 结果
-	 */
-	@GetMapping(value = "/checkAuditStatus/{id}/{deptId}")
-	public R checkAuditStatus(@PathVariable String id, @PathVariable String deptId) {
-		boolean b = true;
-		List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList = evaluationDeptBusinessContentService.selectEvaluationDeptBusinessContentListByBusinessPlanId(id, deptId);
-		for (EvaluationDeptBusinessContent evaluationDeptBusinessContent : evaluationDeptBusinessContentList) {
-			if (!"0".equals(evaluationDeptBusinessContent.getAuditStatusKp())) {
-				b = false;
-				break;
-			}
-		}
-		if (b) {
-			return R.ok().data(b);
-		} else {
-			return R.error("行数据审核状态未通过！");
-		}
-	}
-
-	/**
 	 * 导入
 	 *
 	 * @param file 文件
@@ -269,4 +247,33 @@ public class DepartmentalPerformanceIndicatorAssessmentController {
 		}
 		return R.error("上传文件为空！");
 	}
+
+	/**
+	 * 校验审核状态
+	 *
+	 * @param id 主键
+	 * @return 结果
+	 */
+	@GetMapping(value = "/checkAuditStatus/{id}/{deptId}")
+	public R checkAuditStatus(@PathVariable String id, @PathVariable String deptId) {
+		boolean b = true;
+		if ("23031009".equals(deptId)) {//组织人事部
+			QueryWrapper<EvaluationDeptBusinessContent> qw = new QueryWrapper<>();
+			if (StringUtils.isNotEmpty(id)) {
+				qw.lambda().like(EvaluationDeptBusinessContent::getBusinessPlanId, id);
+			}
+			List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList = evaluationDeptBusinessContentService.list(qw);
+			for (EvaluationDeptBusinessContent evaluationDeptBusinessContent : evaluationDeptBusinessContentList) {
+				if (!"0".equals(evaluationDeptBusinessContent.getAuditStatusKp())) {
+					b = false;
+					break;
+				}
+			}
+		}
+		if (b) {
+			return R.ok().data(b);
+		} else {
+			return R.error("行数据审核状态未通过！");
+		}
+	}
 }

ims-service/ims-eval/src/main/java/com/ims/eval/controller/DepartmentalPerformanceIndicatorPlanController.java

@@ -385,11 +385,17 @@ public class DepartmentalPerformanceIndicatorPlanController {
 	@GetMapping(value = "/checkAuditStatus/{id}/{deptId}")
 	public R checkAuditStatus(@PathVariable String id, @PathVariable String deptId) {
 		boolean b = true;
-		List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList = evaluationDeptBusinessContentService.selectEvaluationDeptBusinessContentListByBusinessPlanId(id, deptId);
-		for (EvaluationDeptBusinessContent evaluationDeptBusinessContent : evaluationDeptBusinessContentList) {
-			if (!"0".equals(evaluationDeptBusinessContent.getAuditStatus())) {
-				b = false;
-				break;
+		if ("23031009".equals(deptId)) {//组织人事部
+			QueryWrapper<EvaluationDeptBusinessContent> qw = new QueryWrapper<>();
+			if (StringUtils.isNotEmpty(id)) {
+				qw.lambda().like(EvaluationDeptBusinessContent::getBusinessPlanId, id);
+			}
+			List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList = evaluationDeptBusinessContentService.list(qw);
+			for (EvaluationDeptBusinessContent evaluationDeptBusinessContent : evaluationDeptBusinessContentList) {
+				if (!"0".equals(evaluationDeptBusinessContent.getAuditStatus())) {
+					b = false;
+					break;
+				}
 			}
 		}
 		if (b) {