From bd8d88e5e984e59a5c895ec1a254e3dbae1f9f21 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 21 Jan 2025 14:55:39 +0800
Subject: [PATCH] 修复
---
src/main/java/org/springblade/modules/assessment/service/impl/AssessmentScoreServiceImpl.java | 65 +++++++++-----------------------
1 files changed, 19 insertions(+), 46 deletions(-)
diff --git a/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentScoreServiceImpl.java b/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentScoreServiceImpl.java
index 0ae4068..0feea92 100644
--- a/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentScoreServiceImpl.java
+++ b/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentScoreServiceImpl.java
@@ -16,26 +16,17 @@
*/
package org.springblade.modules.assessment.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
+import org.springblade.core.mp.base.BaseServiceImpl;
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.IAssessmentSetDeptService;
-import org.springblade.modules.assessment.service.IAssessmentSetService;
-import org.springblade.modules.assessment.service.IAssessmentTaskService;
-import org.springblade.modules.assessment.vo.AssessmentScoreVO;
import org.springblade.modules.assessment.excel.AssessmentScoreExcel;
import org.springblade.modules.assessment.mapper.AssessmentScoreMapper;
import org.springblade.modules.assessment.service.IAssessmentScoreService;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springblade.modules.assessment.vo.AssessmentScoreVO;
import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.Collection;
import java.util.List;
/**
@@ -48,15 +39,24 @@
@AllArgsConstructor
public class AssessmentScoreServiceImpl extends BaseServiceImpl<AssessmentScoreMapper, AssessmentScoreEntity> implements IAssessmentScoreService {
- private final IAssessmentSetService assessmentSetService;
- private final IAssessmentSetDeptService assessmentSetDeptService;
-
- private final IAssessmentTaskService assessmentTaskService;
-
-
@Override
public IPage<AssessmentScoreVO> selectAssessmentScorePage(IPage<AssessmentScoreVO> page, AssessmentScoreVO assessmentScore) {
return page.setRecords(baseMapper.selectAssessmentScorePage(page, assessmentScore));
+ }
+
+ @Override
+ public IPage<AssessmentScoreVO> selectAssessmentScoreInfoPage(IPage<AssessmentScoreVO> page, AssessmentScoreVO assessmentScore) {
+ return page.setRecords(baseMapper.selectAssessmentScoreInfoPage(page, assessmentScore));
+ }
+
+ @Override
+ public IPage<AssessmentScoreVO> selectAssessmentScoreInfoV2Page(IPage<AssessmentScoreVO> page, AssessmentScoreVO assessmentScore) {
+ return page.setRecords(baseMapper.selectAssessmentScoreInfoV2Page(page, assessmentScore));
+ }
+
+ @Override
+ public IPage<AssessmentScoreEntity> selectAssessmentScoreGroupByBeidPage(IPage<AssessmentScoreEntity> page, AssessmentScoreVO assessmentScore) {
+ return page.setRecords(baseMapper.selectAssessmentScoreGroupByBeidPage(page, assessmentScore));
}
@@ -69,31 +69,4 @@
return assessmentScoreList;
}
- @Override
- @Transactional
- public boolean saveOrUpdate(AssessmentScoreEntity entity) {
- boolean ret = super.saveOrUpdate(entity);
-
- long setCount = 0l;
- if (entity.getType() == 0) {
- setCount = assessmentSetService.count();
-
- } else {
- setCount = assessmentSetDeptService.count();
- }
-
- QueryWrapper<AssessmentScoreEntity> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("type",entity.getType());
- queryWrapper.eq("assessment_task_id",entity.getAssessmentTaskId());
- long scoreCount = count(queryWrapper);
-
- if (setCount == scoreCount) {
- AssessmentTaskEntity taskEntity = new AssessmentTaskEntity();
- taskEntity.setId(entity.getAssessmentTaskId());
- taskEntity.setIsAssessmentOk(1);
- assessmentTaskService.updateById(taskEntity);
- }
-
- return ret;
- }
}
--
Gitblit v1.9.3