xieb
2024-01-05 5a979967f3321c87d5ba8ff7fa768cfc648ed3fc
评优任务投票推荐人
1 files modified
7 files renamed
32 files deleted
3 files added
2710 ■■■■ changed files
src/main/java/org/springblade/modules/assessment/controller/AssessmentSetAssessorController.java 3 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateAssessorController.java 159 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/controller/EvaluateResultController.java 151 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java 160 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskSetController.java 151 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/dto/EvaluateCandidateAssessorDTO.java 34 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/dto/EvaluateCandidateDTO.java 34 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/dto/EvaluateResultDTO.java 34 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/dto/EvaluateTaskReferrerDTO.java 8 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/entity/EvaluateCandidateAssessorEntity.java 70 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/entity/EvaluateCandidateEntity.java 76 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/entity/EvaluateResultEntity.java 69 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskReferrerEntity.java 58 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/excel/EvaluateCandidateExcel.java 87 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/excel/EvaluateResultExcel.java 87 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/excel/EvaluateTaskReferrerExcel.java 39 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/excel/EvaluateTaskSetExcel.java 87 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateAssessorMapper.java 54 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateMapper.java 54 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateMapper.xml 45 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/mapper/EvaluateResultMapper.java 58 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/mapper/EvaluateResultMapper.xml 66 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.java 18 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.xml 14 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskSetMapper.xml 52 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/service/IEvaluateCandidateAssessorService.java 52 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/service/IEvaluateResultService.java 56 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/service/IEvaluateTaskReferrerService.java 18 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/service/IEvaluateTaskSetService.java 52 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateCandidateAssessorServiceImpl.java 54 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateCandidateServiceImpl.java 54 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateResultServiceImpl.java 105 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskReferrerServiceImpl.java 54 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskSetServiceImpl.java 54 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/vo/EvaluateCandidateAssessorVO.java 44 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/vo/EvaluateResultVO.java 39 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/vo/EvaluateTaskReferrerVO.java 11 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/vo/EvaluateTaskSetVO.java 38 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateCandidateAssessorWrapper.java 120 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateCandidateWrapper.java 82 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateResultWrapper.java 76 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskReferrerWrapper.java 50 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskSetWrapper.java 83 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/assessment/controller/AssessmentSetAssessorController.java
@@ -28,9 +28,6 @@
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.evaluate.entity.EvaluateCandidateAssessorEntity;
import org.springblade.modules.evaluate.vo.EvaluateCandidateAssessorVO;
import org.springblade.modules.evaluate.wrapper.EvaluateCandidateAssessorWrapper;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateAssessorController.java
File was deleted
src/main/java/org/springblade/modules/evaluate/controller/EvaluateResultController.java
File was deleted
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java
New file
@@ -0,0 +1,160 @@
/*
 *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
 *
 *  Redistribution and use in source and binary forms, with or without
 *  modification, are permitted provided that the following conditions are met:
 *
 *  Redistributions of source code must retain the above copyright notice,
 *  this list of conditions and the following disclaimer.
 *  Redistributions in binary form must reproduce the above copyright
 *  notice, this list of conditions and the following disclaimer in the
 *  documentation and/or other materials provided with the distribution.
 *  Neither the name of the dreamlu.net developer nor the names of its
 *  contributors may be used to endorse or promote products derived from
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.evaluate.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 lombok.AllArgsConstructor;
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.evaluate.entity.EvaluateTaskReferrerEntity;
import org.springblade.modules.evaluate.excel.EvaluateTaskReferrerExcel;
import org.springblade.modules.evaluate.service.IEvaluateTaskReferrerService;
import org.springblade.modules.evaluate.vo.EvaluateTaskReferrerVO;
import org.springblade.modules.evaluate.wrapper.EvaluateTaskReferrerWrapper;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.List;
import java.util.Map;
/**
 * 评优任务推荐人员表 控制器
 *
 * @author aix
 * @since 2024-01-05
 */
@RestController
@AllArgsConstructor
@RequestMapping("evaluate/evaluateTaskReferrer")
@Api(value = "评优任务推荐人员表", tags = "评优任务推荐人员表接口")
public class EvaluateTaskReferrerController extends BladeController {
    private final IEvaluateTaskReferrerService evaluateTaskReferrerService;
    /**
     * 评优任务推荐人员表 详情
     */
    @GetMapping("/detail")
    @ApiOperationSupport(order = 1)
    @ApiOperation(value = "详情", notes = "传入evaluateTaskReferrer")
    public R<EvaluateTaskReferrerVO> detail(EvaluateTaskReferrerEntity evaluateTaskReferrer) {
        EvaluateTaskReferrerEntity detail = evaluateTaskReferrerService.getOne(Condition.getQueryWrapper(evaluateTaskReferrer));
        return R.data(EvaluateTaskReferrerWrapper.build().entityVO(detail));
    }
    /**
     * 评优任务推荐人员表 分页
     */
    @GetMapping("/list")
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "分页", notes = "传入evaluateTaskReferrer")
    public R<IPage<EvaluateTaskReferrerVO>> list(@ApiIgnore @RequestParam Map<String, Object> evaluateTaskReferrer, Query query) {
        IPage<EvaluateTaskReferrerEntity> pages = evaluateTaskReferrerService.page(Condition.getPage(query), Condition.getQueryWrapper(evaluateTaskReferrer, EvaluateTaskReferrerEntity.class));
        return R.data(EvaluateTaskReferrerWrapper.build().pageVO(pages));
    }
    /**
     * 评优任务推荐人员表 自定义分页
     */
    @GetMapping("/page")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "传入evaluateTaskReferrer")
    public R<IPage<EvaluateTaskReferrerVO>> page(EvaluateTaskReferrerVO evaluateTaskReferrer, Query query) {
        IPage<EvaluateTaskReferrerVO> pages = evaluateTaskReferrerService.selectEvaluateTaskReferrerPage(Condition.getPage(query), evaluateTaskReferrer);
        return R.data(pages);
    }
    /**
     * 评优任务推荐人员表 新增
     */
    @PostMapping("/save")
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "新增", notes = "传入evaluateTaskReferrer")
    public R save(@Valid @RequestBody EvaluateTaskReferrerEntity evaluateTaskReferrer) {
        return R.status(evaluateTaskReferrerService.save(evaluateTaskReferrer));
    }
    /**
     * 评优任务推荐人员表 批量新增
     */
    @PostMapping("/saveBatch")
    @ApiOperation(value = "批量新增", notes = "传入evaluateTaskReferrer集合")
    public R saveBatch(@RequestBody List<EvaluateTaskReferrerEntity> evaluateTaskReferrerEntityList) {
        return R.status(evaluateTaskReferrerService.saveBatch(evaluateTaskReferrerEntityList));
    }
    /**
     * 评优任务推荐人员表 修改
     */
    @PostMapping("/update")
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "修改", notes = "传入evaluateTaskReferrer")
    public R update(@Valid @RequestBody EvaluateTaskReferrerEntity evaluateTaskReferrer) {
        return R.status(evaluateTaskReferrerService.updateById(evaluateTaskReferrer));
    }
    /**
     * 评优任务推荐人员表 新增或修改
     */
    @PostMapping("/submit")
    @ApiOperationSupport(order = 6)
    @ApiOperation(value = "新增或修改", notes = "传入evaluateTaskReferrer")
    public R submit(@Valid @RequestBody EvaluateTaskReferrerEntity evaluateTaskReferrer) {
        return R.status(evaluateTaskReferrerService.saveOrUpdate(evaluateTaskReferrer));
    }
    /**
     * 评优任务推荐人员表 删除
     */
    @PostMapping("/remove")
    @ApiOperationSupport(order = 7)
    @ApiOperation(value = "逻辑删除", notes = "传入ids")
    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
        return R.status(evaluateTaskReferrerService.deleteLogic(Func.toLongList(ids)));
    }
    /**
     * 导出数据
     */
    @GetMapping("/export-evaluateTaskReferrer")
    @ApiOperationSupport(order = 9)
    @ApiOperation(value = "导出数据", notes = "传入evaluateTaskReferrer")
    public void exportEvaluateTaskReferrer(@ApiIgnore @RequestParam Map<String, Object> evaluateTaskReferrer, BladeUser bladeUser, HttpServletResponse response) {
        QueryWrapper<EvaluateTaskReferrerEntity> queryWrapper = Condition.getQueryWrapper(evaluateTaskReferrer, EvaluateTaskReferrerEntity.class);
        //if (!AuthUtil.isAdministrator()) {
        //    queryWrapper.lambda().eq(EvaluateTaskReferrer::getTenantId, bladeUser.getTenantId());
        //}
        queryWrapper.lambda().eq(EvaluateTaskReferrerEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
        List<EvaluateTaskReferrerExcel> list = evaluateTaskReferrerService.exportEvaluateTaskReferrer(queryWrapper);
        ExcelUtil.export(response, "评优任务推荐人员表数据" + DateUtil.time(), "评优任务推荐人员表数据表", list, EvaluateTaskReferrerExcel.class);
    }
}
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskSetController.java
File was deleted
src/main/java/org/springblade/modules/evaluate/dto/EvaluateCandidateAssessorDTO.java
File was deleted
src/main/java/org/springblade/modules/evaluate/dto/EvaluateCandidateDTO.java
File was deleted
src/main/java/org/springblade/modules/evaluate/dto/EvaluateResultDTO.java
File was deleted
src/main/java/org/springblade/modules/evaluate/dto/EvaluateTaskReferrerDTO.java
File was renamed from src/main/java/org/springblade/modules/evaluate/dto/EvaluateTaskSetDTO.java
@@ -16,19 +16,19 @@
 */
package org.springblade.modules.evaluate.dto;
import org.springblade.modules.evaluate.entity.EvaluateTaskSetEntity;
import org.springblade.modules.evaluate.entity.EvaluateTaskReferrerEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
 * 评优任务配置 数据传输对象实体类
 * 评优任务推荐人员表 数据传输对象实体类
 *
 * @author aix
 * @since 2023-12-21
 * @since 2024-01-05
 */
@Data
@EqualsAndHashCode(callSuper = true)
public class EvaluateTaskSetDTO extends EvaluateTaskSetEntity {
public class EvaluateTaskReferrerDTO extends EvaluateTaskReferrerEntity {
    private static final long serialVersionUID = 1L;
}
src/main/java/org/springblade/modules/evaluate/entity/EvaluateCandidateAssessorEntity.java
File was deleted
src/main/java/org/springblade/modules/evaluate/entity/EvaluateCandidateEntity.java
File was deleted
src/main/java/org/springblade/modules/evaluate/entity/EvaluateResultEntity.java
File was deleted
src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskReferrerEntity.java
File was renamed from src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskSetEntity.java
@@ -17,55 +17,53 @@
package org.springblade.modules.evaluate.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
/**
 * 评优任务配置 实体类
 * 评优任务推荐人员表 实体类
 *
 * @author aix
 * @since 2023-12-21
 * @since 2024-01-05
 */
@Data
@TableName("yw_evaluate_task_set")
@ApiModel(value = "EvaluateTaskSet对象", description = "评优任务配置")
@TableName("yw_evaluate_task_referrer")
@ApiModel(value = "EvaluateTaskReferrer对象", description = "评优任务推荐人员表")
@EqualsAndHashCode(callSuper = true)
public class EvaluateTaskSetEntity extends TenantEntity {
public class EvaluateTaskReferrerEntity extends TenantEntity {
    /**
     * 评优任务id
     */
    @ApiModelProperty(value = "评优任务id")
    private Long evaluateTaskId;
    @ApiModelProperty(value = "评优任务名称")
    private String evaluateTaskName;
    /**
     * 评优类型(0:员工评优,1:部门评优)
     * 被推荐人员id
     */
    @ApiModelProperty(value = "评优类型(0:员工评优,1:部门评优)")
    private Integer type;
    /**
     * 部门id
     */
    @ApiModelProperty(value = "部门id")
    private Long deptId;
    /**
     * 部门名称
     */
    @ApiModelProperty(value = "部门名称")
    private String deptName;
    /**
     * 用户id
     */
    @ApiModelProperty(value = "用户id")
    @ApiModelProperty(value = "被推荐人员id")
    private Long userId;
    /**
     * 用户名称
     * 被推荐人员名称
     */
    @ApiModelProperty(value = "用户名称")
    @ApiModelProperty(value = "被推荐人员名称")
    private String userName;
    /**
     * 被推荐人员部门id
     */
    @ApiModelProperty(value = "被推荐人员部门id")
    private Long deptId;
    /**
     * 被推荐人员部门名称
     */
    @ApiModelProperty(value = "被推荐人员部门名称")
    private String deptName;
    /**
     * 被推荐人员职位名称
     */
    @ApiModelProperty(value = "被推荐人员职位名称")
    private String postName;
}
src/main/java/org/springblade/modules/evaluate/excel/EvaluateCandidateExcel.java
File was deleted
src/main/java/org/springblade/modules/evaluate/excel/EvaluateResultExcel.java
File was deleted
src/main/java/org/springblade/modules/evaluate/excel/EvaluateTaskReferrerExcel.java
File was renamed from src/main/java/org/springblade/modules/evaluate/excel/EvaluateCandidateAssessorExcel.java
@@ -17,27 +17,26 @@
package org.springblade.modules.evaluate.excel;
import lombok.Data;
import java.util.Date;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import lombok.Data;
import java.io.Serializable;
/**
 * 候选人评定表 Excel实体类
 * 评优任务推荐人员表 Excel实体类
 *
 * @author Aix
 * @since 2023-12-29
 * @author aix
 * @since 2024-01-05
 */
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class EvaluateCandidateAssessorExcel implements Serializable {
public class EvaluateTaskReferrerExcel implements Serializable {
    private static final long serialVersionUID = 1L;
@@ -48,40 +47,40 @@
    @ExcelProperty("租户ID")
    private String tenantId;
    /**
     * 候选人表id
     * 评优任务id
     */
    @ColumnWidth(20)
    @ExcelProperty("候选人表id")
    private Long evaluateCandidateId;
    @ExcelProperty("评优任务id")
    private Long evaluateTaskId;
    /**
     * 评定人id
     * 被推荐人员id
     */
    @ColumnWidth(20)
    @ExcelProperty("评定人id")
    @ExcelProperty("被推荐人员id")
    private Long userId;
    /**
     * 评定人名称
     * 被推荐人员名称
     */
    @ColumnWidth(20)
    @ExcelProperty("评定人名称")
    @ExcelProperty("被推荐人员名称")
    private String userName;
    /**
     * 评定人部门id
     * 被推荐人员部门id
     */
    @ColumnWidth(20)
    @ExcelProperty("评定人部门id")
    @ExcelProperty("被推荐人员部门id")
    private Long deptId;
    /**
     * 评定人部门名称
     * 被推荐人员部门名称
     */
    @ColumnWidth(20)
    @ExcelProperty("评定人部门名称")
    @ExcelProperty("被推荐人员部门名称")
    private String deptName;
    /**
     * 评定人职位名称
     * 被推荐人员职位名称
     */
    @ColumnWidth(20)
    @ExcelProperty("评定人职位名称")
    @ExcelProperty("被推荐人员职位名称")
    private String postName;
    /**
     * 是否已删除
src/main/java/org/springblade/modules/evaluate/excel/EvaluateTaskSetExcel.java
File was deleted
src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateAssessorMapper.java
File was deleted
src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateMapper.java
File was deleted
src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateMapper.xml
File was deleted
src/main/java/org/springblade/modules/evaluate/mapper/EvaluateResultMapper.java
File was deleted
src/main/java/org/springblade/modules/evaluate/mapper/EvaluateResultMapper.xml
File was deleted
src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.java
File was renamed from src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskSetMapper.java
@@ -16,9 +16,9 @@
 */
package org.springblade.modules.evaluate.mapper;
import org.springblade.modules.evaluate.entity.EvaluateTaskSetEntity;
import org.springblade.modules.evaluate.vo.EvaluateTaskSetVO;
import org.springblade.modules.evaluate.excel.EvaluateTaskSetExcel;
import org.springblade.modules.evaluate.entity.EvaluateTaskReferrerEntity;
import org.springblade.modules.evaluate.vo.EvaluateTaskReferrerVO;
import org.springblade.modules.evaluate.excel.EvaluateTaskReferrerExcel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -26,21 +26,21 @@
import java.util.List;
/**
 * 评优任务配置 Mapper 接口
 * 评优任务推荐人员表 Mapper 接口
 *
 * @author aix
 * @since 2023-12-21
 * @since 2024-01-05
 */
public interface EvaluateTaskSetMapper extends BaseMapper<EvaluateTaskSetEntity> {
public interface EvaluateTaskReferrerMapper extends BaseMapper<EvaluateTaskReferrerEntity> {
    /**
     * 自定义分页
     *
     * @param page
     * @param evaluateTaskSet
     * @param evaluateTaskReferrer
     * @return
     */
    List<EvaluateTaskSetVO> selectEvaluateTaskSetPage(IPage page, EvaluateTaskSetVO evaluateTaskSet);
    List<EvaluateTaskReferrerVO> selectEvaluateTaskReferrerPage(IPage page, EvaluateTaskReferrerVO evaluateTaskReferrer);
    /**
@@ -49,6 +49,6 @@
     * @param queryWrapper
     * @return
     */
    List<EvaluateTaskSetExcel> exportEvaluateTaskSet(@Param("ew") Wrapper<EvaluateTaskSetEntity> queryWrapper);
    List<EvaluateTaskReferrerExcel> exportEvaluateTaskReferrer(@Param("ew") Wrapper<EvaluateTaskReferrerEntity> queryWrapper);
}
src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.xml
File was renamed from src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateAssessorMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.modules.evaluate.mapper.EvaluateCandidateAssessorMapper">
<mapper namespace="org.springblade.modules.evaluate.mapper.EvaluateTaskReferrerMapper">
    <!-- 通用查询映射结果 -->
    <resultMap id="evaluateCandidateAssessorResultMap" type="org.springblade.modules.evaluate.entity.EvaluateCandidateAssessorEntity">
    <resultMap id="evaluateTaskReferrerResultMap" type="org.springblade.modules.evaluate.entity.EvaluateTaskReferrerEntity">
        <result column="id" property="id"/>
        <result column="tenant_id" property="tenantId"/>
        <result column="evaluate_candidate_id" property="evaluateCandidateId"/>
        <result column="evaluate_task_id" property="evaluateTaskId"/>
        <result column="user_id" property="userId"/>
        <result column="user_name" property="userName"/>
        <result column="dept_id" property="deptId"/>
@@ -22,13 +22,13 @@
    </resultMap>
    <select id="selectEvaluateCandidateAssessorPage" resultMap="evaluateCandidateAssessorResultMap">
        select * from yw_evaluate_candidate_assessor where is_deleted = 0
    <select id="selectEvaluateTaskReferrerPage" resultMap="evaluateTaskReferrerResultMap">
        select * from yw_evaluate_task_referrer where is_deleted = 0
    </select>
    <select id="exportEvaluateCandidateAssessor" resultType="org.springblade.modules.evaluate.excel.EvaluateCandidateAssessorExcel">
        SELECT * FROM yw_evaluate_candidate_assessor ${ew.customSqlSegment}
    <select id="exportEvaluateTaskReferrer" resultType="org.springblade.modules.evaluate.excel.EvaluateTaskReferrerExcel">
        SELECT * FROM yw_evaluate_task_referrer ${ew.customSqlSegment}
    </select>
</mapper>
src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskSetMapper.xml
File was deleted
src/main/java/org/springblade/modules/evaluate/service/IEvaluateCandidateAssessorService.java
File was deleted
src/main/java/org/springblade/modules/evaluate/service/IEvaluateResultService.java
File was deleted
src/main/java/org/springblade/modules/evaluate/service/IEvaluateTaskReferrerService.java
File was renamed from src/main/java/org/springblade/modules/evaluate/service/IEvaluateCandidateService.java
@@ -17,28 +17,28 @@
package org.springblade.modules.evaluate.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import org.springblade.modules.evaluate.entity.EvaluateCandidateEntity;
import org.springblade.modules.evaluate.vo.EvaluateCandidateVO;
import org.springblade.modules.evaluate.excel.EvaluateCandidateExcel;
import org.springblade.modules.evaluate.entity.EvaluateTaskReferrerEntity;
import org.springblade.modules.evaluate.vo.EvaluateTaskReferrerVO;
import org.springblade.modules.evaluate.excel.EvaluateTaskReferrerExcel;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import java.util.List;
/**
 * 评优候选人 服务类
 * 评优任务推荐人员表 服务类
 *
 * @author aix
 * @since 2023-12-23
 * @since 2024-01-05
 */
public interface IEvaluateCandidateService extends BaseService<EvaluateCandidateEntity> {
public interface IEvaluateTaskReferrerService extends BaseService<EvaluateTaskReferrerEntity> {
    /**
     * 自定义分页
     *
     * @param page
     * @param evaluateCandidate
     * @param evaluateTaskReferrer
     * @return
     */
    IPage<EvaluateCandidateVO> selectEvaluateCandidatePage(IPage<EvaluateCandidateVO> page, EvaluateCandidateVO evaluateCandidate);
    IPage<EvaluateTaskReferrerVO> selectEvaluateTaskReferrerPage(IPage<EvaluateTaskReferrerVO> page, EvaluateTaskReferrerVO evaluateTaskReferrer);
    /**
@@ -47,6 +47,6 @@
     * @param queryWrapper
     * @return
     */
    List<EvaluateCandidateExcel> exportEvaluateCandidate(Wrapper<EvaluateCandidateEntity> queryWrapper);
    List<EvaluateTaskReferrerExcel> exportEvaluateTaskReferrer(Wrapper<EvaluateTaskReferrerEntity> queryWrapper);
}
src/main/java/org/springblade/modules/evaluate/service/IEvaluateTaskSetService.java
File was deleted
src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateCandidateAssessorServiceImpl.java
File was deleted
src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateCandidateServiceImpl.java
File was deleted
src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateResultServiceImpl.java
File was deleted
src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskReferrerServiceImpl.java
New file
@@ -0,0 +1,54 @@
/*
 *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
 *
 *  Redistribution and use in source and binary forms, with or without
 *  modification, are permitted provided that the following conditions are met:
 *
 *  Redistributions of source code must retain the above copyright notice,
 *  this list of conditions and the following disclaimer.
 *  Redistributions in binary form must reproduce the above copyright
 *  notice, this list of conditions and the following disclaimer in the
 *  documentation and/or other materials provided with the distribution.
 *  Neither the name of the dreamlu.net developer nor the names of its
 *  contributors may be used to endorse or promote products derived from
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.evaluate.service.impl;
import org.springblade.modules.evaluate.entity.EvaluateTaskReferrerEntity;
import org.springblade.modules.evaluate.vo.EvaluateTaskReferrerVO;
import org.springblade.modules.evaluate.excel.EvaluateTaskReferrerExcel;
import org.springblade.modules.evaluate.mapper.EvaluateTaskReferrerMapper;
import org.springblade.modules.evaluate.service.IEvaluateTaskReferrerService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import java.util.List;
/**
 * 评优任务推荐人员表 服务实现类
 *
 * @author aix
 * @since 2024-01-05
 */
@Service
public class EvaluateTaskReferrerServiceImpl extends BaseServiceImpl<EvaluateTaskReferrerMapper, EvaluateTaskReferrerEntity> implements IEvaluateTaskReferrerService {
    @Override
    public IPage<EvaluateTaskReferrerVO> selectEvaluateTaskReferrerPage(IPage<EvaluateTaskReferrerVO> page, EvaluateTaskReferrerVO evaluateTaskReferrer) {
        return page.setRecords(baseMapper.selectEvaluateTaskReferrerPage(page, evaluateTaskReferrer));
    }
    @Override
    public List<EvaluateTaskReferrerExcel> exportEvaluateTaskReferrer(Wrapper<EvaluateTaskReferrerEntity> queryWrapper) {
        List<EvaluateTaskReferrerExcel> evaluateTaskReferrerList = baseMapper.exportEvaluateTaskReferrer(queryWrapper);
        //evaluateTaskReferrerList.forEach(evaluateTaskReferrer -> {
        //    evaluateTaskReferrer.setTypeName(DictCache.getValue(DictEnum.YES_NO, EvaluateTaskReferrer.getType()));
        //});
        return evaluateTaskReferrerList;
    }
}
src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskSetServiceImpl.java
File was deleted
src/main/java/org/springblade/modules/evaluate/vo/EvaluateCandidateAssessorVO.java
File was deleted
src/main/java/org/springblade/modules/evaluate/vo/EvaluateResultVO.java
File was deleted
src/main/java/org/springblade/modules/evaluate/vo/EvaluateTaskReferrerVO.java
File was renamed from src/main/java/org/springblade/modules/evaluate/vo/EvaluateCandidateVO.java
@@ -16,22 +16,19 @@
 */
package org.springblade.modules.evaluate.vo;
import org.springblade.modules.evaluate.entity.EvaluateCandidateEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.modules.evaluate.entity.EvaluateTaskReferrerEntity;
/**
 * 评优候选人 视图实体类
 * 评优任务推荐人员表 视图实体类
 *
 * @author aix
 * @since 2023-12-23
 * @since 2024-01-05
 */
@Data
@EqualsAndHashCode(callSuper = true)
public class EvaluateCandidateVO extends EvaluateCandidateEntity {
public class EvaluateTaskReferrerVO extends EvaluateTaskReferrerEntity {
    private static final long serialVersionUID = 1L;
    private Long voteNum;
}
src/main/java/org/springblade/modules/evaluate/vo/EvaluateTaskSetVO.java
File was deleted
src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateCandidateAssessorWrapper.java
File was deleted
src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateCandidateWrapper.java
File was deleted
src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateResultWrapper.java
File was deleted
src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskReferrerWrapper.java
New file
@@ -0,0 +1,50 @@
/*
 *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
 *
 *  Redistribution and use in source and binary forms, with or without
 *  modification, are permitted provided that the following conditions are met:
 *
 *  Redistributions of source code must retain the above copyright notice,
 *  this list of conditions and the following disclaimer.
 *  Redistributions in binary form must reproduce the above copyright
 *  notice, this list of conditions and the following disclaimer in the
 *  documentation and/or other materials provided with the distribution.
 *  Neither the name of the dreamlu.net developer nor the names of its
 *  contributors may be used to endorse or promote products derived from
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.evaluate.wrapper;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.evaluate.entity.EvaluateTaskReferrerEntity;
import org.springblade.modules.evaluate.vo.EvaluateTaskReferrerVO;
import java.util.Objects;
/**
 * 评优任务推荐人员表 包装类,返回视图层所需的字段
 *
 * @author aix
 * @since 2024-01-05
 */
public class EvaluateTaskReferrerWrapper extends BaseEntityWrapper<EvaluateTaskReferrerEntity, EvaluateTaskReferrerVO>  {
    public static EvaluateTaskReferrerWrapper build() {
        return new EvaluateTaskReferrerWrapper();
     }
    @Override
    public EvaluateTaskReferrerVO entityVO(EvaluateTaskReferrerEntity evaluateTaskReferrer) {
        EvaluateTaskReferrerVO evaluateTaskReferrerVO = Objects.requireNonNull(BeanUtil.copy(evaluateTaskReferrer, EvaluateTaskReferrerVO.class));
        //User createUser = UserCache.getUser(evaluateTaskReferrer.getCreateUser());
        //User updateUser = UserCache.getUser(evaluateTaskReferrer.getUpdateUser());
        //evaluateTaskReferrerVO.setCreateUserName(createUser.getName());
        //evaluateTaskReferrerVO.setUpdateUserName(updateUser.getName());
        return evaluateTaskReferrerVO;
    }
}
src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskSetWrapper.java
File was deleted