From 5a979967f3321c87d5ba8ff7fa768cfc648ed3fc Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Fri, 05 Jan 2024 16:35:38 +0800
Subject: [PATCH] 评优任务投票推荐人
---
src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskReferrerEntity.java | 58 +++---
src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.xml | 14
/dev/null | 83 ---------
src/main/java/org/springblade/modules/evaluate/dto/EvaluateTaskReferrerDTO.java | 8
src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.java | 18 +-
src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskReferrerServiceImpl.java | 54 ++++++
src/main/java/org/springblade/modules/evaluate/vo/EvaluateTaskReferrerVO.java | 11
src/main/java/org/springblade/modules/assessment/controller/AssessmentSetAssessorController.java | 3
src/main/java/org/springblade/modules/evaluate/service/IEvaluateTaskReferrerService.java | 18 +-
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java | 160 +++++++++++++++++
src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskReferrerWrapper.java | 50 +++++
src/main/java/org/springblade/modules/evaluate/excel/EvaluateTaskReferrerExcel.java | 39 ++--
12 files changed, 344 insertions(+), 172 deletions(-)
diff --git a/src/main/java/org/springblade/modules/assessment/controller/AssessmentSetAssessorController.java b/src/main/java/org/springblade/modules/assessment/controller/AssessmentSetAssessorController.java
index 721ae25..0694adb 100644
--- a/src/main/java/org/springblade/modules/assessment/controller/AssessmentSetAssessorController.java
+++ b/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;
diff --git a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateAssessorController.java b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateAssessorController.java
deleted file mode 100644
index 5b4ab6c..0000000
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateAssessorController.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * 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 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.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-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.evaluate.entity.EvaluateCandidateAssessorEntity;
-import org.springblade.modules.evaluate.vo.EvaluateCandidateAssessorVO;
-import org.springblade.modules.evaluate.excel.EvaluateCandidateAssessorExcel;
-import org.springblade.modules.evaluate.wrapper.EvaluateCandidateAssessorWrapper;
-import org.springblade.modules.evaluate.service.IEvaluateCandidateAssessorService;
-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 springfox.documentation.annotations.ApiIgnore;
-import java.util.Map;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * 候选人评定表 控制器
- *
- * @author Aix
- * @since 2023-12-29
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("evaluate/evaluateCandidateAssessor")
-@Api(value = "候选人评定表", tags = "候选人评定表接口")
-public class EvaluateCandidateAssessorController extends BladeController {
-
- private final IEvaluateCandidateAssessorService evaluateCandidateAssessorService;
-
- /**
- * 候选人评定表 详情
- */
- @GetMapping("/detail")
- @ApiOperationSupport(order = 1)
- @ApiOperation(value = "详情", notes = "传入evaluateCandidateAssessor")
- public R<EvaluateCandidateAssessorVO> detail(EvaluateCandidateAssessorEntity evaluateCandidateAssessor) {
- EvaluateCandidateAssessorEntity detail = evaluateCandidateAssessorService.getOne(Condition.getQueryWrapper(evaluateCandidateAssessor));
- return R.data(EvaluateCandidateAssessorWrapper.build().entityVO(detail));
- }
- /**
- * 候选人评定表 分页
- */
- @GetMapping("/list")
- @ApiOperationSupport(order = 2)
- @ApiOperation(value = "分页", notes = "传入evaluateCandidateAssessor")
- public R<IPage<EvaluateCandidateAssessorVO>> list(@ApiIgnore @RequestParam Map<String, Object> evaluateCandidateAssessor, Query query) {
- IPage<EvaluateCandidateAssessorEntity> pages = evaluateCandidateAssessorService.page(Condition.getPage(query), Condition.getQueryWrapper(evaluateCandidateAssessor, EvaluateCandidateAssessorEntity.class));
- return R.data(EvaluateCandidateAssessorWrapper.build().pageVO(pages));
- }
-
- @GetMapping("/listByAssessor")
- @ApiOperationSupport(order = 2)
- @ApiOperation(value = "h5任务列表-分页", notes = "传入evaluateCandidateAssessor")
- public R<IPage<EvaluateCandidateAssessorVO>> listByAssessor(@ApiIgnore @RequestParam Map<String, Object> evaluateCandidateAssessor, Query query) {;
- IPage<EvaluateCandidateAssessorEntity> pages = evaluateCandidateAssessorService.page(Condition.getPage(query), Condition.getQueryWrapper(evaluateCandidateAssessor, EvaluateCandidateAssessorEntity.class));
- return R.data(EvaluateCandidateAssessorWrapper.build().h5PageVO(pages, Long.valueOf(evaluateCandidateAssessor.get("userId").toString())));
- }
-
- /**
- * 候选人评定表 自定义分页
- */
- @GetMapping("/page")
- @ApiOperationSupport(order = 3)
- @ApiOperation(value = "分页", notes = "传入evaluateCandidateAssessor")
- public R<IPage<EvaluateCandidateAssessorVO>> page(EvaluateCandidateAssessorVO evaluateCandidateAssessor, Query query) {
- IPage<EvaluateCandidateAssessorVO> pages = evaluateCandidateAssessorService.selectEvaluateCandidateAssessorPage(Condition.getPage(query), evaluateCandidateAssessor);
- return R.data(pages);
- }
-
- /**
- * 候选人评定表 新增
- */
- @PostMapping("/save")
- @ApiOperationSupport(order = 4)
- @ApiOperation(value = "新增", notes = "传入evaluateCandidateAssessor")
- public R save(@Valid @RequestBody EvaluateCandidateAssessorEntity evaluateCandidateAssessor) {
- return R.status(evaluateCandidateAssessorService.save(evaluateCandidateAssessor));
- }
-
- /**
- * 候选人评定表 修改
- */
- @PostMapping("/update")
- @ApiOperationSupport(order = 5)
- @ApiOperation(value = "修改", notes = "传入evaluateCandidateAssessor")
- public R update(@Valid @RequestBody EvaluateCandidateAssessorEntity evaluateCandidateAssessor) {
- return R.status(evaluateCandidateAssessorService.updateById(evaluateCandidateAssessor));
- }
-
- /**
- * 候选人评定表 新增或修改
- */
- @PostMapping("/submit")
- @ApiOperationSupport(order = 6)
- @ApiOperation(value = "新增或修改", notes = "传入evaluateCandidateAssessor")
- public R submit(@Valid @RequestBody EvaluateCandidateAssessorEntity evaluateCandidateAssessor) {
- return R.status(evaluateCandidateAssessorService.saveOrUpdate(evaluateCandidateAssessor));
- }
-
- /**
- * 候选人评定表 删除
- */
- @PostMapping("/remove")
- @ApiOperationSupport(order = 7)
- @ApiOperation(value = "逻辑删除", notes = "传入ids")
- public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(evaluateCandidateAssessorService.deleteLogic(Func.toLongList(ids)));
- }
-
-
- /**
- * 导出数据
- */
- @GetMapping("/export-evaluateCandidateAssessor")
- @ApiOperationSupport(order = 9)
- @ApiOperation(value = "导出数据", notes = "传入evaluateCandidateAssessor")
- public void exportEvaluateCandidateAssessor(@ApiIgnore @RequestParam Map<String, Object> evaluateCandidateAssessor, BladeUser bladeUser, HttpServletResponse response) {
- QueryWrapper<EvaluateCandidateAssessorEntity> queryWrapper = Condition.getQueryWrapper(evaluateCandidateAssessor, EvaluateCandidateAssessorEntity.class);
- //if (!AuthUtil.isAdministrator()) {
- // queryWrapper.lambda().eq(EvaluateCandidateAssessor::getTenantId, bladeUser.getTenantId());
- //}
- queryWrapper.lambda().eq(EvaluateCandidateAssessorEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
- List<EvaluateCandidateAssessorExcel> list = evaluateCandidateAssessorService.exportEvaluateCandidateAssessor(queryWrapper);
- ExcelUtil.export(response, "候选人评定表数据" + DateUtil.time(), "候选人评定表数据表", list, EvaluateCandidateAssessorExcel.class);
- }
-
-}
diff --git a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateResultController.java b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateResultController.java
deleted file mode 100644
index b2b300a..0000000
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateResultController.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * 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 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.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-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.evaluate.entity.EvaluateResultEntity;
-import org.springblade.modules.evaluate.vo.EvaluateResultVO;
-import org.springblade.modules.evaluate.excel.EvaluateResultExcel;
-import org.springblade.modules.evaluate.wrapper.EvaluateResultWrapper;
-import org.springblade.modules.evaluate.service.IEvaluateResultService;
-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 springfox.documentation.annotations.ApiIgnore;
-import java.util.Map;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * 评优结果 控制器
- *
- * @author aix
- * @since 2023-12-18
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("evaluate/evaluateResult")
-@Api(value = "评优结果", tags = "评优结果接口")
-public class EvaluateResultController extends BladeController {
-
- private final IEvaluateResultService evaluateResultService;
-
- /**
- * 评优结果 详情
- */
- @GetMapping("/detail")
- @ApiOperationSupport(order = 1)
- @ApiOperation(value = "详情", notes = "传入evaluateResult")
- public R<EvaluateResultVO> detail(EvaluateResultEntity evaluateResult) {
- EvaluateResultEntity detail = evaluateResultService.getOne(Condition.getQueryWrapper(evaluateResult));
- return R.data(EvaluateResultWrapper.build().entityVO(detail));
- }
- /**
- * 评优结果 分页
- */
- @GetMapping("/list")
- @ApiOperationSupport(order = 2)
- @ApiOperation(value = "分页", notes = "传入evaluateResult")
- public R<IPage<EvaluateResultVO>> list(@ApiIgnore @RequestParam Map<String, Object> evaluateResult, Query query) {
- IPage<EvaluateResultEntity> pages = evaluateResultService.page(Condition.getPage(query), Condition.getQueryWrapper(evaluateResult, EvaluateResultEntity.class));
- return R.data(EvaluateResultWrapper.build().pageVO(pages));
- }
-
- /**
- * 评优结果 自定义分页
- */
- @GetMapping("/page")
- @ApiOperationSupport(order = 3)
- @ApiOperation(value = "分页", notes = "传入evaluateResult")
- public R<IPage<EvaluateResultVO>> page(EvaluateResultVO evaluateResult, Query query) {
- IPage<EvaluateResultVO> pages = evaluateResultService.selectEvaluateResultPage(Condition.getPage(query), evaluateResult);
- return R.data(pages);
- }
-
- /**
- * 评优结果 新增
- */
- @PostMapping("/save")
- @ApiOperationSupport(order = 4)
- @ApiOperation(value = "新增", notes = "传入evaluateResult")
- public R save(@Valid @RequestBody EvaluateResultEntity evaluateResult) {
- return R.status(evaluateResultService.save(evaluateResult));
- }
-
- /**
- * 评优结果 修改
- */
- @PostMapping("/update")
- @ApiOperationSupport(order = 5)
- @ApiOperation(value = "修改", notes = "传入evaluateResult")
- public R update(@Valid @RequestBody EvaluateResultEntity evaluateResult) {
- return R.status(evaluateResultService.updateById(evaluateResult));
- }
-
- /**
- * 评优结果 新增或修改
- */
- @PostMapping("/submit")
- @ApiOperationSupport(order = 6)
- @ApiOperation(value = "新增或修改", notes = "传入evaluateResult")
- public R submit(@Valid @RequestBody EvaluateResultEntity evaluateResult) {
- return R.status(evaluateResultService.saveOrUpdate(evaluateResult));
- }
-
- /**
- * 评优结果 删除
- */
- @PostMapping("/remove")
- @ApiOperationSupport(order = 7)
- @ApiOperation(value = "逻辑删除", notes = "传入ids")
- public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(evaluateResultService.deleteLogic(Func.toLongList(ids)));
- }
-
-
- /**
- * 导出数据
- */
- @GetMapping("/export-evaluateResult")
- @ApiOperationSupport(order = 9)
- @ApiOperation(value = "导出数据", notes = "传入evaluateResult")
- public void exportEvaluateResult(@ApiIgnore @RequestParam Map<String, Object> evaluateResult, BladeUser bladeUser, HttpServletResponse response) {
- QueryWrapper<EvaluateResultEntity> queryWrapper = Condition.getQueryWrapper(evaluateResult, EvaluateResultEntity.class);
- //if (!AuthUtil.isAdministrator()) {
- // queryWrapper.lambda().eq(EvaluateResult::getTenantId, bladeUser.getTenantId());
- //}
- queryWrapper.lambda().eq(EvaluateResultEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
- List<EvaluateResultExcel> list = evaluateResultService.exportEvaluateResult(queryWrapper);
- ExcelUtil.export(response, "评优结果数据" + DateUtil.time(), "评优结果数据表", list, EvaluateResultExcel.class);
- }
-
-}
diff --git a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java
new file mode 100644
index 0000000..188dc45
--- /dev/null
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java
@@ -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);
+ }
+
+}
diff --git a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskSetController.java b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskSetController.java
deleted file mode 100644
index fd35d91..0000000
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskSetController.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * 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 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.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-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.evaluate.entity.EvaluateTaskSetEntity;
-import org.springblade.modules.evaluate.vo.EvaluateTaskSetVO;
-import org.springblade.modules.evaluate.excel.EvaluateTaskSetExcel;
-import org.springblade.modules.evaluate.wrapper.EvaluateTaskSetWrapper;
-import org.springblade.modules.evaluate.service.IEvaluateTaskSetService;
-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 springfox.documentation.annotations.ApiIgnore;
-import java.util.Map;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * 评优任务配置 控制器
- *
- * @author aix
- * @since 2023-12-21
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("evaluate/evaluateTaskSet")
-@Api(value = "评优任务配置", tags = "评优任务配置接口")
-public class EvaluateTaskSetController extends BladeController {
-
- private final IEvaluateTaskSetService evaluateTaskSetService;
-
- /**
- * 评优任务配置 详情
- */
- @GetMapping("/detail")
- @ApiOperationSupport(order = 1)
- @ApiOperation(value = "详情", notes = "传入evaluateTaskSet")
- public R<EvaluateTaskSetVO> detail(EvaluateTaskSetEntity evaluateTaskSet) {
- EvaluateTaskSetEntity detail = evaluateTaskSetService.getOne(Condition.getQueryWrapper(evaluateTaskSet));
- return R.data(EvaluateTaskSetWrapper.build().entityVO(detail));
- }
- /**
- * 个人评优任务配置 分页
- */
- @GetMapping("/list")
- @ApiOperationSupport(order = 2)
- @ApiOperation(value = "分页", notes = "传入evaluateTaskSet")
- public R<IPage<EvaluateTaskSetVO>> list(@ApiIgnore @RequestParam Map<String, Object> evaluateTaskSet, Query query) {
- IPage<EvaluateTaskSetEntity> pages = evaluateTaskSetService.page(Condition.getPage(query), Condition.getQueryWrapper(evaluateTaskSet, EvaluateTaskSetEntity.class));
- return R.data(EvaluateTaskSetWrapper.build().pageVO(pages));
- }
-
- /**
- * 评优任务配置 自定义分页
- */
- @GetMapping("/page")
- @ApiOperationSupport(order = 3)
- @ApiOperation(value = "分页", notes = "传入evaluateTaskSet")
- public R<IPage<EvaluateTaskSetVO>> page(EvaluateTaskSetVO evaluateTaskSet, Query query) {
- IPage<EvaluateTaskSetVO> pages = evaluateTaskSetService.selectEvaluateTaskSetPage(Condition.getPage(query), evaluateTaskSet);
- return R.data(pages);
- }
-
- /**
- * 评优任务配置 新增
- */
- @PostMapping("/save")
- @ApiOperationSupport(order = 4)
- @ApiOperation(value = "新增", notes = "传入evaluateTaskSet")
- public R save(@Valid @RequestBody EvaluateTaskSetEntity evaluateTaskSet) {
- return R.status(evaluateTaskSetService.save(evaluateTaskSet));
- }
-
- /**
- * 评优任务配置 修改
- */
- @PostMapping("/update")
- @ApiOperationSupport(order = 5)
- @ApiOperation(value = "修改", notes = "传入evaluateTaskSet")
- public R update(@Valid @RequestBody EvaluateTaskSetEntity evaluateTaskSet) {
- return R.status(evaluateTaskSetService.updateById(evaluateTaskSet));
- }
-
- /**
- * 评优任务配置 新增或修改
- */
- @PostMapping("/submit")
- @ApiOperationSupport(order = 6)
- @ApiOperation(value = "新增或修改", notes = "传入evaluateTaskSet")
- public R submit(@Valid @RequestBody EvaluateTaskSetEntity evaluateTaskSet) {
- return R.status(evaluateTaskSetService.saveOrUpdate(evaluateTaskSet));
- }
-
- /**
- * 评优任务配置 删除
- */
- @PostMapping("/remove")
- @ApiOperationSupport(order = 7)
- @ApiOperation(value = "逻辑删除", notes = "传入ids")
- public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(evaluateTaskSetService.deleteLogic(Func.toLongList(ids)));
- }
-
-
- /**
- * 导出数据
- */
- @GetMapping("/export-evaluateTaskSet")
- @ApiOperationSupport(order = 9)
- @ApiOperation(value = "导出数据", notes = "传入evaluateTaskSet")
- public void exportEvaluateTaskSet(@ApiIgnore @RequestParam Map<String, Object> evaluateTaskSet, BladeUser bladeUser, HttpServletResponse response) {
- QueryWrapper<EvaluateTaskSetEntity> queryWrapper = Condition.getQueryWrapper(evaluateTaskSet, EvaluateTaskSetEntity.class);
- //if (!AuthUtil.isAdministrator()) {
- // queryWrapper.lambda().eq(EvaluateTaskSet::getTenantId, bladeUser.getTenantId());
- //}
- queryWrapper.lambda().eq(EvaluateTaskSetEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
- List<EvaluateTaskSetExcel> list = evaluateTaskSetService.exportEvaluateTaskSet(queryWrapper);
- ExcelUtil.export(response, "评优任务配置数据" + DateUtil.time(), "评优任务配置数据表", list, EvaluateTaskSetExcel.class);
- }
-
-}
diff --git a/src/main/java/org/springblade/modules/evaluate/dto/EvaluateCandidateAssessorDTO.java b/src/main/java/org/springblade/modules/evaluate/dto/EvaluateCandidateAssessorDTO.java
deleted file mode 100644
index 6576b99..0000000
--- a/src/main/java/org/springblade/modules/evaluate/dto/EvaluateCandidateAssessorDTO.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.dto;
-
-import org.springblade.modules.evaluate.entity.EvaluateCandidateAssessorEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 候选人评定表 数据传输对象实体类
- *
- * @author Aix
- * @since 2023-12-29
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class EvaluateCandidateAssessorDTO extends EvaluateCandidateAssessorEntity {
- private static final long serialVersionUID = 1L;
-
-}
diff --git a/src/main/java/org/springblade/modules/evaluate/dto/EvaluateCandidateDTO.java b/src/main/java/org/springblade/modules/evaluate/dto/EvaluateCandidateDTO.java
deleted file mode 100644
index 535191f..0000000
--- a/src/main/java/org/springblade/modules/evaluate/dto/EvaluateCandidateDTO.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.dto;
-
-import org.springblade.modules.evaluate.entity.EvaluateCandidateEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 评优候选人 数据传输对象实体类
- *
- * @author aix
- * @since 2023-12-23
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class EvaluateCandidateDTO extends EvaluateCandidateEntity {
- private static final long serialVersionUID = 1L;
-
-}
diff --git a/src/main/java/org/springblade/modules/evaluate/dto/EvaluateResultDTO.java b/src/main/java/org/springblade/modules/evaluate/dto/EvaluateResultDTO.java
deleted file mode 100644
index 549972b..0000000
--- a/src/main/java/org/springblade/modules/evaluate/dto/EvaluateResultDTO.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.dto;
-
-import org.springblade.modules.evaluate.entity.EvaluateResultEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 评优结果 数据传输对象实体类
- *
- * @author aix
- * @since 2023-12-18
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class EvaluateResultDTO extends EvaluateResultEntity {
- private static final long serialVersionUID = 1L;
-
-}
diff --git a/src/main/java/org/springblade/modules/evaluate/dto/EvaluateTaskSetDTO.java b/src/main/java/org/springblade/modules/evaluate/dto/EvaluateTaskReferrerDTO.java
similarity index 81%
rename from src/main/java/org/springblade/modules/evaluate/dto/EvaluateTaskSetDTO.java
rename to src/main/java/org/springblade/modules/evaluate/dto/EvaluateTaskReferrerDTO.java
index 56862ef..6d3aca7 100644
--- a/src/main/java/org/springblade/modules/evaluate/dto/EvaluateTaskSetDTO.java
+++ b/src/main/java/org/springblade/modules/evaluate/dto/EvaluateTaskReferrerDTO.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;
}
diff --git a/src/main/java/org/springblade/modules/evaluate/entity/EvaluateCandidateAssessorEntity.java b/src/main/java/org/springblade/modules/evaluate/entity/EvaluateCandidateAssessorEntity.java
deleted file mode 100644
index 816c0f1..0000000
--- a/src/main/java/org/springblade/modules/evaluate/entity/EvaluateCandidateAssessorEntity.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.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.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
-
-/**
- * 候选人评定表 实体类
- *
- * @author Aix
- * @since 2023-12-29
- */
-@Data
-@TableName("yw_evaluate_candidate_assessor")
-@ApiModel(value = "EvaluateCandidateAssessor对象", description = "候选人评定表")
-@EqualsAndHashCode(callSuper = true)
-public class EvaluateCandidateAssessorEntity extends TenantEntity {
-
- /**
- * 候选人表id
- */
- @ApiModelProperty(value = "候选人表id")
- private Long evaluateCandidateId;
- /**
- * 评定人id
- */
- @ApiModelProperty(value = "评定人id")
- private Long userId;
- /**
- * 评定人名称
- */
- @ApiModelProperty(value = "评定人名称")
- private String userName;
- /**
- * 评定人部门id
- */
- @ApiModelProperty(value = "评定人部门id")
- private Long deptId;
- /**
- * 评定人部门名称
- */
- @ApiModelProperty(value = "评定人部门名称")
- private String deptName;
- /**
- * 评定人职位名称
- */
- @ApiModelProperty(value = "评定人职位名称")
- private String postName;
-
-}
diff --git a/src/main/java/org/springblade/modules/evaluate/entity/EvaluateCandidateEntity.java b/src/main/java/org/springblade/modules/evaluate/entity/EvaluateCandidateEntity.java
deleted file mode 100644
index 6283405..0000000
--- a/src/main/java/org/springblade/modules/evaluate/entity/EvaluateCandidateEntity.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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.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.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
-
-/**
- * 评优候选人 实体类
- *
- * @author aix
- * @since 2023-12-23
- */
-@Data
-@TableName("yw_evaluate_candidate")
-@ApiModel(value = "EvaluateCandidate对象", description = "评优候选人")
-@EqualsAndHashCode(callSuper = true)
-public class EvaluateCandidateEntity extends TenantEntity {
-
- /**
- * 评优任务
- */
- @ApiModelProperty(value = "评优任务")
- private Long evaluateTaskId;
-
- @ApiModelProperty(value = "评优任务名称")
- private String evaluateTaskName;
- /**
- * 候选人id
- */
- @ApiModelProperty(value = "候选人id")
- private Long userId;
- /**
- * 员工名称
- */
- @ApiModelProperty(value = "员工名称")
- private String userName;
- /**
- * 部门id
- */
- @ApiModelProperty(value = "部门id")
- private Long deptId;
- /**
- * 部门名称
- */
- @ApiModelProperty(value = "部门名称")
- private String deptName;
- /**
- * 职位名称
- */
- @ApiModelProperty(value = "职位名称")
- private String postName;
-
- @ApiModelProperty(value = "数据来源")
- private Integer dataSource;
-
-}
diff --git a/src/main/java/org/springblade/modules/evaluate/entity/EvaluateResultEntity.java b/src/main/java/org/springblade/modules/evaluate/entity/EvaluateResultEntity.java
deleted file mode 100644
index 46cc418..0000000
--- a/src/main/java/org/springblade/modules/evaluate/entity/EvaluateResultEntity.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * 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.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-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.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
-
-/**
- * 评优结果 实体类
- *
- * @author aix
- * @since 2023-12-18
- */
-@Data
-@TableName("yw_evaluate_result")
-@ApiModel(value = "EvaluateResult对象", description = "评优结果")
-@EqualsAndHashCode(callSuper = true)
-public class EvaluateResultEntity extends TenantEntity {
-
- /**
- * 评优任务
- */
- @ApiModelProperty(value = "评优任务")
- private Long evaluateTaskId;
- /**
- * 被评优的人/部门
- */
- @ApiModelProperty(value = "被评优的人/部门")
- private Long beId;
- /**
- * 评优人
- */
- @ApiModelProperty(value = "评优人")
- private Long scoreUserId;
- /**
- * 评优说明
- */
- @ApiModelProperty(value = "评优说明")
- private String remark;
- /**
- * 类型（0：员工评优，1：部门评优，2：公司评优）
- */
- @ApiModelProperty(value = "类型（0：员工评优，1：部门评优，2：公司评优）")
- private Integer type;
-
- @TableField(exist = false)
- private String tempCount;
-
-}
diff --git a/src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskSetEntity.java b/src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskReferrerEntity.java
similarity index 66%
rename from src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskSetEntity.java
rename to src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskReferrerEntity.java
index 691ccd2..4003d70 100644
--- a/src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskSetEntity.java
+++ b/src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskReferrerEntity.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;
}
diff --git a/src/main/java/org/springblade/modules/evaluate/excel/EvaluateCandidateExcel.java b/src/main/java/org/springblade/modules/evaluate/excel/EvaluateCandidateExcel.java
deleted file mode 100644
index b9c750c..0000000
--- a/src/main/java/org/springblade/modules/evaluate/excel/EvaluateCandidateExcel.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * 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.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 java.io.Serializable;
-
-
-/**
- * 评优候选人 Excel实体类
- *
- * @author aix
- * @since 2023-12-23
- */
-@Data
-@ColumnWidth(25)
-@HeadRowHeight(20)
-@ContentRowHeight(18)
-public class EvaluateCandidateExcel implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 租户ID
- */
- @ColumnWidth(20)
- @ExcelProperty("租户ID")
- private String tenantId;
- /**
- * 评优任务
- */
- @ColumnWidth(20)
- @ExcelProperty("评优任务")
- private Long evaluateTaskId;
- /**
- * 候选人id
- */
- @ColumnWidth(20)
- @ExcelProperty("候选人id")
- private Long userId;
- /**
- * 员工名称
- */
- @ColumnWidth(20)
- @ExcelProperty("员工名称")
- private String userName;
- /**
- * 部门名称
- */
- @ColumnWidth(20)
- @ExcelProperty("部门名称")
- private String deptName;
- /**
- * 职位名称
- */
- @ColumnWidth(20)
- @ExcelProperty("职位名称")
- private String postName;
- /**
- * 是否已删除
- */
- @ColumnWidth(20)
- @ExcelProperty("是否已删除")
- private Integer isDeleted;
-
-}
diff --git a/src/main/java/org/springblade/modules/evaluate/excel/EvaluateResultExcel.java b/src/main/java/org/springblade/modules/evaluate/excel/EvaluateResultExcel.java
deleted file mode 100644
index 4d108d1..0000000
--- a/src/main/java/org/springblade/modules/evaluate/excel/EvaluateResultExcel.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * 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.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 java.io.Serializable;
-
-
-/**
- * 评优结果 Excel实体类
- *
- * @author aix
- * @since 2023-12-18
- */
-@Data
-@ColumnWidth(25)
-@HeadRowHeight(20)
-@ContentRowHeight(18)
-public class EvaluateResultExcel implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 租户ID
- */
- @ColumnWidth(20)
- @ExcelProperty("租户ID")
- private String tenantId;
- /**
- * 评优任务
- */
- @ColumnWidth(20)
- @ExcelProperty("评优任务")
- private Long assessmentTaskId;
- /**
- * 被评优的人/部门
- */
- @ColumnWidth(20)
- @ExcelProperty("被评优的人/部门")
- private Long beId;
- /**
- * 评优人
- */
- @ColumnWidth(20)
- @ExcelProperty("评优人")
- private Long scoreUserId;
- /**
- * 评优说明
- */
- @ColumnWidth(20)
- @ExcelProperty("评优说明")
- private String remark;
- /**
- * 类型（0：员工评优，1：部门评优，2：公司评优）
- */
- @ColumnWidth(20)
- @ExcelProperty("类型（0：员工评优，1：部门评优，2：公司评优）")
- private Integer type;
- /**
- * 是否已删除
- */
- @ColumnWidth(20)
- @ExcelProperty("是否已删除")
- private Integer isDeleted;
-
-}
diff --git a/src/main/java/org/springblade/modules/evaluate/excel/EvaluateCandidateAssessorExcel.java b/src/main/java/org/springblade/modules/evaluate/excel/EvaluateTaskReferrerExcel.java
similarity index 75%
rename from src/main/java/org/springblade/modules/evaluate/excel/EvaluateCandidateAssessorExcel.java
rename to src/main/java/org/springblade/modules/evaluate/excel/EvaluateTaskReferrerExcel.java
index ea75252..d58ab58 100644
--- a/src/main/java/org/springblade/modules/evaluate/excel/EvaluateCandidateAssessorExcel.java
+++ b/src/main/java/org/springblade/modules/evaluate/excel/EvaluateTaskReferrerExcel.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;
/**
* 是否已删除
diff --git a/src/main/java/org/springblade/modules/evaluate/excel/EvaluateTaskSetExcel.java b/src/main/java/org/springblade/modules/evaluate/excel/EvaluateTaskSetExcel.java
deleted file mode 100644
index 0c83425..0000000
--- a/src/main/java/org/springblade/modules/evaluate/excel/EvaluateTaskSetExcel.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * 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.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 java.io.Serializable;
-
-
-/**
- * 评优任务配置 Excel实体类
- *
- * @author aix
- * @since 2023-12-21
- */
-@Data
-@ColumnWidth(25)
-@HeadRowHeight(20)
-@ContentRowHeight(18)
-public class EvaluateTaskSetExcel implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 租户ID
- */
- @ColumnWidth(20)
- @ExcelProperty("租户ID")
- private String tenantId;
- /**
- * 评优类型（0：员工评优，1：部门评优）
- */
- @ColumnWidth(20)
- @ExcelProperty("评优类型（0：员工评优，1：部门评优）")
- private Integer type;
- /**
- * 部门id
- */
- @ColumnWidth(20)
- @ExcelProperty("部门id")
- private Long deptId;
- /**
- * 部门名称
- */
- @ColumnWidth(20)
- @ExcelProperty("部门名称")
- private String deptName;
- /**
- * 用户id
- */
- @ColumnWidth(20)
- @ExcelProperty("用户id")
- private Long userId;
- /**
- * 用户名称
- */
- @ColumnWidth(20)
- @ExcelProperty("用户名称")
- private String userName;
- /**
- * 是否已删除
- */
- @ColumnWidth(20)
- @ExcelProperty("是否已删除")
- private Integer isDeleted;
-
-}
diff --git a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateAssessorMapper.java b/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateAssessorMapper.java
deleted file mode 100644
index d8a8fa2..0000000
--- a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateAssessorMapper.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.mapper;
-
-import org.springblade.modules.evaluate.entity.EvaluateCandidateAssessorEntity;
-import org.springblade.modules.evaluate.vo.EvaluateCandidateAssessorVO;
-import org.springblade.modules.evaluate.excel.EvaluateCandidateAssessorExcel;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.ibatis.annotations.Param;
-import java.util.List;
-
-/**
- * 候选人评定表 Mapper 接口
- *
- * @author Aix
- * @since 2023-12-29
- */
-public interface EvaluateCandidateAssessorMapper extends BaseMapper<EvaluateCandidateAssessorEntity> {
-
- /**
- * 自定义分页
- *
- * @param page
- * @param evaluateCandidateAssessor
- * @return
- */
- List<EvaluateCandidateAssessorVO> selectEvaluateCandidateAssessorPage(IPage page, EvaluateCandidateAssessorVO evaluateCandidateAssessor);
-
-
- /**
- * 获取导出数据
- *
- * @param queryWrapper
- * @return
- */
- List<EvaluateCandidateAssessorExcel> exportEvaluateCandidateAssessor(@Param("ew") Wrapper<EvaluateCandidateAssessorEntity> queryWrapper);
-
-}
diff --git a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateMapper.java b/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateMapper.java
deleted file mode 100644
index 5a8ce4a..0000000
--- a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateMapper.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.mapper;
-
-import org.springblade.modules.evaluate.entity.EvaluateCandidateEntity;
-import org.springblade.modules.evaluate.vo.EvaluateCandidateVO;
-import org.springblade.modules.evaluate.excel.EvaluateCandidateExcel;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.ibatis.annotations.Param;
-import java.util.List;
-
-/**
- * 评优候选人 Mapper 接口
- *
- * @author aix
- * @since 2023-12-23
- */
-public interface EvaluateCandidateMapper extends BaseMapper<EvaluateCandidateEntity> {
-
- /**
- * 自定义分页
- *
- * @param page
- * @param evaluateCandidate
- * @return
- */
- List<EvaluateCandidateVO> selectEvaluateCandidatePage(IPage page, EvaluateCandidateVO evaluateCandidate);
-
-
- /**
- * 获取导出数据
- *
- * @param queryWrapper
- * @return
- */
- List<EvaluateCandidateExcel> exportEvaluateCandidate(@Param("ew") Wrapper<EvaluateCandidateEntity> queryWrapper);
-
-}
diff --git a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateMapper.xml b/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateMapper.xml
deleted file mode 100644
index 1c5f651..0000000
--- a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateMapper.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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.EvaluateCandidateMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="evaluateCandidateResultMap" type="org.springblade.modules.evaluate.entity.EvaluateCandidateEntity">
- <result column="id" property="id"/>
- <result column="tenant_id" property="tenantId"/>
- <result column="evaluate_task_id" property="evaluateTaskId"/>
- <result column="evaluate_task_name" property="evaluateTaskName"/>
- <result column="user_id" property="userId"/>
- <result column="user_name" property="userName"/>
- <result column="dept_id" property="deptId"/>
- <result column="dept_name" property="deptName"/>
- <result column="post_name" property="postName"/>
- <result column="data_source" property="dataSource"/>
- <result column="create_user" property="createUser"/>
- <result column="create_dept" property="createDept"/>
- <result column="create_time" property="createTime"/>
- <result column="update_user" property="updateUser"/>
- <result column="update_time" property="updateTime"/>
- <result column="status" property="status"/>
- <result column="is_deleted" property="isDeleted"/>
- </resultMap>
-
- <resultMap id="evaluateCandidateResultVOMap" type="org.springblade.modules.evaluate.vo.EvaluateCandidateVO" extends="evaluateCandidateResultMap">
- <result column="vote_num" property="voteNum"/>
- </resultMap>
-
-
- <select id="selectEvaluateCandidatePage" resultMap="evaluateCandidateResultVOMap">
- select * ,
- ( select count(*) from yw_evaluate_result b where b.evaluate_task_id = a.evaluate_task_id and a.user_id = b.be_id and b.type = 2) as vote_num
- from yw_evaluate_candidate a where is_deleted = 0
- <if test="evaluateCandidate.evaluateTaskId !=null">
- AND evaluate_task_id = #{evaluateCandidate.evaluateTaskId}
- </if>
- </select>
-
-
- <select id="exportEvaluateCandidate" resultType="org.springblade.modules.evaluate.excel.EvaluateCandidateExcel">
- SELECT * FROM yw_evaluate_candidate ${ew.customSqlSegment}
- </select>
-
-</mapper>
diff --git a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateResultMapper.java b/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateResultMapper.java
deleted file mode 100644
index b9e03ed..0000000
--- a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateResultMapper.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.mapper;
-
-import org.springblade.modules.evaluate.entity.EvaluateResultEntity;
-import org.springblade.modules.evaluate.vo.EvaluateResultVO;
-import org.springblade.modules.evaluate.excel.EvaluateResultExcel;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.ibatis.annotations.Param;
-import java.util.List;
-
-/**
- * 评优结果 Mapper 接口
- *
- * @author aix
- * @since 2023-12-18
- */
-public interface EvaluateResultMapper extends BaseMapper<EvaluateResultEntity> {
-
- /**
- * 自定义分页
- *
- * @param page
- * @param evaluateResult
- * @return
- */
- List<EvaluateResultVO> selectEvaluateResultPage(IPage page, EvaluateResultVO evaluateResult);
-
- List<EvaluateResultEntity> selectEvaluateResultGroupBeId(IPage page,EvaluateResultVO evaluateResult, List<Long> userIds);
-
- List<EvaluateResultEntity> selectEvaluateResultByScoreIdsGroupBeId(IPage page,EvaluateResultVO evaluateResult, List<Long> scoreUserIds);
-
-
- /**
- * 获取导出数据
- *
- * @param queryWrapper
- * @return
- */
- List<EvaluateResultExcel> exportEvaluateResult(@Param("ew") Wrapper<EvaluateResultEntity> queryWrapper);
-
-}
diff --git a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateResultMapper.xml b/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateResultMapper.xml
deleted file mode 100644
index 8a04c3f..0000000
--- a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateResultMapper.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?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.EvaluateResultMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="evaluateResultResultMap" type="org.springblade.modules.evaluate.entity.EvaluateResultEntity">
- <result column="id" property="id"/>
- <result column="tenant_id" property="tenantId"/>
- <result column="assessment_task_id" property="evaluateTaskId"/>
- <result column="be_id" property="beId"/>
- <result column="score_user_id" property="scoreUserId"/>
- <result column="remark" property="remark"/>
- <result column="type" property="type"/>
- <result column="create_user" property="createUser"/>
- <result column="create_dept" property="createDept"/>
- <result column="create_time" property="createTime"/>
- <result column="update_user" property="updateUser"/>
- <result column="update_time" property="updateTime"/>
- <result column="status" property="status"/>
- <result column="is_deleted" property="isDeleted"/>
- <result column="temp_count" property="tempCount"/>
- </resultMap>
-
-
- <select id="selectEvaluateResultPage" resultMap="evaluateResultResultMap">
- select * from yw_evaluate_result where is_deleted = 0
- </select>
-
- <select id="selectEvaluateResultGroupBeId" resultMap="evaluateResultResultMap">
- select be_id,count(*) as temp_count from yw_evaluate_result where is_deleted = 0 AND type = 0
- <if test="evaluateResult.type !=null">
- AND type = #{evaluateResult.type}
- </if>
- <if test="evaluateResult.evaluateTaskId !=null and evaluateResult.evaluateTaskId!=''">
- AND evaluate_task_id = #{evaluateResult.evaluateTaskId}
- </if>
- AND be_id in
- <foreach collection="userIds" item="userId" index="index"
- open="(" close=")" separator=",">
- #{userId}
- </foreach>
- GROUP BY be_id ORDER BY count(*) desc
- </select>
-
- <select id="selectEvaluateResultByScoreIdsGroupBeId" resultMap="evaluateResultResultMap">
- select be_id,count(*) as temp_count from yw_evaluate_result where is_deleted = 0 AND type = 0
- <if test="evaluateResult.type !=null">
- AND type = #{evaluateResult.type}
- </if>
- <if test="evaluateResult.evaluateTaskId !=null and evaluateResult.evaluateTaskId!=''">
- AND evaluate_task_id = #{evaluateResult.evaluateTaskId}
- </if>
- AND score_user_id in
- <foreach collection="scoreUserIds" item="userId" index="index"
- open="(" close=")" separator=",">
- #{userId}
- </foreach>
- GROUP BY be_id ORDER BY count(*) desc
- </select>
-
-
- <select id="exportEvaluateResult" resultType="org.springblade.modules.evaluate.excel.EvaluateResultExcel">
- SELECT * FROM yw_evaluate_result ${ew.customSqlSegment}
- </select>
-
-</mapper>
diff --git a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskSetMapper.java b/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.java
similarity index 66%
rename from src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskSetMapper.java
rename to src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.java
index 54f8bb3..f1f8665 100644
--- a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskSetMapper.java
+++ b/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.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);
}
diff --git a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateAssessorMapper.xml b/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.xml
similarity index 63%
rename from src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateAssessorMapper.xml
rename to src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.xml
index 5e38f9c..b429044 100644
--- a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateAssessorMapper.xml
+++ b/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.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>
diff --git a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskSetMapper.xml b/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskSetMapper.xml
deleted file mode 100644
index 840fc01..0000000
--- a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskSetMapper.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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.EvaluateTaskSetMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="evaluateTaskSetResultMap" type="org.springblade.modules.evaluate.entity.EvaluateTaskSetEntity">
- <result column="id" property="id"/>
- <result column="tenant_id" property="tenantId"/>
- <result column="type" property="type"/>
- <result column="dept_id" property="deptId"/>
- <result column="dept_name" property="deptName"/>
- <result column="user_id" property="userId"/>
- <result column="user_name" property="userName"/>
- <result column="create_user" property="createUser"/>
- <result column="create_dept" property="createDept"/>
- <result column="create_time" property="createTime"/>
- <result column="update_user" property="updateUser"/>
- <result column="update_time" property="updateTime"/>
- <result column="status" property="status"/>
- <result column="is_deleted" property="isDeleted"/>
- </resultMap>
-
- <resultMap id="evaluateTaskSetVOMap" type="org.springblade.modules.evaluate.vo.EvaluateTaskSetVO" extends="evaluateTaskSetResultMap">
- <result column="vote_num" property="voteNum"/>
- </resultMap>
-
-
- <select id="selectEvaluateTaskSetPage" resultMap="evaluateTaskSetVOMap">
- select *,
- CASE type
- WHEN 0 THEN ( select count(*) from yw_evaluate_result b where b.evaluate_task_id = a.evaluate_task_id and a.user_id = b.be_id and b.type = 0)
- WHEN 1 THEN ( select count(*) from yw_evaluate_result b where b.evaluate_task_id = a.evaluate_task_id and a.dept_id = b.be_id and b.type = 1)
- END as vote_num
- from yw_evaluate_task_set a where is_deleted = 0
- <if test="evaluateTaskSet.type !=null">
- AND type = #{evaluateTaskSet.type}
- </if>
- <if test="evaluateTaskSet.evaluateTaskName !=null and evaluateTaskSet.evaluateTaskName !=''">
- AND evaluate_task_name like concat('%', #{evaluateTaskSet.evaluateTaskName},'%')
- </if>
- <if test="evaluateTaskSet.deptName !=null and evaluateTaskSet.deptName !=''">
- AND dept_name like concat('%', #{evaluateTaskSet.deptName},'%')
- </if>
-
- </select>
-
-
- <select id="exportEvaluateTaskSet" resultType="org.springblade.modules.evaluate.excel.EvaluateTaskSetExcel">
- SELECT * FROM yw_evaluate_task_set ${ew.customSqlSegment}
- </select>
-
-</mapper>
diff --git a/src/main/java/org/springblade/modules/evaluate/service/IEvaluateCandidateAssessorService.java b/src/main/java/org/springblade/modules/evaluate/service/IEvaluateCandidateAssessorService.java
deleted file mode 100644
index f969283..0000000
--- a/src/main/java/org/springblade/modules/evaluate/service/IEvaluateCandidateAssessorService.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import org.springblade.modules.evaluate.entity.EvaluateCandidateAssessorEntity;
-import org.springblade.modules.evaluate.vo.EvaluateCandidateAssessorVO;
-import org.springblade.modules.evaluate.excel.EvaluateCandidateAssessorExcel;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.mp.base.BaseService;
-import java.util.List;
-
-/**
- * 候选人评定表 服务类
- *
- * @author Aix
- * @since 2023-12-29
- */
-public interface IEvaluateCandidateAssessorService extends BaseService<EvaluateCandidateAssessorEntity> {
- /**
- * 自定义分页
- *
- * @param page
- * @param evaluateCandidateAssessor
- * @return
- */
- IPage<EvaluateCandidateAssessorVO> selectEvaluateCandidateAssessorPage(IPage<EvaluateCandidateAssessorVO> page, EvaluateCandidateAssessorVO evaluateCandidateAssessor);
-
-
- /**
- * 导出数据
- *
- * @param queryWrapper
- * @return
- */
- List<EvaluateCandidateAssessorExcel> exportEvaluateCandidateAssessor(Wrapper<EvaluateCandidateAssessorEntity> queryWrapper);
-
-}
diff --git a/src/main/java/org/springblade/modules/evaluate/service/IEvaluateResultService.java b/src/main/java/org/springblade/modules/evaluate/service/IEvaluateResultService.java
deleted file mode 100644
index 79c07b7..0000000
--- a/src/main/java/org/springblade/modules/evaluate/service/IEvaluateResultService.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import org.springblade.modules.evaluate.entity.EvaluateResultEntity;
-import org.springblade.modules.evaluate.vo.EvaluateResultVO;
-import org.springblade.modules.evaluate.excel.EvaluateResultExcel;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.mp.base.BaseService;
-import java.util.List;
-
-/**
- * 评优结果 服务类
- *
- * @author aix
- * @since 2023-12-18
- */
-public interface IEvaluateResultService extends BaseService<EvaluateResultEntity> {
- /**
- * 自定义分页
- *
- * @param page
- * @param evaluateResult
- * @return
- */
- IPage<EvaluateResultVO> selectEvaluateResultPage(IPage<EvaluateResultVO> page, EvaluateResultVO evaluateResult);
-
- IPage<EvaluateResultVO> selectEvaluateResultGroupBeId(IPage<EvaluateResultVO> page, EvaluateResultVO evaluateResult, List<Long> userIds);
-
- IPage<EvaluateResultVO> selectEvaluateResultByScoreIdsGroupBeId(IPage<EvaluateResultVO> page, EvaluateResultVO evaluateResult, List<Long> scoreUserIds);
-
-
- /**
- * 导出数据
- *
- * @param queryWrapper
- * @return
- */
- List<EvaluateResultExcel> exportEvaluateResult(Wrapper<EvaluateResultEntity> queryWrapper);
-
-}
diff --git a/src/main/java/org/springblade/modules/evaluate/service/IEvaluateCandidateService.java b/src/main/java/org/springblade/modules/evaluate/service/IEvaluateTaskReferrerService.java
similarity index 64%
rename from src/main/java/org/springblade/modules/evaluate/service/IEvaluateCandidateService.java
rename to src/main/java/org/springblade/modules/evaluate/service/IEvaluateTaskReferrerService.java
index 333f488..f7c0b9b 100644
--- a/src/main/java/org/springblade/modules/evaluate/service/IEvaluateCandidateService.java
+++ b/src/main/java/org/springblade/modules/evaluate/service/IEvaluateTaskReferrerService.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);
}
diff --git a/src/main/java/org/springblade/modules/evaluate/service/IEvaluateTaskSetService.java b/src/main/java/org/springblade/modules/evaluate/service/IEvaluateTaskSetService.java
deleted file mode 100644
index 984f55f..0000000
--- a/src/main/java/org/springblade/modules/evaluate/service/IEvaluateTaskSetService.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import org.springblade.modules.evaluate.entity.EvaluateTaskSetEntity;
-import org.springblade.modules.evaluate.vo.EvaluateTaskSetVO;
-import org.springblade.modules.evaluate.excel.EvaluateTaskSetExcel;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.mp.base.BaseService;
-import java.util.List;
-
-/**
- * 评优任务配置 服务类
- *
- * @author aix
- * @since 2023-12-21
- */
-public interface IEvaluateTaskSetService extends BaseService<EvaluateTaskSetEntity> {
- /**
- * 自定义分页
- *
- * @param page
- * @param evaluateTaskSet
- * @return
- */
- IPage<EvaluateTaskSetVO> selectEvaluateTaskSetPage(IPage<EvaluateTaskSetVO> page, EvaluateTaskSetVO evaluateTaskSet);
-
-
- /**
- * 导出数据
- *
- * @param queryWrapper
- * @return
- */
- List<EvaluateTaskSetExcel> exportEvaluateTaskSet(Wrapper<EvaluateTaskSetEntity> queryWrapper);
-
-}
diff --git a/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateCandidateAssessorServiceImpl.java b/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateCandidateAssessorServiceImpl.java
deleted file mode 100644
index 20f022f..0000000
--- a/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateCandidateAssessorServiceImpl.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.EvaluateCandidateAssessorEntity;
-import org.springblade.modules.evaluate.vo.EvaluateCandidateAssessorVO;
-import org.springblade.modules.evaluate.excel.EvaluateCandidateAssessorExcel;
-import org.springblade.modules.evaluate.mapper.EvaluateCandidateAssessorMapper;
-import org.springblade.modules.evaluate.service.IEvaluateCandidateAssessorService;
-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 2023-12-29
- */
-@Service
-public class EvaluateCandidateAssessorServiceImpl extends BaseServiceImpl<EvaluateCandidateAssessorMapper, EvaluateCandidateAssessorEntity> implements IEvaluateCandidateAssessorService {
-
- @Override
- public IPage<EvaluateCandidateAssessorVO> selectEvaluateCandidateAssessorPage(IPage<EvaluateCandidateAssessorVO> page, EvaluateCandidateAssessorVO evaluateCandidateAssessor) {
- return page.setRecords(baseMapper.selectEvaluateCandidateAssessorPage(page, evaluateCandidateAssessor));
- }
-
-
- @Override
- public List<EvaluateCandidateAssessorExcel> exportEvaluateCandidateAssessor(Wrapper<EvaluateCandidateAssessorEntity> queryWrapper) {
- List<EvaluateCandidateAssessorExcel> evaluateCandidateAssessorList = baseMapper.exportEvaluateCandidateAssessor(queryWrapper);
- //evaluateCandidateAssessorList.forEach(evaluateCandidateAssessor -> {
- // evaluateCandidateAssessor.setTypeName(DictCache.getValue(DictEnum.YES_NO, EvaluateCandidateAssessor.getType()));
- //});
- return evaluateCandidateAssessorList;
- }
-
-}
diff --git a/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateCandidateServiceImpl.java b/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateCandidateServiceImpl.java
deleted file mode 100644
index fb2af9b..0000000
--- a/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateCandidateServiceImpl.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.EvaluateCandidateEntity;
-import org.springblade.modules.evaluate.vo.EvaluateCandidateVO;
-import org.springblade.modules.evaluate.excel.EvaluateCandidateExcel;
-import org.springblade.modules.evaluate.mapper.EvaluateCandidateMapper;
-import org.springblade.modules.evaluate.service.IEvaluateCandidateService;
-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 2023-12-23
- */
-@Service
-public class EvaluateCandidateServiceImpl extends BaseServiceImpl<EvaluateCandidateMapper, EvaluateCandidateEntity> implements IEvaluateCandidateService {
-
- @Override
- public IPage<EvaluateCandidateVO> selectEvaluateCandidatePage(IPage<EvaluateCandidateVO> page, EvaluateCandidateVO evaluateCandidate) {
- return page.setRecords(baseMapper.selectEvaluateCandidatePage(page, evaluateCandidate));
- }
-
-
- @Override
- public List<EvaluateCandidateExcel> exportEvaluateCandidate(Wrapper<EvaluateCandidateEntity> queryWrapper) {
- List<EvaluateCandidateExcel> evaluateCandidateList = baseMapper.exportEvaluateCandidate(queryWrapper);
- //evaluateCandidateList.forEach(evaluateCandidate -> {
- // evaluateCandidate.setTypeName(DictCache.getValue(DictEnum.YES_NO, EvaluateCandidate.getType()));
- //});
- return evaluateCandidateList;
- }
-
-}
diff --git a/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateResultServiceImpl.java b/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateResultServiceImpl.java
deleted file mode 100644
index ab3a20c..0000000
--- a/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateResultServiceImpl.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * 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 com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.AllArgsConstructor;
-import org.springblade.common.cache.SysCache;
-import org.springblade.common.cache.UserCache;
-import org.springblade.core.redis.cache.BladeRedis;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.modules.assessment.wrapper.CandidateJsonObj;
-import org.springblade.modules.assessment.wrapper.UserJsonObj;
-import org.springblade.modules.evaluate.entity.EvaluateCandidateEntity;
-import org.springblade.modules.evaluate.entity.EvaluateResultEntity;
-import org.springblade.modules.evaluate.entity.EvaluateTaskEntity;
-import org.springblade.modules.evaluate.entity.EvaluateTaskSetEntity;
-import org.springblade.modules.evaluate.service.IEvaluateCandidateService;
-import org.springblade.modules.evaluate.service.IEvaluateTaskService;
-import org.springblade.modules.evaluate.service.IEvaluateTaskSetService;
-import org.springblade.modules.evaluate.vo.EvaluateResultVO;
-import org.springblade.modules.evaluate.excel.EvaluateResultExcel;
-import org.springblade.modules.evaluate.mapper.EvaluateResultMapper;
-import org.springblade.modules.evaluate.service.IEvaluateResultService;
-import org.springblade.modules.evaluate.wrapper.EvaluateResultWrapper;
-import org.springblade.modules.system.entity.User;
-import org.springblade.modules.system.service.IUserService;
-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 org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.springblade.common.cache.CacheNames.EVALUATE_CANDIDATE_DEPT_KEY;
-
-/**
- * 评优结果 服务实现类
- *
- * @author aix
- * @since 2023-12-18
- */
-@Service
-@AllArgsConstructor
-public class EvaluateResultServiceImpl extends BaseServiceImpl<EvaluateResultMapper, EvaluateResultEntity> implements IEvaluateResultService {
-
- private final IEvaluateTaskService evaluateTaskService;
-
- private final IUserService userService;
-
- private final IEvaluateCandidateService evaluateCandidateService;
-
- private final BladeRedis bladeRedis;
-
- @Override
- public IPage<EvaluateResultVO> selectEvaluateResultPage(IPage<EvaluateResultVO> page, EvaluateResultVO evaluateResult) {
- return page.setRecords(baseMapper.selectEvaluateResultPage(page, evaluateResult));
- }
-
- @Override
- public IPage<EvaluateResultVO> selectEvaluateResultGroupBeId(IPage<EvaluateResultVO> page, EvaluateResultVO evaluateResult,List<Long> userIds) {
- return page.setRecords(EvaluateResultWrapper.build().listVO(baseMapper.selectEvaluateResultGroupBeId(page, evaluateResult, userIds)));
- }
-
- @Override
- public IPage<EvaluateResultVO> selectEvaluateResultByScoreIdsGroupBeId(IPage<EvaluateResultVO> page, EvaluateResultVO evaluateResult, List<Long> scoreUserIds) {
- return page.setRecords(EvaluateResultWrapper.build().listVO(baseMapper.selectEvaluateResultGroupBeId(page, evaluateResult, scoreUserIds)));
- }
-
- @Override
- public List<EvaluateResultExcel> exportEvaluateResult(Wrapper<EvaluateResultEntity> queryWrapper) {
- List<EvaluateResultExcel> evaluateResultList = baseMapper.exportEvaluateResult(queryWrapper);
- //evaluateResultList.forEach(evaluateResult -> {
- // evaluateResult.setTypeName(DictCache.getValue(DictEnum.YES_NO, EvaluateResult.getType()));
- //});
- return evaluateResultList;
- }
-
- @Override
- @Transactional
- public boolean saveOrUpdate(EvaluateResultEntity evaluateResult) {
-
- return super.saveOrUpdate(evaluateResult);
- }
-
-}
diff --git a/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskReferrerServiceImpl.java b/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskReferrerServiceImpl.java
new file mode 100644
index 0000000..51a2bd4
--- /dev/null
+++ b/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskReferrerServiceImpl.java
@@ -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;
+ }
+
+}
diff --git a/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskSetServiceImpl.java b/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskSetServiceImpl.java
deleted file mode 100644
index 679d431..0000000
--- a/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskSetServiceImpl.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.EvaluateTaskSetEntity;
-import org.springblade.modules.evaluate.vo.EvaluateTaskSetVO;
-import org.springblade.modules.evaluate.excel.EvaluateTaskSetExcel;
-import org.springblade.modules.evaluate.mapper.EvaluateTaskSetMapper;
-import org.springblade.modules.evaluate.service.IEvaluateTaskSetService;
-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 2023-12-21
- */
-@Service
-public class EvaluateTaskSetServiceImpl extends BaseServiceImpl<EvaluateTaskSetMapper, EvaluateTaskSetEntity> implements IEvaluateTaskSetService {
-
- @Override
- public IPage<EvaluateTaskSetVO> selectEvaluateTaskSetPage(IPage<EvaluateTaskSetVO> page, EvaluateTaskSetVO evaluateTaskSet) {
- return page.setRecords(baseMapper.selectEvaluateTaskSetPage(page, evaluateTaskSet));
- }
-
-
- @Override
- public List<EvaluateTaskSetExcel> exportEvaluateTaskSet(Wrapper<EvaluateTaskSetEntity> queryWrapper) {
- List<EvaluateTaskSetExcel> evaluateTaskSetList = baseMapper.exportEvaluateTaskSet(queryWrapper);
- //evaluateTaskSetList.forEach(evaluateTaskSet -> {
- // evaluateTaskSet.setTypeName(DictCache.getValue(DictEnum.YES_NO, EvaluateTaskSet.getType()));
- //});
- return evaluateTaskSetList;
- }
-
-}
diff --git a/src/main/java/org/springblade/modules/evaluate/vo/EvaluateCandidateAssessorVO.java b/src/main/java/org/springblade/modules/evaluate/vo/EvaluateCandidateAssessorVO.java
deleted file mode 100644
index 777b699..0000000
--- a/src/main/java/org/springblade/modules/evaluate/vo/EvaluateCandidateAssessorVO.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.vo;
-
-import org.springblade.modules.evaluate.entity.EvaluateCandidateAssessorEntity;
-import org.springblade.core.tool.node.INode;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 候选人评定表 视图实体类
- *
- * @author Aix
- * @since 2023-12-29
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class EvaluateCandidateAssessorVO extends EvaluateCandidateAssessorEntity {
- private static final long serialVersionUID = 1L;
-
- private EvaluateCandidateVO evaluateCandidateVO;
- private EvaluateTaskVO evaluateTaskVO;
-
- private Boolean isEvaluateOneOk;//第一轮是否评论完成
- private Boolean isEvaluateTwoOk;//第二轮是否评论完成
-
- private EvaluateResultVO evaluateResultOneVO;//第一轮评论信息
- private EvaluateResultVO evaluateResultTwoVO;//第二轮评论信息
-
-}
diff --git a/src/main/java/org/springblade/modules/evaluate/vo/EvaluateResultVO.java b/src/main/java/org/springblade/modules/evaluate/vo/EvaluateResultVO.java
deleted file mode 100644
index f47890d..0000000
--- a/src/main/java/org/springblade/modules/evaluate/vo/EvaluateResultVO.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.vo;
-
-import org.springblade.modules.evaluate.entity.EvaluateResultEntity;
-import org.springblade.core.tool.node.INode;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 评优结果 视图实体类
- *
- * @author aix
- * @since 2023-12-18
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class EvaluateResultVO extends EvaluateResultEntity {
- private static final long serialVersionUID = 1L;
-
- private String scoreUserName;
- private String scoreDeptName;
- private String scorePostName;
-
-}
diff --git a/src/main/java/org/springblade/modules/evaluate/vo/EvaluateCandidateVO.java b/src/main/java/org/springblade/modules/evaluate/vo/EvaluateTaskReferrerVO.java
similarity index 79%
rename from src/main/java/org/springblade/modules/evaluate/vo/EvaluateCandidateVO.java
rename to src/main/java/org/springblade/modules/evaluate/vo/EvaluateTaskReferrerVO.java
index 8126c10..ddad840 100644
--- a/src/main/java/org/springblade/modules/evaluate/vo/EvaluateCandidateVO.java
+++ b/src/main/java/org/springblade/modules/evaluate/vo/EvaluateTaskReferrerVO.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;
}
diff --git a/src/main/java/org/springblade/modules/evaluate/vo/EvaluateTaskSetVO.java b/src/main/java/org/springblade/modules/evaluate/vo/EvaluateTaskSetVO.java
deleted file mode 100644
index f3645ce..0000000
--- a/src/main/java/org/springblade/modules/evaluate/vo/EvaluateTaskSetVO.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.vo;
-
-import org.springblade.modules.evaluate.entity.EvaluateTaskSetEntity;
-import org.springblade.core.tool.node.INode;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 评优任务配置 视图实体类
- *
- * @author aix
- * @since 2023-12-21
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class EvaluateTaskSetVO extends EvaluateTaskSetEntity {
-
- private static final long serialVersionUID = 1L;
-
- private Long voteNum;
-
-}
diff --git a/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateCandidateAssessorWrapper.java b/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateCandidateAssessorWrapper.java
deleted file mode 100644
index 8a8242a..0000000
--- a/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateCandidateAssessorWrapper.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * 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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.core.tool.utils.SpringUtil;
-import org.springblade.modules.evaluate.entity.EvaluateCandidateAssessorEntity;
-import org.springblade.modules.evaluate.entity.EvaluateCandidateEntity;
-import org.springblade.modules.evaluate.service.IEvaluateCandidateService;
-import org.springblade.modules.evaluate.service.IEvaluateResultService;
-import org.springblade.modules.evaluate.service.IEvaluateTaskService;
-import org.springblade.modules.evaluate.vo.EvaluateCandidateAssessorVO;
-import org.springblade.modules.evaluate.vo.EvaluateCandidateVO;
-import org.springblade.modules.evaluate.vo.EvaluateResultVO;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * 候选人评定表 包装类,返回视图层所需的字段
- *
- * @author Aix
- * @since 2023-12-29
- */
-public class EvaluateCandidateAssessorWrapper extends BaseEntityWrapper<EvaluateCandidateAssessorEntity, EvaluateCandidateAssessorVO> {
-
- private static final IEvaluateCandidateService evaluateCandidateService;
- private static final IEvaluateTaskService evaluateTaskService;
-
- private static final IEvaluateResultService evaluateResultService;
-
- static {
- evaluateCandidateService = SpringUtil.getBean(IEvaluateCandidateService.class);
- evaluateTaskService = SpringUtil.getBean(IEvaluateTaskService.class);
- evaluateResultService = SpringUtil.getBean(IEvaluateResultService.class);
- }
- public static EvaluateCandidateAssessorWrapper build() {
- return new EvaluateCandidateAssessorWrapper();
- }
-
- @Override
- public EvaluateCandidateAssessorVO entityVO(EvaluateCandidateAssessorEntity evaluateCandidateAssessor) {
- EvaluateCandidateAssessorVO evaluateCandidateAssessorVO = Objects.requireNonNull(BeanUtil.copy(evaluateCandidateAssessor, EvaluateCandidateAssessorVO.class));
-
- //User createUser = UserCache.getUser(evaluateCandidateAssessor.getCreateUser());
- //User updateUser = UserCache.getUser(evaluateCandidateAssessor.getUpdateUser());
- //evaluateCandidateAssessorVO.setCreateUserName(createUser.getName());
- //evaluateCandidateAssessorVO.setUpdateUserName(updateUser.getName());
-
- return evaluateCandidateAssessorVO;
- }
-
- public IPage<EvaluateCandidateAssessorVO> h5PageVO(IPage<EvaluateCandidateAssessorEntity> pages, Long userId) {
- List<EvaluateCandidateAssessorVO> records = listVO(pages.getRecords());
-
- for (EvaluateCandidateAssessorVO vo : records) {
- EvaluateCandidateVO candidateVO = EvaluateCandidateWrapper.build().entityVO(evaluateCandidateService.getById(vo.getEvaluateCandidateId()));
- vo.setEvaluateCandidateVO(candidateVO);
- vo.setEvaluateTaskVO(EvaluateTaskWrapper.build().entityVO(evaluateTaskService.getById(candidateVO.getEvaluateTaskId())));
-
- // 任务状态是个人还是部门
- if (vo.getEvaluateTaskVO().getType() == 0) {
- //是否评论完成
- QueryWrapper queryWrapper = new QueryWrapper();
- queryWrapper.eq("type", 0);
- queryWrapper.eq("score_user_id", userId);
- queryWrapper.eq("evaluate_task_id", vo.getEvaluateTaskVO().getId());// 任务id
- EvaluateResultVO resultVO = EvaluateResultWrapper.build().entityVO(evaluateResultService.getOne(queryWrapper));
-
- vo.setIsEvaluateOneOk(null != resultVO);
- vo.setEvaluateResultOneVO(resultVO);
-
- queryWrapper.eq("type", 2);
- queryWrapper.eq("score_user_id", userId);
- queryWrapper.eq("evaluate_task_id", vo.getEvaluateTaskVO().getId());// 任务id
- resultVO = EvaluateResultWrapper.build().entityVO(evaluateResultService.getOne(queryWrapper));
-
- vo.setIsEvaluateTwoOk(null != resultVO);
- vo.setEvaluateResultTwoVO(resultVO);
-
- } else {// 部门
- //是否评论完成
- QueryWrapper queryWrapper = new QueryWrapper();
- queryWrapper.eq("type", 1);
- queryWrapper.eq("score_user_id", userId);
- queryWrapper.eq("evaluate_task_id", vo.getEvaluateTaskVO().getId());// 任务id
- EvaluateResultVO resultVO = EvaluateResultWrapper.build().entityVO(evaluateResultService.getOne(queryWrapper));
-
- vo.setIsEvaluateOneOk(null != resultVO);
- vo.setEvaluateResultOneVO(resultVO);
-
- }
-
- }
-
- IPage<EvaluateCandidateAssessorVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
- pageVo.setRecords(records);
- return pageVo;
- }
-
-
-}
diff --git a/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateCandidateWrapper.java b/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateCandidateWrapper.java
deleted file mode 100644
index be8c50e..0000000
--- a/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateCandidateWrapper.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.core.tool.utils.SpringUtil;
-import org.springblade.modules.evaluate.entity.EvaluateCandidateEntity;
-import org.springblade.modules.evaluate.entity.EvaluateResultEntity;
-import org.springblade.modules.evaluate.service.IEvaluateResultService;
-import org.springblade.modules.evaluate.vo.EvaluateCandidateVO;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-/**
- * 评优候选人 包装类,返回视图层所需的字段
- *
- * @author aix
- * @since 2023-12-23
- */
-public class EvaluateCandidateWrapper extends BaseEntityWrapper<EvaluateCandidateEntity, EvaluateCandidateVO> {
-
- private static final IEvaluateResultService evaluateResultService;
-
- static {
- evaluateResultService = SpringUtil.getBean(IEvaluateResultService.class);
- }
-
- public static EvaluateCandidateWrapper build() {
- return new EvaluateCandidateWrapper();
- }
-
- @Override
- public EvaluateCandidateVO entityVO(EvaluateCandidateEntity evaluateCandidate) {
- EvaluateCandidateVO evaluateCandidateVO = Objects.requireNonNull(BeanUtil.copy(evaluateCandidate, EvaluateCandidateVO.class));
-
- //User createUser = UserCache.getUser(evaluateCandidate.getCreateUser());
- //User updateUser = UserCache.getUser(evaluateCandidate.getUpdateUser());
- //evaluateCandidateVO.setCreateUserName(createUser.getName());
- //evaluateCandidateVO.setUpdateUserName(updateUser.getName());
-
- return evaluateCandidateVO;
- }
-
- @Override
- public IPage<EvaluateCandidateVO> pageVO(IPage<EvaluateCandidateEntity> pages) {
- List<EvaluateCandidateVO> records = listVO(pages.getRecords());
-
-// for (EvaluateCandidateVO vo : records) {
-// QueryWrapper<EvaluateResultEntity> queryWrapper = new QueryWrapper<>();
-// queryWrapper.eq("be_id",vo.getUserId());
-// queryWrapper.eq("evaluate_task_id",vo.getEvaluateTaskId());
-// queryWrapper.eq("type", 2);
-// vo.setVoteNum(evaluateResultService.count(queryWrapper));
-// }
-
- IPage<EvaluateCandidateVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
- pageVo.setRecords(records);
- return pageVo;
- }
-
-
-}
diff --git a/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateResultWrapper.java b/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateResultWrapper.java
deleted file mode 100644
index 30c10ac..0000000
--- a/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateResultWrapper.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springblade.common.cache.SysCache;
-import org.springblade.common.cache.UserCache;
-import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.modules.evaluate.entity.EvaluateCandidateEntity;
-import org.springblade.modules.evaluate.entity.EvaluateResultEntity;
-import org.springblade.modules.evaluate.vo.EvaluateCandidateVO;
-import org.springblade.modules.evaluate.vo.EvaluateResultVO;
-import org.springblade.modules.system.entity.User;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * 评优结果 包装类,返回视图层所需的字段
- *
- * @author aix
- * @since 2023-12-18
- */
-public class EvaluateResultWrapper extends BaseEntityWrapper<EvaluateResultEntity, EvaluateResultVO> {
-
- public static EvaluateResultWrapper build() {
- return new EvaluateResultWrapper();
- }
-
- @Override
- public EvaluateResultVO entityVO(EvaluateResultEntity evaluateResult) {
- EvaluateResultVO evaluateResultVO = Objects.requireNonNull(BeanUtil.copy(evaluateResult, EvaluateResultVO.class));
-
- //User createUser = UserCache.getUser(evaluateResult.getCreateUser());
- //User updateUser = UserCache.getUser(evaluateResult.getUpdateUser());
- //evaluateResultVO.setCreateUserName(createUser.getName());
- //evaluateResultVO.setUpdateUserName(updateUser.getName());
-
- return evaluateResultVO;
- }
-
- @Override
- public IPage<EvaluateResultVO> pageVO(IPage<EvaluateResultEntity> pages) {
- List<EvaluateResultVO> records = listVO(pages.getRecords());
-
- for (EvaluateResultVO vo : records) {
- User user = UserCache.getUser(vo.getScoreUserId()); //评分人
- vo.setScoreUserName(user.getName());
- vo.setScoreDeptName(SysCache.getDeptName(Long.valueOf(user.getDeptId())));
- vo.setScorePostName(SysCache.getPostName(Long.valueOf(user.getPostId())));
- }
-
- IPage<EvaluateResultVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
- pageVo.setRecords(records);
- return pageVo;
- }
-
-
-}
diff --git a/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskReferrerWrapper.java b/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskReferrerWrapper.java
new file mode 100644
index 0000000..9c1c0fe
--- /dev/null
+++ b/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskReferrerWrapper.java
@@ -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;
+ }
+
+
+}
diff --git a/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskSetWrapper.java b/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskSetWrapper.java
deleted file mode 100644
index f66cf5e..0000000
--- a/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskSetWrapper.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * 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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.core.tool.utils.SpringUtil;
-import org.springblade.modules.evaluate.entity.EvaluateResultEntity;
-import org.springblade.modules.evaluate.entity.EvaluateTaskSetEntity;
-import org.springblade.modules.evaluate.service.IEvaluateResultService;
-import org.springblade.modules.evaluate.service.IEvaluateTaskService;
-import org.springblade.modules.evaluate.service.IEvaluateTaskSetService;
-import org.springblade.modules.evaluate.vo.EvaluateTaskSetVO;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * 评优任务配置 包装类,返回视图层所需的字段
- *
- * @author aix
- * @since 2023-12-21
- */
-public class EvaluateTaskSetWrapper extends BaseEntityWrapper<EvaluateTaskSetEntity, EvaluateTaskSetVO> {
-
- private static final IEvaluateResultService evaluateResultService;
-
- static {
- evaluateResultService = SpringUtil.getBean(IEvaluateResultService.class);
- }
-
- public static EvaluateTaskSetWrapper build() {
- return new EvaluateTaskSetWrapper();
- }
-
- @Override
- public EvaluateTaskSetVO entityVO(EvaluateTaskSetEntity evaluateTaskSet) {
- EvaluateTaskSetVO evaluateTaskSetVO = Objects.requireNonNull(BeanUtil.copy(evaluateTaskSet, EvaluateTaskSetVO.class));
-
- //User createUser = UserCache.getUser(evaluateTaskSet.getCreateUser());
- //User updateUser = UserCache.getUser(evaluateTaskSet.getUpdateUser());
- //evaluateTaskSetVO.setCreateUserName(createUser.getName());
- //evaluateTaskSetVO.setUpdateUserName(updateUser.getName());
-
- return evaluateTaskSetVO;
- }
-
- @Override
- public IPage<EvaluateTaskSetVO> pageVO(IPage<EvaluateTaskSetEntity> pages) {
- List<EvaluateTaskSetVO> records = listVO(pages.getRecords());
-
- for (EvaluateTaskSetVO vo : records) {
- QueryWrapper<EvaluateResultEntity> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("be_id",vo.getUserId());
- queryWrapper.eq("evaluate_task_id",vo.getEvaluateTaskId());
- queryWrapper.eq("type", vo.getType());
- vo.setVoteNum(evaluateResultService.count(queryWrapper));
- }
-
- IPage<EvaluateTaskSetVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
- pageVo.setRecords(records);
- return pageVo;
- }
-
-
-}
--
Gitblit v1.9.3