From c30702877697d221ded693cf73a5c450e24d2d13 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 14 Dec 2023 11:03:21 +0800
Subject: [PATCH] 评分功能
---
src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetDeptWrapper.java | 21 ++++++++++++++++++++-
src/main/java/org/springblade/modules/assessment/vo/AssessmentSetDeptVO.java | 6 ++++++
src/main/java/org/springblade/modules/assessment/vo/AssessmentSetVO.java | 6 ++++++
src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetWrapper.java | 23 ++++++++++++++++++++---
4 files changed, 52 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/assessment/vo/AssessmentSetDeptVO.java b/src/main/java/org/springblade/modules/assessment/vo/AssessmentSetDeptVO.java
index c59cac9..cedf5a0 100644
--- a/src/main/java/org/springblade/modules/assessment/vo/AssessmentSetDeptVO.java
+++ b/src/main/java/org/springblade/modules/assessment/vo/AssessmentSetDeptVO.java
@@ -16,6 +16,8 @@
*/
package org.springblade.modules.assessment.vo;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.modules.assessment.entity.AssessmentSetDeptEntity;
@@ -39,6 +41,10 @@
private String toPostName;
+ @JsonSerialize(nullsUsing = NullSerializer.class)
private AssessmentTaskVO assessmentTaskVO;
+ @JsonSerialize(nullsUsing = NullSerializer.class)
+ private AssessmentScoreVO assessmentScoreVO;
+
}
diff --git a/src/main/java/org/springblade/modules/assessment/vo/AssessmentSetVO.java b/src/main/java/org/springblade/modules/assessment/vo/AssessmentSetVO.java
index 2f922d3..f5118a8 100644
--- a/src/main/java/org/springblade/modules/assessment/vo/AssessmentSetVO.java
+++ b/src/main/java/org/springblade/modules/assessment/vo/AssessmentSetVO.java
@@ -16,6 +16,8 @@
*/
package org.springblade.modules.assessment.vo;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
import org.springblade.modules.assessment.entity.AssessmentSetEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -43,6 +45,10 @@
private String toPostName;
+ @JsonSerialize(nullsUsing = NullSerializer.class)
private AssessmentTaskVO assessmentTaskVO;
+ @JsonSerialize(nullsUsing = NullSerializer.class)
+ private AssessmentScoreVO assessmentScoreVO;
+
}
diff --git a/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetDeptWrapper.java b/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetDeptWrapper.java
index 25c3dcf..9028fa6 100644
--- a/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetDeptWrapper.java
+++ b/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetDeptWrapper.java
@@ -24,9 +24,11 @@
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.SpringUtil;
+import org.springblade.modules.assessment.entity.AssessmentScoreEntity;
import org.springblade.modules.assessment.entity.AssessmentSetDeptEntity;
import org.springblade.modules.assessment.entity.AssessmentSetEntity;
import org.springblade.modules.assessment.entity.AssessmentTaskEntity;
+import org.springblade.modules.assessment.service.IAssessmentScoreService;
import org.springblade.modules.assessment.service.IAssessmentTaskService;
import org.springblade.modules.assessment.vo.AssessmentSetDeptVO;
import org.springblade.modules.assessment.vo.AssessmentSetVO;
@@ -46,8 +48,11 @@
private static final IAssessmentTaskService assessmentTaskService;
+ private static final IAssessmentScoreService assessmentScoreService;
+
static {
assessmentTaskService = SpringUtil.getBean(IAssessmentTaskService.class);
+ assessmentScoreService = SpringUtil.getBean(IAssessmentScoreService.class);
}
public static AssessmentSetDeptWrapper build() {
@@ -83,7 +88,21 @@
QueryWrapper<AssessmentTaskEntity> wrapper = new QueryWrapper<>();
wrapper.eq("type", 1);
wrapper.gt("end_time", LocalDateTime.now());
- vo.setAssessmentTaskVO(AssessmentTaskWrapper.build().entityVO(assessmentTaskService.list(wrapper).get(0)));
+ List<AssessmentTaskEntity> assessmentTaskEntityList = assessmentTaskService.list(wrapper);
+ if (assessmentTaskEntityList.size() > 0)
+ vo.setAssessmentTaskVO(AssessmentTaskWrapper.build().entityVO(assessmentTaskEntityList.get(0)));
+ else
+ vo.setAssessmentTaskVO(null);
+
+ QueryWrapper<AssessmentScoreEntity> setEntityQueryWrapper = new QueryWrapper<>();
+ setEntityQueryWrapper.eq("score_user_id", vo.getToUserId()); //考核人id
+ setEntityQueryWrapper.eq("be_id", vo.getDeptId()); //被考核人id
+ setEntityQueryWrapper.eq("assessment_task_id", vo.getAssessmentTaskVO().getId());//考核任务
+ List<AssessmentScoreEntity> assessmentScoreEntityList = assessmentScoreService.list(setEntityQueryWrapper);
+ if (assessmentScoreEntityList.size() > 0)
+ vo.setAssessmentScoreVO(AssessmentScoreWrapper.build().entityVO(assessmentScoreEntityList.get(0)));
+ else
+ vo.setAssessmentScoreVO(null);
}
IPage<AssessmentSetDeptVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
pageVo.setRecords(records);
diff --git a/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetWrapper.java b/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetWrapper.java
index 58bb312..2faf152 100644
--- a/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetWrapper.java
+++ b/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetWrapper.java
@@ -24,13 +24,13 @@
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.SpringUtil;
+import org.springblade.modules.assessment.entity.AssessmentScoreEntity;
import org.springblade.modules.assessment.entity.AssessmentSetEntity;
import org.springblade.modules.assessment.entity.AssessmentTaskEntity;
+import org.springblade.modules.assessment.service.IAssessmentScoreService;
import org.springblade.modules.assessment.service.IAssessmentTaskService;
import org.springblade.modules.assessment.vo.AssessmentSetVO;
import org.springblade.modules.system.entity.User;
-import org.springblade.modules.system.service.IUserService;
-import org.springframework.beans.factory.annotation.Autowired;
import java.time.LocalDateTime;
import java.util.List;
@@ -45,9 +45,11 @@
public class AssessmentSetWrapper extends BaseEntityWrapper<AssessmentSetEntity, AssessmentSetVO> {
private static final IAssessmentTaskService assessmentTaskService;
+ private static final IAssessmentScoreService assessmentScoreService;
static {
assessmentTaskService = SpringUtil.getBean(IAssessmentTaskService.class);
+ assessmentScoreService = SpringUtil.getBean(IAssessmentScoreService.class);
}
public static AssessmentSetWrapper build() {
@@ -88,7 +90,22 @@
QueryWrapper<AssessmentTaskEntity> wrapper = new QueryWrapper<>();
wrapper.eq("type", 0);
wrapper.gt("end_time", LocalDateTime.now());
- vo.setAssessmentTaskVO(AssessmentTaskWrapper.build().entityVO(assessmentTaskService.list(wrapper).get(0)));
+ List<AssessmentTaskEntity> assessmentTaskEntityList = assessmentTaskService.list(wrapper);
+ if (assessmentTaskEntityList.size() > 0)
+ vo.setAssessmentTaskVO(AssessmentTaskWrapper.build().entityVO(assessmentTaskEntityList.get(0)));
+ else
+ vo.setAssessmentTaskVO(null);
+
+
+ QueryWrapper<AssessmentScoreEntity> setEntityQueryWrapper = new QueryWrapper<>();
+ setEntityQueryWrapper.eq("score_user_id", vo.getToUserId()); //考核人id
+ setEntityQueryWrapper.eq("be_id", vo.getUserId()); //被考核人id
+ setEntityQueryWrapper.eq("assessment_task_id", vo.getAssessmentTaskVO().getId());//考核任务
+ List<AssessmentScoreEntity> assessmentScoreEntityList = assessmentScoreService.list(setEntityQueryWrapper);
+ if (assessmentScoreEntityList.size() > 0)
+ vo.setAssessmentScoreVO(AssessmentScoreWrapper.build().entityVO(assessmentScoreEntityList.get(0)));
+ else
+ vo.setAssessmentScoreVO(null);
}
IPage<AssessmentSetVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
pageVo.setRecords(records);
--
Gitblit v1.9.3