From 6985aa56baf8506d1ae8dec00e0b11afb4a343cf Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Sat, 23 Dec 2023 17:51:16 +0800
Subject: [PATCH] 公司评优
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java | 19 +++++++++
src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskServiceImpl.java | 3 +
src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java | 59 +++++++++++++++++++++++++----
3 files changed, 73 insertions(+), 8 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 b665f32..3fc3598 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
@@ -94,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<>();
diff --git a/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskServiceImpl.java b/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskServiceImpl.java
index e2f2163..1b652d0 100644
--- a/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskServiceImpl.java
+++ b/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskServiceImpl.java
@@ -74,12 +74,15 @@
@Transactional
public boolean saveOrUpdate(EvaluateTaskEntity evaluateTask) {
boolean ret = super.saveOrUpdate(evaluateTask);
+ if (null == evaluateTask.getType()) //
+ return ret;
if (ret) {
//先删除
QueryWrapper<EvaluateTaskSetEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("evaluate_task_id", evaluateTask.getId());
evaluateTaskSetService.remove(queryWrapper);
+
if (evaluateTask.getType() == 0) { //个人评优处理
//保存
JSONArray jsonArray = JSONArray.parseArray(JSONObject.toJSONString(evaluateTask.getCandidateNum()));
diff --git a/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java b/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java
index be7afc6..b9ac3b2 100644
--- a/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java
+++ b/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java
@@ -16,21 +16,20 @@
*/
package org.springblade.modules.evaluate.wrapper;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.common.reflect.TypeToken;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.modules.assessment.wrapper.CandidateJsonObj;
+import org.springblade.core.tool.utils.SpringUtil;
+import org.springblade.modules.evaluate.entity.EvaluateCandidateEntity;
+import org.springblade.modules.evaluate.entity.EvaluateResultEntity;
import org.springblade.modules.evaluate.entity.EvaluateTaskEntity;
+import org.springblade.modules.evaluate.service.IEvaluateCandidateService;
+import org.springblade.modules.evaluate.service.IEvaluateResultService;
import org.springblade.modules.evaluate.vo.EvaluateTaskVO;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
/**
* 评优任务表 包装类,返回视图层所需的字段
@@ -39,6 +38,14 @@
* @since 2023-12-08
*/
public class EvaluateTaskWrapper extends BaseEntityWrapper<EvaluateTaskEntity, EvaluateTaskVO> {
+
+ private static final IEvaluateCandidateService evaluateCandidateService;
+ private static final IEvaluateResultService evaluateResultService;
+
+ static {
+ evaluateCandidateService = SpringUtil.getBean(IEvaluateCandidateService.class);
+ evaluateResultService = SpringUtil.getBean(IEvaluateResultService.class);
+ }
public static EvaluateTaskWrapper build() {
return new EvaluateTaskWrapper();
@@ -56,5 +63,41 @@
return evaluateTaskVO;
}
+ public IPage<EvaluateTaskVO> companyListPageVO(IPage pages,Long userId) {
+ List<EvaluateTaskVO> records = listVO(pages.getRecords());
+
+ for (EvaluateTaskVO vo:records) {
+ if (vo.getEvaluateState() == 1) {
+ QueryWrapper<EvaluateCandidateEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("evaluate_task_id", vo.getId());
+ List<EvaluateCandidateEntity> candidateEntitieList = evaluateCandidateService.list(queryWrapper);
+ List<Map<String,Object>> users = new ArrayList<>();
+ for (EvaluateCandidateEntity evaluateCandidate:candidateEntitieList) {
+ Map<String,Object> user = new HashMap<>();
+ user.put("id",evaluateCandidate.getUserId());
+ user.put("name",evaluateCandidate.getUserName());
+ users.add(user);
+ }
+ vo.setSelfCandidate(users);
+
+ //是否评论完成
+ QueryWrapper<EvaluateResultEntity> resultEntityQueryWrapper = new QueryWrapper<>();
+ resultEntityQueryWrapper.eq("score_user_id", userId);
+ resultEntityQueryWrapper.eq("type", 2);
+ 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)));
+ }
+ }
+ }
+
+ IPage<EvaluateTaskVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
+ pageVo.setRecords(records);
+ return pageVo;
+ }
+
}
--
Gitblit v1.9.3