|
@@ -258,15 +258,25 @@ public class DepartmentalPerformanceIndicatorAssessmentController {
|
|
|
@GetMapping(value = "/checkAuditStatus/{id}/{deptId}")
|
|
|
public R checkAuditStatus(@PathVariable String id, @PathVariable String deptId) {
|
|
|
boolean b = true;
|
|
|
+ String msg = "";
|
|
|
+ QueryWrapper<EvaluationDeptBusinessContent> qw = new QueryWrapper<>();
|
|
|
+ if (StringUtils.isNotEmpty(id)) {
|
|
|
+ qw.lambda().like(EvaluationDeptBusinessContent::getBusinessPlanId, id);
|
|
|
+ }
|
|
|
+ List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList = evaluationDeptBusinessContentService.list(qw);
|
|
|
if ("23031009".equals(deptId)) {//组织人事部
|
|
|
- QueryWrapper<EvaluationDeptBusinessContent> qw = new QueryWrapper<>();
|
|
|
- if (StringUtils.isNotEmpty(id)) {
|
|
|
- qw.lambda().like(EvaluationDeptBusinessContent::getBusinessPlanId, id);
|
|
|
+ for (EvaluationDeptBusinessContent evaluationDeptBusinessContent : evaluationDeptBusinessContentList) {
|
|
|
+ if (!"0".equals(evaluationDeptBusinessContent.getAuditStatusKp())) {
|
|
|
+ b = false;
|
|
|
+ msg = "数据审核状态未通过!";
|
|
|
+ break;
|
|
|
+ }
|
|
|
}
|
|
|
- List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList = evaluationDeptBusinessContentService.list(qw);
|
|
|
+ } else {
|
|
|
for (EvaluationDeptBusinessContent evaluationDeptBusinessContent : evaluationDeptBusinessContentList) {
|
|
|
if (!"0".equals(evaluationDeptBusinessContent.getAuditStatusKp())) {
|
|
|
b = false;
|
|
|
+ msg = "数据审核状态未通过,请联系相关部门进行审核!";
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
@@ -274,7 +284,7 @@ public class DepartmentalPerformanceIndicatorAssessmentController {
|
|
|
if (b) {
|
|
|
return R.ok().data(b);
|
|
|
} else {
|
|
|
- return R.error("行数据审核状态未通过!");
|
|
|
+ return R.error(msg);
|
|
|
}
|
|
|
}
|
|
|
}
|