考核评分记录

xieb

2024-01-16 206d42486e2093aa470c7663f002a9335a33eb95

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

@@ -16,40 +16,42 @@
 */
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.secure.utils.AuthUtil;
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;

/**
 * 考核评分 控制器
@@ -91,27 +93,35 @@
      return R.data(AssessmentScoreWrapper.build().pageVO(pages));
   }

   @GetMapping("/listGroupByTask/{type}/{taskId}")
   @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");
      setEntityQueryWrapper.eq("type", type);
      setEntityQueryWrapper.eq("assessment_task_id",taskId);
      setEntityQueryWrapper.groupBy("be_id");
      IPage<AssessmentScoreEntity> pages = assessmentScoreService.page(Condition.getPage(query),setEntityQueryWrapper);

      return R.data(AssessmentScoreWrapper.build().pageVO(pages));
   /**
    * 考核评分记录列表
    * @param assessmentScore
    * @param query
    * @return
    */
   @GetMapping("/listInfo")
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "分页", notes = "传入assessmentScore")
   public R<IPage<AssessmentScoreVO>> listInfo(AssessmentScoreVO assessmentScore, Query query) {
      return R.data(assessmentScoreService.selectAssessmentScoreInfoV2Page(Condition.getPage(query), assessmentScore));
   }

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

      return null;
      assessmentScore.setType(type);
      assessmentScore.setAssessmentTaskId(taskId);

      //增加根据登录用户部门筛选
      boolean isadmin = AuthUtil.isAdmin();
      if (!isadmin) {
         assessmentScore.setDeptId(AuthUtil.getDeptId());
      }

      IPage<AssessmentScoreEntity> pages = assessmentScoreService.selectAssessmentScoreGroupByBeidPage(Condition.getPage(query), assessmentScore);

      return R.data(AssessmentScoreWrapper.build().pageVO(pages));
   }

   @GetMapping("/listMyScore/{userId}")
@@ -125,7 +135,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());