From c8bcb31b06e80bfcfb5324379098e5c666e49e18 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 02 Jan 2024 13:48:48 +0800
Subject: [PATCH] 考核任务设置考核人
---
src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetAssessorMapper.java | 20
src/main/java/org/springblade/modules/assessment/service/IAssessmentSetAssessorService.java | 20
src/main/java/org/springblade/modules/assessment/service/impl/AssessmentSetAssessorServiceImpl.java | 54 ++++
src/main/java/org/springblade/modules/assessment/wrapper/AssessmentScoreWrapper.java | 7
src/main/java/org/springblade/modules/assessment/controller/AssessmentSetAssessorController.java | 151 +++++++++++++
src/main/java/org/springblade/modules/assessment/entity/AssessmentSetAssessorEntity.java | 80 +++++++
src/main/java/org/springblade/modules/assessment/vo/AssessmentSetAssessorVO.java | 13
/dev/null | 117 ----------
src/main/java/org/springblade/modules/assessment/dto/AssessmentSetAssessorDTO.java | 10
src/main/java/org/springblade/modules/assessment/excel/AssessmentSetAssessorExcel.java | 40 ++
src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetAssessorWrapper.java | 50 ++++
src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetAssessorMapper.xml | 36 +++
src/main/java/org/springblade/modules/assessment/service/impl/AssessmentScoreServiceImpl.java | 36 ---
13 files changed, 435 insertions(+), 199 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
new file mode 100644
index 0000000..6e462f5
--- /dev/null
+++ b/src/main/java/org/springblade/modules/assessment/controller/AssessmentSetAssessorController.java
@@ -0,0 +1,151 @@
+/*
+ * 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.assessment.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.assessment.entity.AssessmentSetAssessorEntity;
+import org.springblade.modules.assessment.vo.AssessmentSetAssessorVO;
+import org.springblade.modules.assessment.excel.AssessmentSetAssessorExcel;
+import org.springblade.modules.assessment.wrapper.AssessmentSetAssessorWrapper;
+import org.springblade.modules.assessment.service.IAssessmentSetAssessorService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 考核任务考核人 控制器
+ *
+ * @author Aix
+ * @since 2024-01-02
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("assessment/assessmentSetAssessor")
+@Api(value = "考核任务考核人", tags = "考核任务考核人接口")
+public class AssessmentSetAssessorController extends BladeController {
+
+ private final IAssessmentSetAssessorService assessmentSetAssessorService;
+
+ /**
+ * 考核任务考核人 详情
+ */
+ @GetMapping("/detail")
+ @ApiOperationSupport(order = 1)
+ @ApiOperation(value = "详情", notes = "传入assessmentSetAssessor")
+ public R<AssessmentSetAssessorVO> detail(AssessmentSetAssessorEntity assessmentSetAssessor) {
+ AssessmentSetAssessorEntity detail = assessmentSetAssessorService.getOne(Condition.getQueryWrapper(assessmentSetAssessor));
+ return R.data(AssessmentSetAssessorWrapper.build().entityVO(detail));
+ }
+ /**
+ * 考核任务考核人 分页
+ */
+ @GetMapping("/list")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "分页", notes = "传入assessmentSetAssessor")
+ public R<IPage<AssessmentSetAssessorVO>> list(@ApiIgnore @RequestParam Map<String, Object> assessmentSetAssessor, Query query) {
+ IPage<AssessmentSetAssessorEntity> pages = assessmentSetAssessorService.page(Condition.getPage(query), Condition.getQueryWrapper(assessmentSetAssessor, AssessmentSetAssessorEntity.class));
+ return R.data(AssessmentSetAssessorWrapper.build().pageVO(pages));
+ }
+
+ /**
+ * 考核任务考核人 自定义分页
+ */
+ @GetMapping("/page")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入assessmentSetAssessor")
+ public R<IPage<AssessmentSetAssessorVO>> page(AssessmentSetAssessorVO assessmentSetAssessor, Query query) {
+ IPage<AssessmentSetAssessorVO> pages = assessmentSetAssessorService.selectAssessmentSetAssessorPage(Condition.getPage(query), assessmentSetAssessor);
+ return R.data(pages);
+ }
+
+ /**
+ * 考核任务考核人 新增
+ */
+ @PostMapping("/save")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "新增", notes = "传入assessmentSetAssessor")
+ public R save(@Valid @RequestBody AssessmentSetAssessorEntity assessmentSetAssessor) {
+ return R.status(assessmentSetAssessorService.save(assessmentSetAssessor));
+ }
+
+ /**
+ * 考核任务考核人 修改
+ */
+ @PostMapping("/update")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "修改", notes = "传入assessmentSetAssessor")
+ public R update(@Valid @RequestBody AssessmentSetAssessorEntity assessmentSetAssessor) {
+ return R.status(assessmentSetAssessorService.updateById(assessmentSetAssessor));
+ }
+
+ /**
+ * 考核任务考核人 新增或修改
+ */
+ @PostMapping("/submit")
+ @ApiOperationSupport(order = 6)
+ @ApiOperation(value = "新增或修改", notes = "传入assessmentSetAssessor")
+ public R submit(@Valid @RequestBody AssessmentSetAssessorEntity assessmentSetAssessor) {
+ return R.status(assessmentSetAssessorService.saveOrUpdate(assessmentSetAssessor));
+ }
+
+ /**
+ * 考核任务考核人 删除
+ */
+ @PostMapping("/remove")
+ @ApiOperationSupport(order = 7)
+ @ApiOperation(value = "逻辑删除", notes = "传入ids")
+ public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ return R.status(assessmentSetAssessorService.deleteLogic(Func.toLongList(ids)));
+ }
+
+
+ /**
+ * 导出数据
+ */
+ @GetMapping("/export-assessmentSetAssessor")
+ @ApiOperationSupport(order = 9)
+ @ApiOperation(value = "导出数据", notes = "传入assessmentSetAssessor")
+ public void exportAssessmentSetAssessor(@ApiIgnore @RequestParam Map<String, Object> assessmentSetAssessor, BladeUser bladeUser, HttpServletResponse response) {
+ QueryWrapper<AssessmentSetAssessorEntity> queryWrapper = Condition.getQueryWrapper(assessmentSetAssessor, AssessmentSetAssessorEntity.class);
+ //if (!AuthUtil.isAdministrator()) {
+ // queryWrapper.lambda().eq(AssessmentSetAssessor::getTenantId, bladeUser.getTenantId());
+ //}
+ queryWrapper.lambda().eq(AssessmentSetAssessorEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+ List<AssessmentSetAssessorExcel> list = assessmentSetAssessorService.exportAssessmentSetAssessor(queryWrapper);
+ ExcelUtil.export(response, "考核任务考核人数据" + DateUtil.time(), "考核任务考核人数据表", list, AssessmentSetAssessorExcel.class);
+ }
+
+}
diff --git a/src/main/java/org/springblade/modules/assessment/controller/AssessmentSetDeptController.java b/src/main/java/org/springblade/modules/assessment/controller/AssessmentSetDeptController.java
deleted file mode 100644
index adb0cdf..0000000
--- a/src/main/java/org/springblade/modules/assessment/controller/AssessmentSetDeptController.java
+++ /dev/null
@@ -1,152 +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.assessment.controller;
-
-import com.github.xiaoymin.knife4j.annotations.ApiSort;
-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.assessment.entity.AssessmentSetDeptEntity;
-import org.springblade.modules.assessment.vo.AssessmentSetDeptVO;
-import org.springblade.modules.assessment.excel.AssessmentSetDeptExcel;
-import org.springblade.modules.assessment.wrapper.AssessmentSetDeptWrapper;
-import org.springblade.modules.assessment.service.IAssessmentSetDeptService;
-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-12
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("assessment/assessmentSetDept")
-@Api(value = "考核权重-部门", tags = "部门考核权重设置接口")
-public class AssessmentSetDeptController extends BladeController {
-
- private final IAssessmentSetDeptService assessmentSetDeptService;
-
- /**
- * 考核权重-部门 详情
- */
- @GetMapping("/detail")
- @ApiOperationSupport(order = 1)
- @ApiOperation(value = "详情", notes = "传入assessmentSetDept")
- public R<AssessmentSetDeptVO> detail(AssessmentSetDeptEntity assessmentSetDept) {
- AssessmentSetDeptEntity detail = assessmentSetDeptService.getOne(Condition.getQueryWrapper(assessmentSetDept));
- return R.data(AssessmentSetDeptWrapper.build().entityVO(detail));
- }
- /**
- * 考核权重-部门 分页
- */
- @GetMapping("/list")
- @ApiOperationSupport(order = 2)
- @ApiOperation(value = "分页", notes = "传入assessmentSetDept")
- public R<IPage<AssessmentSetDeptVO>> list(@ApiIgnore @RequestParam Map<String, Object> assessmentSetDept, Query query) {
- IPage<AssessmentSetDeptEntity> pages = assessmentSetDeptService.page(Condition.getPage(query), Condition.getQueryWrapper(assessmentSetDept, AssessmentSetDeptEntity.class));
- return R.data(AssessmentSetDeptWrapper.build().pageVO(pages));
- }
-
- /**
- * 考核权重-部门 自定义分页
- */
- @GetMapping("/page")
- @ApiOperationSupport(order = 3)
- @ApiOperation(value = "分页", notes = "传入assessmentSetDept")
- public R<IPage<AssessmentSetDeptVO>> page(AssessmentSetDeptVO assessmentSetDept, Query query) {
- IPage<AssessmentSetDeptVO> pages = assessmentSetDeptService.selectAssessmentSetDeptPage(Condition.getPage(query), assessmentSetDept);
- return R.data(pages);
- }
-
- /**
- * 考核权重-部门 新增
- */
- @PostMapping("/save")
- @ApiOperationSupport(order = 4)
- @ApiOperation(value = "新增", notes = "传入assessmentSetDept")
- public R save(@Valid @RequestBody AssessmentSetDeptEntity assessmentSetDept) {
- return R.status(assessmentSetDeptService.save(assessmentSetDept));
- }
-
- /**
- * 考核权重-部门 修改
- */
- @PostMapping("/update")
- @ApiOperationSupport(order = 5)
- @ApiOperation(value = "修改", notes = "传入assessmentSetDept")
- public R update(@Valid @RequestBody AssessmentSetDeptEntity assessmentSetDept) {
- return R.status(assessmentSetDeptService.updateById(assessmentSetDept));
- }
-
- /**
- * 考核权重-部门 新增或修改
- */
- @PostMapping("/submit")
- @ApiOperationSupport(order = 6)
- @ApiOperation(value = "新增或修改", notes = "传入assessmentSetDept")
- public R submit(@Valid @RequestBody AssessmentSetDeptEntity assessmentSetDept) {
- return R.status(assessmentSetDeptService.saveOrUpdate(assessmentSetDept));
- }
-
- /**
- * 考核权重-部门 删除
- */
- @PostMapping("/remove")
- @ApiOperationSupport(order = 7)
- @ApiOperation(value = "逻辑删除", notes = "传入ids")
- public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(assessmentSetDeptService.deleteLogic(Func.toLongList(ids)));
- }
-
-
- /**
- * 导出数据
- */
- @GetMapping("/export-assessmentSetDept")
- @ApiOperationSupport(order = 9)
- @ApiOperation(value = "导出数据", notes = "传入assessmentSetDept")
- public void exportAssessmentSetDept(@ApiIgnore @RequestParam Map<String, Object> assessmentSetDept, BladeUser bladeUser, HttpServletResponse response) {
- QueryWrapper<AssessmentSetDeptEntity> queryWrapper = Condition.getQueryWrapper(assessmentSetDept, AssessmentSetDeptEntity.class);
- //if (!AuthUtil.isAdministrator()) {
- // queryWrapper.lambda().eq(AssessmentSetDept::getTenantId, bladeUser.getTenantId());
- //}
- queryWrapper.lambda().eq(AssessmentSetDeptEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
- List<AssessmentSetDeptExcel> list = assessmentSetDeptService.exportAssessmentSetDept(queryWrapper);
- ExcelUtil.export(response, "考核权重-部门数据" + DateUtil.time(), "考核权重-部门数据表", list, AssessmentSetDeptExcel.class);
- }
-
-}
diff --git a/src/main/java/org/springblade/modules/assessment/dto/AssessmentSetDeptDTO.java b/src/main/java/org/springblade/modules/assessment/dto/AssessmentSetAssessorDTO.java
similarity index 80%
rename from src/main/java/org/springblade/modules/assessment/dto/AssessmentSetDeptDTO.java
rename to src/main/java/org/springblade/modules/assessment/dto/AssessmentSetAssessorDTO.java
index b906dd3..35b6220 100644
--- a/src/main/java/org/springblade/modules/assessment/dto/AssessmentSetDeptDTO.java
+++ b/src/main/java/org/springblade/modules/assessment/dto/AssessmentSetAssessorDTO.java
@@ -16,19 +16,19 @@
*/
package org.springblade.modules.assessment.dto;
-import org.springblade.modules.assessment.entity.AssessmentSetDeptEntity;
+import org.springblade.modules.assessment.entity.AssessmentSetAssessorEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
- * 考核权重-部门 数据传输对象实体类
+ * 考核任务考核人 数据传输对象实体类
*
- * @author aix
- * @since 2023-12-12
+ * @author Aix
+ * @since 2024-01-02
*/
@Data
@EqualsAndHashCode(callSuper = true)
-public class AssessmentSetDeptDTO extends AssessmentSetDeptEntity {
+public class AssessmentSetAssessorDTO extends AssessmentSetAssessorEntity {
private static final long serialVersionUID = 1L;
}
diff --git a/src/main/java/org/springblade/modules/assessment/entity/AssessmentSetAssessorEntity.java b/src/main/java/org/springblade/modules/assessment/entity/AssessmentSetAssessorEntity.java
new file mode 100644
index 0000000..559e918
--- /dev/null
+++ b/src/main/java/org/springblade/modules/assessment/entity/AssessmentSetAssessorEntity.java
@@ -0,0 +1,80 @@
+/*
+ * 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.assessment.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 2024-01-02
+ */
+@Data
+@TableName("yw_assessment_set_assessor")
+@ApiModel(value = "AssessmentSetAssessor对象", description = "考核任务考核人")
+@EqualsAndHashCode(callSuper = true)
+public class AssessmentSetAssessorEntity extends TenantEntity {
+
+ /**
+ * 被考核人表id
+ */
+ @ApiModelProperty(value = "被考核人表id")
+ private Long assessmentSetId;
+ /**
+ * 考核人
+ */
+ @ApiModelProperty(value = "考核人")
+ 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 weight;
+ /**
+ * 范围
+ */
+ @ApiModelProperty(value = "范围")
+ private Integer rangeVal;
+
+}
diff --git a/src/main/java/org/springblade/modules/assessment/excel/AssessmentSetDeptExcel.java b/src/main/java/org/springblade/modules/assessment/excel/AssessmentSetAssessorExcel.java
similarity index 72%
rename from src/main/java/org/springblade/modules/assessment/excel/AssessmentSetDeptExcel.java
rename to src/main/java/org/springblade/modules/assessment/excel/AssessmentSetAssessorExcel.java
index 3774c30..94c273f 100644
--- a/src/main/java/org/springblade/modules/assessment/excel/AssessmentSetDeptExcel.java
+++ b/src/main/java/org/springblade/modules/assessment/excel/AssessmentSetAssessorExcel.java
@@ -28,16 +28,16 @@
/**
- * 考核权重-部门 Excel实体类
+ * 考核任务考核人 Excel实体类
*
- * @author aix
- * @since 2023-12-12
+ * @author Aix
+ * @since 2024-01-02
*/
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
-public class AssessmentSetDeptExcel implements Serializable {
+public class AssessmentSetAssessorExcel implements Serializable {
private static final long serialVersionUID = 1L;
@@ -48,17 +48,41 @@
@ExcelProperty("租户ID")
private String tenantId;
/**
- * 被考核人
+ * 被考核人表id
*/
@ColumnWidth(20)
- @ExcelProperty("被考核人")
- private Long deptId;
+ @ExcelProperty("被考核人表id")
+ private Long assessmentSetId;
/**
* 考核人
*/
@ColumnWidth(20)
@ExcelProperty("考核人")
- private Long toUserId;
+ private Long userId;
+ /**
+ * 考核人名称
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("考核人名称")
+ private String userName;
+ /**
+ * 考核人部门id
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("考核人部门id")
+ private Long deptId;
+ /**
+ * 考核人部门名称
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("考核人部门名称")
+ private String deptName;
+ /**
+ * 考核人职位名称
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("考核人职位名称")
+ private String postName;
/**
* 权值
*/
diff --git a/src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetDeptMapper.java b/src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetAssessorMapper.java
similarity index 65%
rename from src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetDeptMapper.java
rename to src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetAssessorMapper.java
index e338448..4c1ad0a 100644
--- a/src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetDeptMapper.java
+++ b/src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetAssessorMapper.java
@@ -16,9 +16,9 @@
*/
package org.springblade.modules.assessment.mapper;
-import org.springblade.modules.assessment.entity.AssessmentSetDeptEntity;
-import org.springblade.modules.assessment.vo.AssessmentSetDeptVO;
-import org.springblade.modules.assessment.excel.AssessmentSetDeptExcel;
+import org.springblade.modules.assessment.entity.AssessmentSetAssessorEntity;
+import org.springblade.modules.assessment.vo.AssessmentSetAssessorVO;
+import org.springblade.modules.assessment.excel.AssessmentSetAssessorExcel;
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-12
+ * @author Aix
+ * @since 2024-01-02
*/
-public interface AssessmentSetDeptMapper extends BaseMapper<AssessmentSetDeptEntity> {
+public interface AssessmentSetAssessorMapper extends BaseMapper<AssessmentSetAssessorEntity> {
/**
* 自定义分页
*
* @param page
- * @param assessmentSetDept
+ * @param assessmentSetAssessor
* @return
*/
- List<AssessmentSetDeptVO> selectAssessmentSetDeptPage(IPage page, AssessmentSetDeptVO assessmentSetDept);
+ List<AssessmentSetAssessorVO> selectAssessmentSetAssessorPage(IPage page, AssessmentSetAssessorVO assessmentSetAssessor);
/**
@@ -49,6 +49,6 @@
* @param queryWrapper
* @return
*/
- List<AssessmentSetDeptExcel> exportAssessmentSetDept(@Param("ew") Wrapper<AssessmentSetDeptEntity> queryWrapper);
+ List<AssessmentSetAssessorExcel> exportAssessmentSetAssessor(@Param("ew") Wrapper<AssessmentSetAssessorEntity> queryWrapper);
}
diff --git a/src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetAssessorMapper.xml b/src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetAssessorMapper.xml
new file mode 100644
index 0000000..4e69fb1
--- /dev/null
+++ b/src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetAssessorMapper.xml
@@ -0,0 +1,36 @@
+<?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.assessment.mapper.AssessmentSetAssessorMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="assessmentSetAssessorResultMap" type="org.springblade.modules.assessment.entity.AssessmentSetAssessorEntity">
+ <result column="id" property="id"/>
+ <result column="tenant_id" property="tenantId"/>
+ <result column="assessment_set_id" property="assessmentSetId"/>
+ <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="weight" property="weight"/>
+ <result column="range_val" property="rangeVal"/>
+ <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>
+
+
+ <select id="selectAssessmentSetAssessorPage" resultMap="assessmentSetAssessorResultMap">
+ select * from yw_assessment_set_assessor where is_deleted = 0
+ </select>
+
+
+ <select id="exportAssessmentSetAssessor" resultType="org.springblade.modules.assessment.excel.AssessmentSetAssessorExcel">
+ SELECT * FROM yw_assessment_set_assessor ${ew.customSqlSegment}
+ </select>
+
+</mapper>
diff --git a/src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetDeptMapper.xml b/src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetDeptMapper.xml
deleted file mode 100644
index 0267b81..0000000
--- a/src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetDeptMapper.xml
+++ /dev/null
@@ -1,32 +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.assessment.mapper.AssessmentSetDeptMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="assessmentSetDeptResultMap" type="org.springblade.modules.assessment.entity.AssessmentSetDeptEntity">
- <result column="id" property="id"/>
- <result column="tenant_id" property="tenantId"/>
- <result column="dept_id" property="deptId"/>
- <result column="to_user_id" property="toUserId"/>
- <result column="weight" property="weight"/>
- <result column="range_val" property="rangeVal"/>
- <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>
-
-
- <select id="selectAssessmentSetDeptPage" resultMap="assessmentSetDeptResultMap">
- select * from yw_assessment_set_dept where is_deleted = 0
- </select>
-
-
- <select id="exportAssessmentSetDept" resultType="org.springblade.modules.assessment.excel.AssessmentSetDeptExcel">
- SELECT * FROM yw_assessment_set_dept ${ew.customSqlSegment}
- </select>
-
-</mapper>
diff --git a/src/main/java/org/springblade/modules/assessment/service/IAssessmentSetDeptService.java b/src/main/java/org/springblade/modules/assessment/service/IAssessmentSetAssessorService.java
similarity index 63%
rename from src/main/java/org/springblade/modules/assessment/service/IAssessmentSetDeptService.java
rename to src/main/java/org/springblade/modules/assessment/service/IAssessmentSetAssessorService.java
index 5eb24d4..ea0736a 100644
--- a/src/main/java/org/springblade/modules/assessment/service/IAssessmentSetDeptService.java
+++ b/src/main/java/org/springblade/modules/assessment/service/IAssessmentSetAssessorService.java
@@ -17,28 +17,28 @@
package org.springblade.modules.assessment.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import org.springblade.modules.assessment.entity.AssessmentSetDeptEntity;
-import org.springblade.modules.assessment.vo.AssessmentSetDeptVO;
-import org.springblade.modules.assessment.excel.AssessmentSetDeptExcel;
+import org.springblade.modules.assessment.entity.AssessmentSetAssessorEntity;
+import org.springblade.modules.assessment.vo.AssessmentSetAssessorVO;
+import org.springblade.modules.assessment.excel.AssessmentSetAssessorExcel;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import java.util.List;
/**
- * 考核权重-部门 服务类
+ * 考核任务考核人 服务类
*
- * @author aix
- * @since 2023-12-12
+ * @author Aix
+ * @since 2024-01-02
*/
-public interface IAssessmentSetDeptService extends BaseService<AssessmentSetDeptEntity> {
+public interface IAssessmentSetAssessorService extends BaseService<AssessmentSetAssessorEntity> {
/**
* 自定义分页
*
* @param page
- * @param assessmentSetDept
+ * @param assessmentSetAssessor
* @return
*/
- IPage<AssessmentSetDeptVO> selectAssessmentSetDeptPage(IPage<AssessmentSetDeptVO> page, AssessmentSetDeptVO assessmentSetDept);
+ IPage<AssessmentSetAssessorVO> selectAssessmentSetAssessorPage(IPage<AssessmentSetAssessorVO> page, AssessmentSetAssessorVO assessmentSetAssessor);
/**
@@ -47,6 +47,6 @@
* @param queryWrapper
* @return
*/
- List<AssessmentSetDeptExcel> exportAssessmentSetDept(Wrapper<AssessmentSetDeptEntity> queryWrapper);
+ List<AssessmentSetAssessorExcel> exportAssessmentSetAssessor(Wrapper<AssessmentSetAssessorEntity> queryWrapper);
}
diff --git a/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentScoreServiceImpl.java b/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentScoreServiceImpl.java
index 0ae4068..5fc9d04 100644
--- a/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentScoreServiceImpl.java
+++ b/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentScoreServiceImpl.java
@@ -16,26 +16,19 @@
*/
package org.springblade.modules.assessment.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.AllArgsConstructor;
import org.springblade.modules.assessment.entity.AssessmentScoreEntity;
-import org.springblade.modules.assessment.entity.AssessmentSetEntity;
-import org.springblade.modules.assessment.entity.AssessmentTaskEntity;
-import org.springblade.modules.assessment.service.IAssessmentSetDeptService;
import org.springblade.modules.assessment.service.IAssessmentSetService;
import org.springblade.modules.assessment.service.IAssessmentTaskService;
import org.springblade.modules.assessment.vo.AssessmentScoreVO;
import org.springblade.modules.assessment.excel.AssessmentScoreExcel;
import org.springblade.modules.assessment.mapper.AssessmentScoreMapper;
import org.springblade.modules.assessment.service.IAssessmentScoreService;
-import org.springframework.beans.factory.annotation.Autowired;
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.Collection;
import java.util.List;
/**
@@ -49,8 +42,6 @@
public class AssessmentScoreServiceImpl extends BaseServiceImpl<AssessmentScoreMapper, AssessmentScoreEntity> implements IAssessmentScoreService {
private final IAssessmentSetService assessmentSetService;
- private final IAssessmentSetDeptService assessmentSetDeptService;
-
private final IAssessmentTaskService assessmentTaskService;
@@ -69,31 +60,4 @@
return assessmentScoreList;
}
- @Override
- @Transactional
- public boolean saveOrUpdate(AssessmentScoreEntity entity) {
- boolean ret = super.saveOrUpdate(entity);
-
- long setCount = 0l;
- if (entity.getType() == 0) {
- setCount = assessmentSetService.count();
-
- } else {
- setCount = assessmentSetDeptService.count();
- }
-
- QueryWrapper<AssessmentScoreEntity> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("type",entity.getType());
- queryWrapper.eq("assessment_task_id",entity.getAssessmentTaskId());
- long scoreCount = count(queryWrapper);
-
- if (setCount == scoreCount) {
- AssessmentTaskEntity taskEntity = new AssessmentTaskEntity();
- taskEntity.setId(entity.getAssessmentTaskId());
- taskEntity.setIsAssessmentOk(1);
- assessmentTaskService.updateById(taskEntity);
- }
-
- return ret;
- }
}
diff --git a/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentSetAssessorServiceImpl.java b/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentSetAssessorServiceImpl.java
new file mode 100644
index 0000000..48e6617
--- /dev/null
+++ b/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentSetAssessorServiceImpl.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.assessment.service.impl;
+
+import org.springblade.modules.assessment.entity.AssessmentSetAssessorEntity;
+import org.springblade.modules.assessment.vo.AssessmentSetAssessorVO;
+import org.springblade.modules.assessment.excel.AssessmentSetAssessorExcel;
+import org.springblade.modules.assessment.mapper.AssessmentSetAssessorMapper;
+import org.springblade.modules.assessment.service.IAssessmentSetAssessorService;
+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-02
+ */
+@Service
+public class AssessmentSetAssessorServiceImpl extends BaseServiceImpl<AssessmentSetAssessorMapper, AssessmentSetAssessorEntity> implements IAssessmentSetAssessorService {
+
+ @Override
+ public IPage<AssessmentSetAssessorVO> selectAssessmentSetAssessorPage(IPage<AssessmentSetAssessorVO> page, AssessmentSetAssessorVO assessmentSetAssessor) {
+ return page.setRecords(baseMapper.selectAssessmentSetAssessorPage(page, assessmentSetAssessor));
+ }
+
+
+ @Override
+ public List<AssessmentSetAssessorExcel> exportAssessmentSetAssessor(Wrapper<AssessmentSetAssessorEntity> queryWrapper) {
+ List<AssessmentSetAssessorExcel> assessmentSetAssessorList = baseMapper.exportAssessmentSetAssessor(queryWrapper);
+ //assessmentSetAssessorList.forEach(assessmentSetAssessor -> {
+ // assessmentSetAssessor.setTypeName(DictCache.getValue(DictEnum.YES_NO, AssessmentSetAssessor.getType()));
+ //});
+ return assessmentSetAssessorList;
+ }
+
+}
diff --git a/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentSetDeptServiceImpl.java b/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentSetDeptServiceImpl.java
deleted file mode 100644
index 3a19877..0000000
--- a/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentSetDeptServiceImpl.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.assessment.service.impl;
-
-import org.springblade.modules.assessment.entity.AssessmentSetDeptEntity;
-import org.springblade.modules.assessment.vo.AssessmentSetDeptVO;
-import org.springblade.modules.assessment.excel.AssessmentSetDeptExcel;
-import org.springblade.modules.assessment.mapper.AssessmentSetDeptMapper;
-import org.springblade.modules.assessment.service.IAssessmentSetDeptService;
-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-12
- */
-@Service
-public class AssessmentSetDeptServiceImpl extends BaseServiceImpl<AssessmentSetDeptMapper, AssessmentSetDeptEntity> implements IAssessmentSetDeptService {
-
- @Override
- public IPage<AssessmentSetDeptVO> selectAssessmentSetDeptPage(IPage<AssessmentSetDeptVO> page, AssessmentSetDeptVO assessmentSetDept) {
- return page.setRecords(baseMapper.selectAssessmentSetDeptPage(page, assessmentSetDept));
- }
-
-
- @Override
- public List<AssessmentSetDeptExcel> exportAssessmentSetDept(Wrapper<AssessmentSetDeptEntity> queryWrapper) {
- List<AssessmentSetDeptExcel> assessmentSetDeptList = baseMapper.exportAssessmentSetDept(queryWrapper);
- //assessmentSetDeptList.forEach(assessmentSetDept -> {
- // assessmentSetDept.setTypeName(DictCache.getValue(DictEnum.YES_NO, AssessmentSetDept.getType()));
- //});
- return assessmentSetDeptList;
- }
-
-}
diff --git a/src/main/java/org/springblade/modules/assessment/dto/AssessmentSetDeptDTO.java b/src/main/java/org/springblade/modules/assessment/vo/AssessmentSetAssessorVO.java
similarity index 75%
copy from src/main/java/org/springblade/modules/assessment/dto/AssessmentSetDeptDTO.java
copy to src/main/java/org/springblade/modules/assessment/vo/AssessmentSetAssessorVO.java
index b906dd3..e02852b 100644
--- a/src/main/java/org/springblade/modules/assessment/dto/AssessmentSetDeptDTO.java
+++ b/src/main/java/org/springblade/modules/assessment/vo/AssessmentSetAssessorVO.java
@@ -14,21 +14,22 @@
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
-package org.springblade.modules.assessment.dto;
+package org.springblade.modules.assessment.vo;
-import org.springblade.modules.assessment.entity.AssessmentSetDeptEntity;
+import org.springblade.modules.assessment.entity.AssessmentSetAssessorEntity;
+import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
- * 考核权重-部门 数据传输对象实体类
+ * 考核任务考核人 视图实体类
*
- * @author aix
- * @since 2023-12-12
+ * @author Aix
+ * @since 2024-01-02
*/
@Data
@EqualsAndHashCode(callSuper = true)
-public class AssessmentSetDeptDTO extends AssessmentSetDeptEntity {
+public class AssessmentSetAssessorVO extends AssessmentSetAssessorEntity {
private static final long serialVersionUID = 1L;
}
diff --git a/src/main/java/org/springblade/modules/assessment/vo/AssessmentSetDeptVO.java b/src/main/java/org/springblade/modules/assessment/vo/AssessmentSetDeptVO.java
deleted file mode 100644
index cedf5a0..0000000
--- a/src/main/java/org/springblade/modules/assessment/vo/AssessmentSetDeptVO.java
+++ /dev/null
@@ -1,50 +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.assessment.vo;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.NullSerializer;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.modules.assessment.entity.AssessmentSetDeptEntity;
-
-/**
- * 考核权重-部门 视图实体类
- *
- * @author aix
- * @since 2023-12-12
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class AssessmentSetDeptVO extends AssessmentSetDeptEntity {
- private static final long serialVersionUID = 1L;
-
- private String deptName;
-
- private String toUserName;
-
- private String toDeptName;
-
- private String toPostName;
-
- @JsonSerialize(nullsUsing = NullSerializer.class)
- private AssessmentTaskVO assessmentTaskVO;
-
- @JsonSerialize(nullsUsing = NullSerializer.class)
- private AssessmentScoreVO assessmentScoreVO;
-
-}
diff --git a/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentScoreWrapper.java b/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentScoreWrapper.java
index bfb0d4c..fa6859c 100644
--- a/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentScoreWrapper.java
+++ b/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentScoreWrapper.java
@@ -16,7 +16,6 @@
*/
package org.springblade.modules.assessment.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;
@@ -25,14 +24,10 @@
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.modules.assessment.entity.AssessmentScoreEntity;
-import org.springblade.modules.assessment.entity.AssessmentSetDeptEntity;
-import org.springblade.modules.assessment.entity.AssessmentSetEntity;
import org.springblade.modules.assessment.service.IAssessmentScoreService;
-import org.springblade.modules.assessment.service.IAssessmentSetDeptService;
import org.springblade.modules.assessment.service.IAssessmentSetService;
import org.springblade.modules.assessment.service.IAssessmentTaskService;
import org.springblade.modules.assessment.vo.AssessmentScoreVO;
-import org.springblade.modules.assessment.vo.AssessmentSetVO;
import org.springblade.modules.system.entity.User;
import java.util.List;
@@ -48,13 +43,11 @@
public class AssessmentScoreWrapper extends BaseEntityWrapper<AssessmentScoreEntity, AssessmentScoreVO> {
private static final IAssessmentSetService assessmentSetService;
- private static final IAssessmentSetDeptService assessmentSetDeptService;
private static final IAssessmentScoreService assessmentScoreService;
private static final IAssessmentTaskService assessmentTaskService;
static {
assessmentSetService = SpringUtil.getBean(IAssessmentSetService.class);
- assessmentSetDeptService = SpringUtil.getBean(IAssessmentSetDeptService.class);
assessmentScoreService = SpringUtil.getBean(IAssessmentScoreService.class);
assessmentTaskService = SpringUtil.getBean(IAssessmentTaskService.class);
}
diff --git a/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetAssessorWrapper.java b/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetAssessorWrapper.java
new file mode 100644
index 0000000..2049468
--- /dev/null
+++ b/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetAssessorWrapper.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.assessment.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.modules.assessment.entity.AssessmentSetAssessorEntity;
+import org.springblade.modules.assessment.vo.AssessmentSetAssessorVO;
+import java.util.Objects;
+
+/**
+ * 考核任务考核人 包装类,返回视图层所需的字段
+ *
+ * @author Aix
+ * @since 2024-01-02
+ */
+public class AssessmentSetAssessorWrapper extends BaseEntityWrapper<AssessmentSetAssessorEntity, AssessmentSetAssessorVO> {
+
+ public static AssessmentSetAssessorWrapper build() {
+ return new AssessmentSetAssessorWrapper();
+ }
+
+ @Override
+ public AssessmentSetAssessorVO entityVO(AssessmentSetAssessorEntity assessmentSetAssessor) {
+ AssessmentSetAssessorVO assessmentSetAssessorVO = Objects.requireNonNull(BeanUtil.copy(assessmentSetAssessor, AssessmentSetAssessorVO.class));
+
+ //User createUser = UserCache.getUser(assessmentSetAssessor.getCreateUser());
+ //User updateUser = UserCache.getUser(assessmentSetAssessor.getUpdateUser());
+ //assessmentSetAssessorVO.setCreateUserName(createUser.getName());
+ //assessmentSetAssessorVO.setUpdateUserName(updateUser.getName());
+
+ return assessmentSetAssessorVO;
+ }
+
+
+}
diff --git a/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetDeptWrapper.java b/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetDeptWrapper.java
deleted file mode 100644
index f4329d2..0000000
--- a/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetDeptWrapper.java
+++ /dev/null
@@ -1,117 +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.assessment.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.core.tool.utils.SpringUtil;
-import org.springblade.modules.assessment.entity.AssessmentScoreEntity;
-import org.springblade.modules.assessment.entity.AssessmentSetDeptEntity;
-import org.springblade.modules.assessment.entity.AssessmentSetEntity;
-import org.springblade.modules.assessment.entity.AssessmentTaskEntity;
-import org.springblade.modules.assessment.service.IAssessmentScoreService;
-import org.springblade.modules.assessment.service.IAssessmentTaskService;
-import org.springblade.modules.assessment.vo.AssessmentSetDeptVO;
-import org.springblade.modules.assessment.vo.AssessmentSetVO;
-import org.springblade.modules.system.entity.User;
-
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * 考核权重-部门 包装类,返回视图层所需的字段
- *
- * @author aix
- * @since 2023-12-12
- */
-public class AssessmentSetDeptWrapper extends BaseEntityWrapper<AssessmentSetDeptEntity, AssessmentSetDeptVO> {
-
- private static final IAssessmentTaskService assessmentTaskService;
-
- private static final IAssessmentScoreService assessmentScoreService;
-
- static {
- assessmentTaskService = SpringUtil.getBean(IAssessmentTaskService.class);
- assessmentScoreService = SpringUtil.getBean(IAssessmentScoreService.class);
- }
-
- public static AssessmentSetDeptWrapper build() {
- return new AssessmentSetDeptWrapper();
- }
-
- @Override
- public AssessmentSetDeptVO entityVO(AssessmentSetDeptEntity assessmentSetDept) {
- AssessmentSetDeptVO assessmentSetDeptVO = Objects.requireNonNull(BeanUtil.copy(assessmentSetDept, AssessmentSetDeptVO.class));
-
- //User createUser = UserCache.getUser(assessmentSetDept.getCreateUser());
- //User updateUser = UserCache.getUser(assessmentSetDept.getUpdateUser());
- //assessmentSetDeptVO.setCreateUserName(createUser.getName());
- //assessmentSetDeptVO.setUpdateUserName(updateUser.getName());
-
- assessmentSetDeptVO.setDeptName(SysCache.getDeptName(Long.valueOf(assessmentSetDept.getDeptId())));
-
- return assessmentSetDeptVO;
- }
-
- @Override
- public IPage<AssessmentSetDeptVO> pageVO(IPage<AssessmentSetDeptEntity> pages) {
- List<AssessmentSetDeptVO> records = listVO(pages.getRecords());
- for (AssessmentSetDeptVO vo:records) {
- //被考核部门
- vo.setDeptName(SysCache.getDeptName(Long.valueOf(vo.getDeptId())));
-
- User user = UserCache.getUser(vo.getToUserId()); //考核人
- vo.setToUserName(user.getName());
- vo.setToDeptName(SysCache.getDeptName(Long.valueOf(user.getDeptId())));
- vo.setToPostName(SysCache.getPostName(Long.valueOf(user.getPostId())));
-
- QueryWrapper<AssessmentTaskEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("type", 1);
- wrapper.gt("end_time", LocalDateTime.now());
- List<AssessmentTaskEntity> assessmentTaskEntityList = assessmentTaskService.list(wrapper);
- if (assessmentTaskEntityList.size() > 0)
- vo.setAssessmentTaskVO(AssessmentTaskWrapper.build().entityVO(assessmentTaskEntityList.get(0)));
- else
- vo.setAssessmentTaskVO(null);
-
- //拿考核成绩
- if (null != vo.getAssessmentTaskVO()) {
- QueryWrapper<AssessmentScoreEntity> setEntityQueryWrapper = new QueryWrapper<>();
- setEntityQueryWrapper.eq("score_user_id", vo.getToUserId()); //考核人id
- setEntityQueryWrapper.eq("be_id", vo.getDeptId()); //被考核人id
- setEntityQueryWrapper.eq("assessment_task_id", vo.getAssessmentTaskVO().getId());//考核任务
- List<AssessmentScoreEntity> assessmentScoreEntityList = assessmentScoreService.list(setEntityQueryWrapper);
- if (assessmentScoreEntityList.size() > 0)
- vo.setAssessmentScoreVO(AssessmentScoreWrapper.build().entityVO(assessmentScoreEntityList.get(0)));
- else
- vo.setAssessmentScoreVO(null);
- }
-
- }
- IPage<AssessmentSetDeptVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
- pageVo.setRecords(records);
- return pageVo;
- }
-
-
-}
--
Gitblit v1.9.3