考核任务

xieb

2024-01-04 63d5bf1bc414b71860b56e66c9dd7b3d8ed2157e

考核任务

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

@@ -28,15 +28,13 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
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.entity.*;
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.entity.AssessmentScoreEntity;
import org.springblade.modules.assessment.vo.AssessmentScoreVO;
import org.springblade.modules.assessment.excel.AssessmentScoreExcel;
import org.springblade.modules.assessment.wrapper.AssessmentScoreWrapper;
@@ -66,10 +64,11 @@
public class AssessmentScoreController extends BladeController {

    private final IAssessmentScoreService assessmentScoreService;
    private final IAssessmentSetService assessmentSetService;

    private final IAssessmentTaskService assessmentTaskService;

    private final IAssessmentSetService assessmentSetService;
    private final IAssessmentSetAssessorService assessmentSetAssessorService;

    /**
     * 考核评分 详情
@@ -93,7 +92,7 @@
    }

    @GetMapping("/listGroupByTask/{type}/{taskId}")
    @ApiOperation(value = "评分列表", notes = "传入要查询的用户id")
    @ApiOperation(value = "后台考核任务考核结果", notes = "传入要查询的任务id")
    public R listGroupByTask(@ApiIgnore @PathVariable Integer type,@PathVariable Long taskId, Query query) {
        QueryWrapper<AssessmentScoreEntity> setEntityQueryWrapper = new QueryWrapper<>();
        setEntityQueryWrapper.select("id,assessment_task_id,be_id,score_user_id,SUM(weight*score_val*0.01) as score_val,type");
@@ -105,28 +104,39 @@
        return R.data(AssessmentScoreWrapper.build().pageVO(pages));
    }

    @GetMapping("/listResultScore/{taskId}/{userId}")
    @ApiOperation(value = "后台考核任务考核结果", notes = "传入要查询的任务id")
    public R listResultScore(@PathVariable Long taskId,@PathVariable Long userId) {
        QueryWrapper<AssessmentSetAssessorEntity> assessmentSetAssessorEntityQueryWrapper = new QueryWrapper<>();
        assessmentSetAssessorEntityQueryWrapper.eq("",taskId);
        assessmentSetAssessorEntityQueryWrapper.eq("",userId);

        return null;
    }

    @GetMapping("/listMyScore/{userId}")
    @ApiOperation(value = "我的得分列表", notes = "传入要查询的用户id")
    public R listMyScore(@ApiIgnore @PathVariable Long userId) {
        QueryWrapper<AssessmentTaskEntity> taskEntityQueryWrapper = new QueryWrapper<>();
        taskEntityQueryWrapper.eq("type", 0l);
        List<AssessmentTaskEntity> assessmentTaskEntityList = assessmentTaskService.list(taskEntityQueryWrapper);
        QueryWrapper<AssessmentSetEntity> setEntityQueryWrapper = new QueryWrapper<>();
        setEntityQueryWrapper.eq("user_id",userId);
        List<AssessmentSetEntity> assessmentSetEntities = assessmentSetService.list(setEntityQueryWrapper);

        List<Map<String,Object>> retList = new ArrayList<>();
        for (AssessmentTaskEntity po:assessmentTaskEntityList) {
        for (AssessmentSetEntity po:assessmentSetEntities) {

            Map<String,Object> map = new HashMap<>();
            map.put("assessmentTaskVO", po);

            QueryWrapper<AssessmentSetEntity> setEntityQueryWrapper = new QueryWrapper<>();
            setEntityQueryWrapper.eq("user_id",userId);
            long userAssCount = assessmentSetService.count(setEntityQueryWrapper);
            QueryWrapper<AssessmentSetAssessorEntity> assessmentSetAssessorEntityQueryWrapper = new QueryWrapper<>();
            assessmentSetAssessorEntityQueryWrapper.eq("assessment_set_id",po.getId());
            long userAssCount = assessmentSetAssessorService.count(assessmentSetAssessorEntityQueryWrapper);

            if (userAssCount > 0) {

                map.put("assessmentTaskVO", po);

                //已经考核数量 获取得分
//                已经考核数量 获取得分
                QueryWrapper<AssessmentScoreEntity> scoreEntityQueryWrapper = new QueryWrapper<>();
                scoreEntityQueryWrapper.eq("be_id",userId);
                scoreEntityQueryWrapper.eq("type", 0l);
                scoreEntityQueryWrapper.eq("assessment_task_id",po.getId());
                scoreEntityQueryWrapper.eq("assessment_task_id",po.getAssessmentTaskId());
                List<AssessmentScoreEntity> scoreEntityList = assessmentScoreService.list(scoreEntityQueryWrapper);
                double score = 0.0;
                for (AssessmentScoreEntity scoreEntity:scoreEntityList) {
@@ -137,9 +147,41 @@
                retList.add(map);
            }


        }

        return R.data(retList);
//        QueryWrapper<AssessmentTaskEntity> taskEntityQueryWrapper = new QueryWrapper<>();
//        taskEntityQueryWrapper.eq("type", 0l);
//        List<AssessmentTaskEntity> assessmentTaskEntityList = assessmentTaskService.list(taskEntityQueryWrapper);
//        List<Map<String,Object>> retList = new ArrayList<>();
//        for (AssessmentTaskEntity po:assessmentTaskEntityList) {
//            Map<String,Object> map = new HashMap<>();
//
//            QueryWrapper<AssessmentSetAssessorEntity> setEntityQueryWrapper = new QueryWrapper<>();
//            setEntityQueryWrapper.eq("user_id",userId);
//            long userAssCount = assessmentSetAssessorService.count(setEntityQueryWrapper);
//            if (userAssCount > 0) {
//
//                map.put("assessmentTaskVO", po);
//
//                //已经考核数量 获取得分
//                QueryWrapper<AssessmentScoreEntity> scoreEntityQueryWrapper = new QueryWrapper<>();
//                scoreEntityQueryWrapper.eq("be_id",userId);
//                scoreEntityQueryWrapper.eq("type", 0l);
//                scoreEntityQueryWrapper.eq("assessment_task_id",po.getId());
//                List<AssessmentScoreEntity> scoreEntityList = assessmentScoreService.list(scoreEntityQueryWrapper);
//                double score = 0.0;
//                for (AssessmentScoreEntity scoreEntity:scoreEntityList) {
//                    score += scoreEntity.getWeight() * scoreEntity.getScoreVal() * 0.01;
//                }
//                map.put("scoreVal", score);
//                map.put("isAssessmentOk", userAssCount == scoreEntityList.size());
//                retList.add(map);
//            }
//
//
//        }
//        return R.data(retList);
    }

    /**

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

@@ -84,7 +84,8 @@
            //是否评论完成
            QueryWrapper queryWrapper = new QueryWrapper();
            queryWrapper.eq("type", vo.getAssessmentTaskVO().getType());//任务状态是个人还是部门 0：个人1：部门  自己是否评论完成，根据type获取对应的考核结果数量。
            queryWrapper.eq("score_user_id", userId);
            queryWrapper.eq("score_user_id", userId);// 考核人id
            queryWrapper.eq("be_id", assessmentSetVO.getUserId());// 被考核人id
            queryWrapper.eq("assessment_task_id", vo.getAssessmentTaskVO().getId());// 任务id
            AssessmentScoreEntity entity = assessmentScoreService.getOne(queryWrapper);
            if (null != entity) {