考核任务修改

xieb

2024-01-05 72ad65195ca3fbf25252673899d751e421dcd001

考核任务修改

 src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java

@@ -16,40 +16,41 @@
 */
package org.springblade.modules.assessment.controller;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import javax.validation.Valid;

import org.springblade.core.secure.BladeUser;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.assessment.entity.*;
import org.springblade.modules.assessment.entity.AssessmentScoreEntity;
import org.springblade.modules.assessment.entity.AssessmentSetAssessorEntity;
import org.springblade.modules.assessment.entity.AssessmentSetEntity;
import org.springblade.modules.assessment.excel.AssessmentScoreExcel;
import org.springblade.modules.assessment.service.IAssessmentScoreService;
import org.springblade.modules.assessment.service.IAssessmentSetAssessorService;
import org.springblade.modules.assessment.service.IAssessmentSetService;
import org.springblade.modules.assessment.service.IAssessmentTaskService;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.assessment.vo.AssessmentScoreVO;
import org.springblade.modules.assessment.excel.AssessmentScoreExcel;
import org.springblade.modules.assessment.wrapper.AssessmentScoreWrapper;
import org.springblade.modules.assessment.service.IAssessmentScoreService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;

import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import java.util.Map;

/**
 * 考核评分 控制器
@@ -125,7 +126,8 @@
        for (AssessmentSetEntity po:assessmentSetEntities) {

            Map<String,Object> map = new HashMap<>();
            map.put("assessmentTaskVO", po);
            map.put("assessmentSetVO", po.getAssessmentTaskId()); //被考核人
            map.put("assessmentTaskVO", assessmentTaskService.getById(po.getAssessmentTaskId())); //考核任务

            QueryWrapper<AssessmentSetAssessorEntity> assessmentSetAssessorEntityQueryWrapper = new QueryWrapper<>();
            assessmentSetAssessorEntityQueryWrapper.eq("assessment_set_id",po.getId());

 src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetAssessorWrapper.java

@@ -30,8 +30,6 @@
import org.springblade.modules.assessment.vo.AssessmentScoreVO;
import org.springblade.modules.assessment.vo.AssessmentSetAssessorVO;
import org.springblade.modules.assessment.vo.AssessmentSetVO;
import org.springblade.modules.evaluate.service.IEvaluateCandidateService;
import org.springblade.modules.evaluate.vo.EvaluateCandidateAssessorVO;

import java.util.List;
import java.util.Objects;
@@ -85,7 +83,12 @@
            QueryWrapper queryWrapper = new QueryWrapper();
            queryWrapper.eq("type", vo.getAssessmentTaskVO().getType());//任务状态是个人还是部门 0：个人1：部门  自己是否评论完成，根据type获取对应的考核结果数量。
            queryWrapper.eq("score_user_id", userId);// 考核人id
            queryWrapper.eq("be_id", assessmentSetVO.getUserId());// 被考核人id

            if (vo.getAssessmentTaskVO().getType() == 0)
                queryWrapper.eq("be_id", assessmentSetVO.getUserId());// 被考核人id
            else
                queryWrapper.eq("be_id", assessmentSetVO.getDeptId());// 被考核部门id

            queryWrapper.eq("assessment_task_id", vo.getAssessmentTaskVO().getId());// 任务id
            AssessmentScoreEntity entity = assessmentScoreService.getOne(queryWrapper);
            if (null != entity) {