From 6ae35089a05b58dc31c243b9bb4f6a80b20c3a7b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 23 五月 2025 17:44:42 +0800
Subject: [PATCH] 修改接口
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTesterWorkEvaluateServiceImpl.java | 268 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 268 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTesterWorkEvaluateServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTesterWorkEvaluateServiceImpl.java
index 599e83a..a1865e0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTesterWorkEvaluateServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTesterWorkEvaluateServiceImpl.java
@@ -1,10 +1,25 @@
package com.ruoyi.system.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.mapper.TExperimentDispatchParticipantsMapper;
import com.ruoyi.system.mapper.TResultWorkEvaluateMapper;
+import com.ruoyi.system.model.TExperimentDispatchParticipants;
import com.ruoyi.system.model.TResultWorkEvaluate;
+import com.ruoyi.system.query.ResultEvaluateChemistTesterQuery;
+import com.ruoyi.system.query.TResultWorkEvaluateQuery;
import com.ruoyi.system.service.TResultWorkEvaluateService;
+import com.ruoyi.system.vo.ResultEvaluateChemistTesterVO;
+import com.ruoyi.system.vo.TResultWorkEvaluateVO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -17,4 +32,257 @@
@Service
public class TTesterWorkEvaluateServiceImpl extends ServiceImpl<TResultWorkEvaluateMapper, TResultWorkEvaluate> implements TResultWorkEvaluateService {
+ @Autowired
+ private SysUserMapper sysUserMapper;
+ @Autowired
+ private TExperimentDispatchParticipantsMapper experimentDispatchParticipantsMapper;
+
+ @Override
+ public PageInfo<TResultWorkEvaluateVO> pageList(TResultWorkEvaluateQuery query) {
+ PageInfo<TResultWorkEvaluateVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TResultWorkEvaluateVO> list = this.baseMapper.pageList(query,pageInfo);
+ List<TResultWorkEvaluate> tResultWorkEvaluates = this.baseMapper.selectList(new LambdaQueryWrapper<TResultWorkEvaluate>()
+ .orderByDesc(TResultWorkEvaluate::getEvaluateTime));
+ for (TResultWorkEvaluateVO tResultWorkEvaluateVO : list) {
+ List<TResultWorkEvaluate> collect = tResultWorkEvaluates.stream().filter(e ->
+// e.getEvaluateOne()!=null&&
+// e.getEvaluateTwo()!=null&&
+// e.getEvaluateThree()!=null&&
+// e.getEvaluateFour()!=null&&
+// e.getEvaluateFive()!=null&&
+// e.getEvaluateSix()!=null&&
+ e.getStatus()==1&&
+ e.getTeamId().equals(tResultWorkEvaluateVO.getTeamId())).collect(Collectors.toList());
+ if (!collect.isEmpty()){
+ tResultWorkEvaluateVO.setEndTime(collect.get(0).getEvaluateTime());
+ }
+ int temp1=0;
+ int temp2=0;
+ int temp3=0;
+ int temp4=0;
+
+ for (TResultWorkEvaluate tResultWorkEvaluate : collect) {
+ Integer evaluateOne = tResultWorkEvaluate.getEvaluateOne();
+ switch (evaluateOne){
+ case 1:
+ if (tResultWorkEvaluate.getEvaluateType()==1){
+ temp2+=2;
+ }
+ if (tResultWorkEvaluate.getEvaluateType()==2){
+ temp3+=2;
+ }
+ if (tResultWorkEvaluate.getEvaluateType()==3){
+ temp4+=2;
+ }
+ temp1+=2;
+ break;
+ case 2:
+ temp1+=1;
+ if (tResultWorkEvaluate.getEvaluateType()==1){
+ temp2+=1;
+ }
+ if (tResultWorkEvaluate.getEvaluateType()==2){
+ temp3+=1;
+ }
+ if (tResultWorkEvaluate.getEvaluateType()==3){
+ temp4+=1;
+ }
+ break;
+
+ }
+ Integer evaluateTwo = tResultWorkEvaluate.getEvaluateTwo();
+ switch (evaluateTwo){
+ case 1:
+ temp1+=2;
+ if (tResultWorkEvaluate.getEvaluateType()==1){
+ temp2+=2;
+ }
+ if (tResultWorkEvaluate.getEvaluateType()==2){
+ temp3+=2;
+ }
+ if (tResultWorkEvaluate.getEvaluateType()==3){
+ temp4+=2;
+ }
+ break;
+ case 2:
+ temp1+=1;
+ if (tResultWorkEvaluate.getEvaluateType()==1){
+ temp2+=1;
+ }
+ if (tResultWorkEvaluate.getEvaluateType()==2){
+ temp3+=1;
+ }
+ if (tResultWorkEvaluate.getEvaluateType()==3){
+ temp4+=1;
+ }
+ break;
+ }
+ Integer evaluateThree = tResultWorkEvaluate.getEvaluateThree();
+ switch (evaluateThree){
+ case 1:
+ temp1+=2;
+ if (tResultWorkEvaluate.getEvaluateType()==1){
+ temp2+=2;
+ }
+ if (tResultWorkEvaluate.getEvaluateType()==2){
+ temp3+=2;
+ }
+ if (tResultWorkEvaluate.getEvaluateType()==3){
+ temp4+=2;
+ }
+ break;
+ case 2:
+ temp1+=1;
+ if (tResultWorkEvaluate.getEvaluateType()==1){
+ temp2+=1;
+ }
+ if (tResultWorkEvaluate.getEvaluateType()==2){
+ temp3+=1;
+ }
+ if (tResultWorkEvaluate.getEvaluateType()==3){
+ temp4+=1;
+ }
+ break;
+ }
+ Integer evaluateFour = tResultWorkEvaluate.getEvaluateFour();
+ switch (evaluateFour){
+ case 1:
+ temp1+=2;
+ if (tResultWorkEvaluate.getEvaluateType()==1){
+ temp2+=2;
+ }
+ if (tResultWorkEvaluate.getEvaluateType()==2){
+ temp3+=2;
+ }
+ if (tResultWorkEvaluate.getEvaluateType()==3){
+ temp4+=2;
+ }
+ break;
+ case 2:
+ temp1+=1;
+ if (tResultWorkEvaluate.getEvaluateType()==1){
+ temp2+=1;
+ }
+ if (tResultWorkEvaluate.getEvaluateType()==2){
+ temp3+=1;
+ }
+ if (tResultWorkEvaluate.getEvaluateType()==3){
+ temp4+=1;
+ }
+ break;
+ }
+ Integer evaluateFive = tResultWorkEvaluate.getEvaluateFive();
+ switch (evaluateFive){
+ case 1:
+ temp1+=2;
+ if (tResultWorkEvaluate.getEvaluateType()==1){
+ temp2+=2;
+ }
+ if (tResultWorkEvaluate.getEvaluateType()==2){
+ temp3+=2;
+ }
+ if (tResultWorkEvaluate.getEvaluateType()==3){
+ temp4+=2;
+ }
+ break;
+ case 2:
+ temp1+=1;
+ if (tResultWorkEvaluate.getEvaluateType()==1){
+ temp2+=1;
+ }
+ if (tResultWorkEvaluate.getEvaluateType()==2){
+ temp3+=1;
+ }
+ if (tResultWorkEvaluate.getEvaluateType()==3){
+ temp4+=1;
+ }
+ break;
+ }
+ Integer evaluateSix = tResultWorkEvaluate.getEvaluateSix();
+ switch (evaluateSix){
+ case 1:
+ temp1+=2;
+ if (tResultWorkEvaluate.getEvaluateType()==1){
+ temp2-=3;
+ }
+ if (tResultWorkEvaluate.getEvaluateType()==2){
+ temp3-=3;
+ }
+ if (tResultWorkEvaluate.getEvaluateType()==3){
+ temp4-=3;
+ }
+ break;
+ }
+ }
+ tResultWorkEvaluateVO.setTeamIntegral(temp1);
+ tResultWorkEvaluateVO.setEngineerIntegral(temp2);
+ tResultWorkEvaluateVO.setChemistIntegral(temp3);
+ tResultWorkEvaluateVO.setTesterIntegral(temp4);
+ }
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
+
+ @Override
+ public PageInfo<TResultWorkEvaluateVO> chemistEvaluateList(TResultWorkEvaluateQuery query) {
+ PageInfo<TResultWorkEvaluateVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TResultWorkEvaluateVO> list = this.baseMapper.chemistEvaluateList(query,pageInfo);
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
+ @Override
+ public PageInfo<TResultWorkEvaluateVO> testerEvaluateList(TResultWorkEvaluateQuery query) {
+ PageInfo<TResultWorkEvaluateVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TResultWorkEvaluateVO> list = this.baseMapper.testerEvaluateList(query,pageInfo);
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
+
+ @Override
+ public PageInfo<ResultEvaluateChemistTesterVO> getEvaluateChemistPageList(ResultEvaluateChemistTesterQuery query) {
+ PageInfo<ResultEvaluateChemistTesterVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<ResultEvaluateChemistTesterVO> list = this.baseMapper.getEvaluateChemistPageList(query,pageInfo);
+ if(!CollectionUtils.isEmpty(list)){
+ // 查询工艺工程师的名称
+ List<String> dispatchIds = list.stream().map(ResultEvaluateChemistTesterVO::getDispatchId).collect(Collectors.toList());
+ List<TExperimentDispatchParticipants> experimentDispatchParticipants = experimentDispatchParticipantsMapper.selectList(new LambdaQueryWrapper<TExperimentDispatchParticipants>()
+ .in(TExperimentDispatchParticipants::getDispatchId, dispatchIds)
+ .eq(TExperimentDispatchParticipants::getRoleType, 3));
+ List<Long> userIds = experimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getUserId).collect(Collectors.toList());
+ if(!CollectionUtils.isEmpty(userIds)){
+ List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
+ for (ResultEvaluateChemistTesterVO resultEvaluateChemistTesterVO : list) {
+ sysUsers.stream().filter(sysUser -> sysUser.getUserId().equals(resultEvaluateChemistTesterVO.getParticipantsId())).findFirst().ifPresent(sysUser -> {
+ resultEvaluateChemistTesterVO.setProcessEngineerName(sysUser.getNickName());
+ });
+ }
+ }
+ }
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
+
+ @Override
+ public PageInfo<ResultEvaluateChemistTesterVO> getEvaluateTesterPageList(ResultEvaluateChemistTesterQuery query) {
+ PageInfo<ResultEvaluateChemistTesterVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<ResultEvaluateChemistTesterVO> list = this.baseMapper.getEvaluateTesterPageList(query,pageInfo);
+ if(!CollectionUtils.isEmpty(list)){
+ // 查询工艺工程师的名称
+ List<String> dispatchIds = list.stream().map(ResultEvaluateChemistTesterVO::getDispatchId).collect(Collectors.toList());
+ List<TExperimentDispatchParticipants> experimentDispatchParticipants = experimentDispatchParticipantsMapper.selectList(new LambdaQueryWrapper<TExperimentDispatchParticipants>()
+ .in(TExperimentDispatchParticipants::getDispatchId, dispatchIds)
+ .eq(TExperimentDispatchParticipants::getRoleType, 3));
+ List<Long> userIds = experimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getUserId).collect(Collectors.toList());
+ if(!CollectionUtils.isEmpty(userIds)){
+ List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
+ for (ResultEvaluateChemistTesterVO resultEvaluateChemistTesterVO : list) {
+ sysUsers.stream().filter(sysUser -> sysUser.getUserId().equals(resultEvaluateChemistTesterVO.getParticipantsId())).findFirst().ifPresent(sysUser -> {
+ resultEvaluateChemistTesterVO.setProcessEngineerName(sysUser.getNickName());
+ });
+ }
+ }
+ }
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
}
--
Gitblit v1.7.1