From f31ae33e37895b9517ee6ace6bd703f4bbb47e81 Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期日, 23 六月 2024 23:44:30 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- performance-server/src/main/java/com/yuanchu/mom/service/impl/EvaluateGroupServiceImpl.java | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/impl/EvaluateGroupServiceImpl.java b/performance-server/src/main/java/com/yuanchu/mom/service/impl/EvaluateGroupServiceImpl.java index d16bc28..85feb33 100644 --- a/performance-server/src/main/java/com/yuanchu/mom/service/impl/EvaluateGroupServiceImpl.java +++ b/performance-server/src/main/java/com/yuanchu/mom/service/impl/EvaluateGroupServiceImpl.java @@ -1,10 +1,18 @@ package com.yuanchu.mom.service.impl; +import com.yuanchu.mom.dto.EvaluateGroupDto; +import com.yuanchu.mom.mapper.EvaluateCompetentMapper; +import com.yuanchu.mom.mapper.EvaluateLeaderMapper; +import com.yuanchu.mom.mapper.EvaluateMapper; +import com.yuanchu.mom.pojo.Evaluate; import com.yuanchu.mom.pojo.EvaluateGroup; import com.yuanchu.mom.mapper.EvaluateGroupMapper; import com.yuanchu.mom.service.EvaluateGroupService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; /** * <p> @@ -17,4 +25,28 @@ @Service public class EvaluateGroupServiceImpl extends ServiceImpl<EvaluateGroupMapper, EvaluateGroup> implements EvaluateGroupService { + @Resource + EvaluateGroupMapper evaluateGroupMapper; + + @Resource + EvaluateMapper evaluateMapper; + + //鏌ヨ鍛樺伐浜掕瘎 + @Override + public List<EvaluateGroup> getEvaluateGroup(EvaluateGroupDto evaluateGroupDto) { + return evaluateGroupMapper.getEvaluateGroup(evaluateGroupDto.getMonth(), evaluateGroupDto.getDepartLims(), evaluateGroupDto.getName()); + } + + //濉啓鍛樺伐浜掕瘎 + @Override + public Double writeEvaluateGroup(EvaluateGroup evaluateGroup) { + double newTotal = evaluateGroup.getSeasonable() + evaluateGroup.getExact() + evaluateGroup.getSkill() + evaluateGroup.getPreserve() + evaluateGroup.getDiscipline() + evaluateGroup.getSolidarity() + evaluateGroup.getTidy(); + EvaluateGroup evaluateGroup1 = evaluateGroupMapper.selectById(evaluateGroup.getId()); + Evaluate evaluate = evaluateMapper.selectById(evaluateGroup.getEvaluateId()); + evaluate.setScore(evaluate.getScore() - evaluateGroup1.getTotal()*0.2 + newTotal*0.2); + evaluateMapper.updateById(evaluate); + evaluateGroup.setTotal(newTotal); + evaluateGroupMapper.updateById(evaluateGroup); + return newTotal; + } } -- Gitblit v1.9.3