xieb
2024-01-11 567775c8ef9761b5fe5d04073ca329b7ef30e22d
src/main/java/org/springblade/modules/assessment/controller/AssessmentSetAssessorController.java
@@ -16,34 +16,34 @@
 */
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.utils.Func;
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.AssessmentSetAssessorEntity;
import org.springblade.modules.assessment.vo.AssessmentSetAssessorVO;
import org.springblade.modules.assessment.excel.AssessmentSetAssessorExcel;
import org.springblade.modules.assessment.wrapper.AssessmentSetAssessorWrapper;
import org.springblade.modules.assessment.service.IAssessmentSetAssessorService;
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.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.assessment.entity.AssessmentSetAssessorEntity;
import org.springblade.modules.assessment.excel.AssessmentSetAssessorExcel;
import org.springblade.modules.assessment.service.IAssessmentSetAssessorService;
import org.springblade.modules.assessment.vo.AssessmentSetAssessorVO;
import org.springblade.modules.assessment.wrapper.AssessmentSetAssessorWrapper;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.Map;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.List;
import java.util.Map;
/**
 * 考核任务考核人 控制器
@@ -83,20 +83,9 @@
   @GetMapping("/listByAssessor")
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "h5任务列表-分页", notes = "传入evaluateCandidateAssessor")
   public R<IPage<AssessmentSetAssessorVO>> listByAssessor(@ApiIgnore @RequestParam Map<String, Object> assessmentSetAssessor, Query query) {;
      IPage<AssessmentSetAssessorEntity> pages = assessmentSetAssessorService.page(Condition.getPage(query), Condition.getQueryWrapper(assessmentSetAssessor, AssessmentSetAssessorEntity.class));
      return R.data(AssessmentSetAssessorWrapper.build().h5PageVO(pages, Long.valueOf(assessmentSetAssessor.get("userId").toString())));
   }
   /**
    * 考核任务考核人 自定义分页
    */
   @GetMapping("/page")
   @ApiOperationSupport(order = 3)
   @ApiOperation(value = "分页", notes = "传入assessmentSetAssessor")
   public R<IPage<AssessmentSetAssessorVO>> page(AssessmentSetAssessorVO assessmentSetAssessor, Query query) {
      IPage<AssessmentSetAssessorVO> pages = assessmentSetAssessorService.selectAssessmentSetAssessorPage(Condition.getPage(query), assessmentSetAssessor);
      return R.data(pages);
   public R<IPage<AssessmentSetAssessorVO>> listByAssessor(AssessmentSetAssessorVO assessmentSetAssessor, Query query) {;
      IPage<AssessmentSetAssessorEntity> pages = assessmentSetAssessorService.selectAssessmentSetAssessorPage(Condition.getPage(query), assessmentSetAssessor);
      return R.data(AssessmentSetAssessorWrapper.build().h5PageVO(pages, Long.valueOf(assessmentSetAssessor.getUserId())));
   }
   /**