From 9d8243be2ea2f56259bc41b74daaa392a05f9a4a Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 27 Dec 2023 09:16:18 +0800
Subject: [PATCH] 评优结果
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
index 1b4eb08..3fc3598 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
@@ -32,10 +32,13 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.assessment.wrapper.CandidateJsonObj;
+import org.springblade.modules.evaluate.entity.EvaluateResultEntity;
import org.springblade.modules.evaluate.entity.EvaluateTaskEntity;
import org.springblade.modules.evaluate.excel.EvaluateTaskExcel;
+import org.springblade.modules.evaluate.service.IEvaluateResultService;
import org.springblade.modules.evaluate.service.IEvaluateTaskService;
import org.springblade.modules.evaluate.vo.EvaluateTaskVO;
+import org.springblade.modules.evaluate.wrapper.EvaluateResultWrapper;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
import org.springframework.web.bind.annotation.*;
@@ -68,6 +71,8 @@
private final IEvaluateTaskService evaluateTaskService;
private final IUserService userService;
+ private final IEvaluateResultService evaluateResultService;
+
/**
* 评优任务表 详情
*/
@@ -89,6 +94,25 @@
return R.data(EvaluateTaskWrapper.build().pageVO(pages));
}
+ /**
+ * 公司评优
+ * @param userId
+ * @param query
+ * @return
+ */
+ @GetMapping("/companyList/{userId}")
+ public R companyList(@ApiIgnore @PathVariable Long userId, Query query) {
+ QueryWrapper<EvaluateTaskEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("evaluate_state",1).eq("type", 0);
+ IPage<EvaluateTaskEntity> pages = evaluateTaskService.page(Condition.getPage(query), wrapper);
+ return R.data(EvaluateTaskWrapper.build().companyListPageVO(pages,userId));
+ }
+ /**
+ * 个人评优
+ * @param userId
+ * @param query
+ * @return
+ */
@GetMapping("/taskList/{deptId}/{userId}")
public R taskList(@ApiIgnore @PathVariable Long deptId,@ApiIgnore @PathVariable Long userId, Query query) {
QueryWrapper<EvaluateTaskEntity> wrapper = new QueryWrapper<>();
@@ -122,6 +146,29 @@
break;
}
}
+
+ //是否评论完成
+ QueryWrapper<EvaluateResultEntity> resultEntityQueryWrapper = new QueryWrapper<>();
+ resultEntityQueryWrapper.eq("score_user_id", userId);
+ resultEntityQueryWrapper.eq("type", 0);
+ resultEntityQueryWrapper.eq("evaluate_task_id", vo.getId());
+ long reqCount = evaluateResultService.count(resultEntityQueryWrapper);
+ vo.setIsEvaluateOk(reqCount > 0);
+ if (reqCount > 0) {
+ vo.setEvaluateResultVO(EvaluateResultWrapper.build().entityVO(evaluateResultService.getOne(resultEntityQueryWrapper)));
+ }
+
+ } else {
+ //是否评论完成
+ QueryWrapper<EvaluateResultEntity> resultEntityQueryWrapper = new QueryWrapper<>();
+ resultEntityQueryWrapper.eq("score_user_id", userId);
+ resultEntityQueryWrapper.eq("type", 1);
+ resultEntityQueryWrapper.eq("evaluate_task_id", vo.getId());
+ long reqCount = evaluateResultService.count(resultEntityQueryWrapper);
+ vo.setIsEvaluateOk(reqCount > 0);
+ if (reqCount > 0) {
+ vo.setEvaluateResultVO(EvaluateResultWrapper.build().entityVO(evaluateResultService.getOne(resultEntityQueryWrapper)));
+ }
}
}
--
Gitblit v1.9.3