考核任务设置考核人

xieb

2024-01-02 c8bcb31b06e80bfcfb5324379098e5c666e49e18

考核任务设置考核人

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

New file
@@ -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);
    }

}

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

File was deleted

 src/main/java/org/springblade/modules/assessment/dto/AssessmentSetAssessorDTO.java

File was renamed from src/main/java/org/springblade/modules/assessment/dto/AssessmentSetDeptDTO.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;

}

 src/main/java/org/springblade/modules/assessment/entity/AssessmentSetAssessorEntity.java

New file
@@ -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;

}

 src/main/java/org/springblade/modules/assessment/excel/AssessmentSetAssessorExcel.java

File was renamed from src/main/java/org/springblade/modules/assessment/excel/AssessmentSetDeptExcel.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;
    /**
     * 权值
     */

 src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetAssessorMapper.java

File was renamed from src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetDeptMapper.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);

}

 src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetAssessorMapper.xml

New file
@@ -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>

 src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetDeptMapper.xml

File was deleted

 src/main/java/org/springblade/modules/assessment/service/IAssessmentSetAssessorService.java

File was renamed from src/main/java/org/springblade/modules/assessment/service/IAssessmentSetDeptService.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);

}

 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;
    }
}

 src/main/java/org/springblade/modules/assessment/service/impl/AssessmentSetAssessorServiceImpl.java

New file
@@ -0,0 +1,54 @@
/*
 *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
 *
 *  Redistribution and use in source and binary forms, with or without
 *  modification, are permitted provided that the following conditions are met:
 *
 *  Redistributions of source code must retain the above copyright notice,
 *  this list of conditions and the following disclaimer.
 *  Redistributions in binary form must reproduce the above copyright
 *  notice, this list of conditions and the following disclaimer in the
 *  documentation and/or other materials provided with the distribution.
 *  Neither the name of the dreamlu.net developer nor the names of its
 *  contributors may be used to endorse or promote products derived from
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.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;
    }

}

 src/main/java/org/springblade/modules/assessment/service/impl/AssessmentSetDeptServiceImpl.java

File was deleted

 src/main/java/org/springblade/modules/assessment/vo/AssessmentSetAssessorVO.java

copy from src/main/java/org/springblade/modules/assessment/dto/AssessmentSetDeptDTO.java
copy to src/main/java/org/springblade/modules/assessment/vo/AssessmentSetAssessorVO.java
File was copied from src/main/java/org/springblade/modules/assessment/dto/AssessmentSetDeptDTO.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;

}

 src/main/java/org/springblade/modules/assessment/vo/AssessmentSetDeptVO.java

File was deleted

 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);
    }

 src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetAssessorWrapper.java

New file
@@ -0,0 +1,50 @@
/*
 *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
 *
 *  Redistribution and use in source and binary forms, with or without
 *  modification, are permitted provided that the following conditions are met:
 *
 *  Redistributions of source code must retain the above copyright notice,
 *  this list of conditions and the following disclaimer.
 *  Redistributions in binary form must reproduce the above copyright
 *  notice, this list of conditions and the following disclaimer in the
 *  documentation and/or other materials provided with the distribution.
 *  Neither the name of the dreamlu.net developer nor the names of its
 *  contributors may be used to endorse or promote products derived from
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.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;
    }


}

 src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetDeptWrapper.java

File was deleted