考核相关

xieb

2023-12-08 1d966b7d8886b3e76477b0fd481216bfe7684605

考核相关

 src/main/java/org/springblade/modules/assessment/controller/AssessmentSetController.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.springblade.modules.assessment.entity.AssessmentSetEntity;
import org.springblade.modules.assessment.excel.AssessmentSetExcel;
import org.springblade.modules.assessment.vo.AssessmentSetVO;
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.wrapper.AssessmentSetWrapper;
import org.springblade.modules.assessment.service.IAssessmentSetService;
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-08
 */
@RestController
@AllArgsConstructor
@RequestMapping("assessment/assessmentSet")
@Api(value = "考核权重", tags = "考核权重接口")
public class AssessmentSetController extends BladeController {

    private final IAssessmentSetService assessmentSetService;

    /**
     * 考核权重 详情
     */
    @GetMapping("/detail")
    @ApiOperationSupport(order = 1)
    @ApiOperation(value = "详情", notes = "传入assessmentSet")
    public R<AssessmentSetVO> detail(AssessmentSetEntity assessmentSet) {
        AssessmentSetEntity detail = assessmentSetService.getOne(Condition.getQueryWrapper(assessmentSet));
        return R.data(AssessmentSetWrapper.build().entityVO(detail));
    }
    /**
     * 考核权重 分页
     */
    @GetMapping("/list")
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "分页", notes = "传入assessmentSet")
    public R<IPage<AssessmentSetVO>> list(@ApiIgnore @RequestParam Map<String, Object> assessmentSet, Query query) {
        IPage<AssessmentSetEntity> pages = assessmentSetService.page(Condition.getPage(query), Condition.getQueryWrapper(assessmentSet, AssessmentSetEntity.class));
        return R.data(AssessmentSetWrapper.build().pageVO(pages));
    }

    /**
     * 考核权重 自定义分页
     */
    @GetMapping("/page")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "传入assessmentSet")
    public R<IPage<AssessmentSetVO>> page(AssessmentSetVO assessmentSet, Query query) {
        IPage<AssessmentSetVO> pages = assessmentSetService.selectAssessmentSetPage(Condition.getPage(query), assessmentSet);
        return R.data(pages);
    }

    /**
     * 考核权重 新增
     */
    @PostMapping("/save")
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "新增", notes = "传入assessmentSet")
    public R save(@Valid @RequestBody AssessmentSetEntity assessmentSet) {
        return R.status(assessmentSetService.save(assessmentSet));
    }

    /**
     * 考核权重 修改
     */
    @PostMapping("/update")
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "修改", notes = "传入assessmentSet")
    public R update(@Valid @RequestBody AssessmentSetEntity assessmentSet) {
        return R.status(assessmentSetService.updateById(assessmentSet));
    }

    /**
     * 考核权重 新增或修改
     */
    @PostMapping("/submit")
    @ApiOperationSupport(order = 6)
    @ApiOperation(value = "新增或修改", notes = "传入assessmentSet")
    public R submit(@Valid @RequestBody AssessmentSetEntity assessmentSet) {
        return R.status(assessmentSetService.saveOrUpdate(assessmentSet));
    }

    /**
     * 考核权重 删除
     */
    @PostMapping("/remove")
    @ApiOperationSupport(order = 7)
    @ApiOperation(value = "逻辑删除", notes = "传入ids")
    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
        return R.status(assessmentSetService.deleteLogic(Func.toLongList(ids)));
    }


    /**
     * 导出数据
     */
    @GetMapping("/export-assessmentSet")
    @ApiOperationSupport(order = 9)
    @ApiOperation(value = "导出数据", notes = "传入assessmentSet")
    public void exportAssessmentSet(@ApiIgnore @RequestParam Map<String, Object> assessmentSet, BladeUser bladeUser, HttpServletResponse response) {
        QueryWrapper<AssessmentSetEntity> queryWrapper = Condition.getQueryWrapper(assessmentSet, AssessmentSetEntity.class);
        //if (!AuthUtil.isAdministrator()) {
        //    queryWrapper.lambda().eq(AssessmentSet::getTenantId, bladeUser.getTenantId());
        //}
        queryWrapper.lambda().eq(AssessmentSetEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
        List<AssessmentSetExcel> list = assessmentSetService.exportAssessmentSet(queryWrapper);
        ExcelUtil.export(response, "考核权重数据" + DateUtil.time(), "考核权重数据表", list, AssessmentSetExcel.class);
    }

}

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

File was renamed from src/main/java/org/springblade/assessmentTask/controller/AssessmentTaskController.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.assessmentTask.controller;
package org.springblade.modules.assessment.controller;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -28,14 +28,14 @@
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.assessment.wrapper.AssessmentTaskWrapper;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.assessmentTask.entity.AssessmentTaskEntity;
import org.springblade.assessmentTask.vo.AssessmentTaskVO;
import org.springblade.assessmentTask.excel.AssessmentTaskExcel;
import org.springblade.assessmentTask.wrapper.AssessmentTaskWrapper;
import org.springblade.assessmentTask.service.IAssessmentTaskService;
import org.springblade.modules.assessment.entity.AssessmentTaskEntity;
import org.springblade.modules.assessment.vo.AssessmentTaskVO;
import org.springblade.modules.assessment.excel.AssessmentTaskExcel;
import org.springblade.modules.assessment.service.IAssessmentTaskService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
@@ -53,7 +53,7 @@
 */
@RestController
@AllArgsConstructor
@RequestMapping("assessmentTask/assessmentTask")
@RequestMapping("assessment/assessmentTask")
@Api(value = "考核任务表", tags = "考核任务表接口")
public class AssessmentTaskController extends BladeController {


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

copy from src/main/java/org/springblade/evaluate/dto/EvaluateTaskDTO.java
copy to src/main/java/org/springblade/modules/assessment/dto/AssessmentSetDTO.java
File was copied from src/main/java/org/springblade/evaluate/dto/EvaluateTaskDTO.java
@@ -14,21 +14,21 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.evaluate.dto;
package org.springblade.modules.assessment.dto;

import org.springblade.evaluate.entity.EvaluateTaskEntity;
import org.springblade.modules.assessment.entity.AssessmentSetEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * 评优任务表 数据传输对象实体类
 * 考核权重 数据传输对象实体类
 *
 * @author aix
 * @since 2023-12-08
 */
@Data
@EqualsAndHashCode(callSuper = true)
public class EvaluateTaskDTO extends EvaluateTaskEntity {
public class AssessmentSetDTO extends AssessmentSetEntity {
    private static final long serialVersionUID = 1L;

}

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

File was renamed from src/main/java/org/springblade/assessmentTask/dto/AssessmentTaskDTO.java
@@ -14,9 +14,9 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.assessmentTask.dto;
package org.springblade.modules.assessment.dto;

import org.springblade.assessmentTask.entity.AssessmentTaskEntity;
import org.springblade.modules.assessment.entity.AssessmentTaskEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;


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

copy from src/main/java/org/springblade/assessmentTask/entity/AssessmentTaskEntity.java
copy to src/main/java/org/springblade/modules/assessment/entity/AssessmentSetEntity.java
File was copied from src/main/java/org/springblade/assessmentTask/entity/AssessmentTaskEntity.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.assessmentTask.entity;
package org.springblade.modules.assessment.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@@ -25,41 +25,31 @@
import org.springblade.core.tenant.mp.TenantEntity;

/**
 * 考核任务表 实体类
 * 考核权重 实体类
 *
 * @author aix
 * @since 2023-12-07
 * @since 2023-12-08
 */
@Data
@TableName("yw_assessment_task")
@ApiModel(value = "AssessmentTask对象", description = "考核任务表")
@TableName("yw_assessment_set")
@ApiModel(value = "AssessmentSet对象", description = "考核权重")
@EqualsAndHashCode(callSuper = true)
public class AssessmentTaskEntity extends TenantEntity {
public class AssessmentSetEntity extends TenantEntity {

    /**
     * 考核编号
     * 考核人
     */
    @ApiModelProperty(value = "考核编号")
    private String assessmentNo;
    @ApiModelProperty(value = "考核人")
    private Long toUserId;
    /**
     * 考核目的
     * 权值
     */
    @ApiModelProperty(value = "考核目的")
    private String assessmentPurpose;
    @ApiModelProperty(value = "权值")
    private Integer weight;
    /**
     * 开始时间
     * 范围
     */
    @ApiModelProperty(value = "开始时间")
    private Date startTime;
    /**
     * 结束时间
     */
    @ApiModelProperty(value = "结束时间")
    private Date endTime;
    /**
     * 备注
     */
    @ApiModelProperty(value = "备注")
    private String remark;
    @ApiModelProperty(value = "范围")
    private Integer rangeVal;

}

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

File was renamed from src/main/java/org/springblade/assessmentTask/entity/AssessmentTaskEntity.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.assessmentTask.entity;
package org.springblade.modules.assessment.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

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

copy from src/main/java/org/springblade/assessmentTask/excel/AssessmentTaskExcel.java
copy to src/main/java/org/springblade/modules/assessment/excel/AssessmentSetExcel.java
File was copied from src/main/java/org/springblade/assessmentTask/excel/AssessmentTaskExcel.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.assessmentTask.excel;
package org.springblade.modules.assessment.excel;


import lombok.Data;
@@ -28,16 +28,16 @@


/**
 * 考核任务表 Excel实体类
 * 考核权重 Excel实体类
 *
 * @author aix
 * @since 2023-12-07
 * @since 2023-12-08
 */
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class AssessmentTaskExcel implements Serializable {
public class AssessmentSetExcel implements Serializable {

    private static final long serialVersionUID = 1L;

@@ -48,35 +48,23 @@
    @ExcelProperty("租户ID")
    private String tenantId;
    /**
     * 考核编号
     * 考核人
     */
    @ColumnWidth(20)
    @ExcelProperty("考核编号")
    private String assessmentNo;
    @ExcelProperty("考核人")
    private Long toUserId;
    /**
     * 考核目的
     * 权值
     */
    @ColumnWidth(20)
    @ExcelProperty("考核目的")
    private String assessmentPurpose;
    @ExcelProperty("权值")
    private Integer weight;
    /**
     * 开始时间
     * 范围
     */
    @ColumnWidth(20)
    @ExcelProperty("开始时间")
    private Date startTime;
    /**
     * 结束时间
     */
    @ColumnWidth(20)
    @ExcelProperty("结束时间")
    private Date endTime;
    /**
     * 备注
     */
    @ColumnWidth(20)
    @ExcelProperty("备注")
    private String remark;
    @ExcelProperty("范围")
    private Integer range;
    /**
     * 是否已删除
     */

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

File was renamed from src/main/java/org/springblade/assessmentTask/excel/AssessmentTaskExcel.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.assessmentTask.excel;
package org.springblade.modules.assessment.excel;


import lombok.Data;

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

copy from src/main/java/org/springblade/evaluate/mapper/EvaluateTaskMapper.java
copy to src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetMapper.java
File was copied from src/main/java/org/springblade/evaluate/mapper/EvaluateTaskMapper.java
@@ -14,33 +14,34 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.evaluate.mapper;
package org.springblade.modules.assessment.mapper;

import org.springblade.evaluate.entity.EvaluateTaskEntity;
import org.springblade.evaluate.vo.EvaluateTaskVO;
import org.springblade.evaluate.excel.EvaluateTaskExcel;
import org.springblade.modules.assessment.entity.AssessmentSetEntity;
import org.springblade.modules.assessment.vo.AssessmentSetVO;
import org.springblade.modules.assessment.excel.AssessmentSetExcel;
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 接口
 * 考核权重 Mapper 接口
 *
 * @author aix
 * @since 2023-12-08
 */
public interface EvaluateTaskMapper extends BaseMapper<EvaluateTaskEntity> {
public interface AssessmentSetMapper extends BaseMapper<AssessmentSetEntity> {

    /**
     * 自定义分页
     *
     * @param page
     * @param evaluateTask
     * @param assessmentSet
     * @return
     */
    List<EvaluateTaskVO> selectEvaluateTaskPage(IPage page, EvaluateTaskVO evaluateTask);
    List<AssessmentSetVO> selectAssessmentSetPage(IPage page, AssessmentSetVO assessmentSet);


    /**
@@ -49,6 +50,6 @@
     * @param queryWrapper
     * @return
     */
    List<EvaluateTaskExcel> exportEvaluateTask(@Param("ew") Wrapper<EvaluateTaskEntity> queryWrapper);
    List<AssessmentSetExcel> exportAssessmentSet(@Param("ew") Wrapper<AssessmentSetEntity> queryWrapper);

}

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

New file
@@ -0,0 +1,33 @@
<?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.AssessmentSetMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="assessmentSetResultMap" type="org.springblade.modules.assessment.entity.AssessmentSetEntity">
        <result column="id" property="id"/>
        <result column="tenant_id" property="tenantId"/>
        <result column="to_user_id" property="toUserId"/>
        <result column="weight" property="weight"/>
        <result column="range" property="range"/>
        <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="selectAssessmentSetPage" resultMap="assessmentSetResultMap">
        select a.*,b. from yw_assessment_set a
        left join blade_user b on (a.to_user_id = b.id)
        where is_deleted = 0
    </select>


    <select id="exportAssessmentSet" resultType="org.springblade.modules.assessment.excel.AssessmentSetExcel">
        SELECT * FROM yw_assessment_set ${ew.customSqlSegment}
    </select>

</mapper>

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

File was renamed from src/main/java/org/springblade/assessmentTask/mapper/AssessmentTaskMapper.java
@@ -14,11 +14,11 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.assessmentTask.mapper;
package org.springblade.modules.assessment.mapper;

import org.springblade.assessmentTask.entity.AssessmentTaskEntity;
import org.springblade.assessmentTask.vo.AssessmentTaskVO;
import org.springblade.assessmentTask.excel.AssessmentTaskExcel;
import org.springblade.modules.assessment.entity.AssessmentTaskEntity;
import org.springblade.modules.assessment.vo.AssessmentTaskVO;
import org.springblade.modules.assessment.excel.AssessmentTaskExcel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;

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

File was renamed from src/main/java/org/springblade/assessmentTask/mapper/AssessmentTaskMapper.xml
@@ -1,9 +1,9 @@
<?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.assessmentTask.mapper.AssessmentTaskMapper">
<mapper namespace="org.springblade.modules.assessment.mapper.AssessmentTaskMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="assessmentTaskResultMap" type="org.springblade.assessmentTask.entity.AssessmentTaskEntity">
    <resultMap id="assessmentTaskResultMap" type="org.springblade.modules.assessment.entity.AssessmentTaskEntity">
        <result column="id" property="id"/>
        <result column="tenant_id" property="tenantId"/>
        <result column="assessment_no" property="assessmentNo"/>
@@ -26,7 +26,7 @@
    </select>


    <select id="exportAssessmentTask" resultType="org.springblade.assessmentTask.excel.AssessmentTaskExcel">
    <select id="exportAssessmentTask" resultType="org.springblade.modules.assessment.excel.AssessmentTaskExcel">
        SELECT * FROM yw_assessment_task ${ew.customSqlSegment}
    </select>


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

copy from src/main/java/org/springblade/evaluate/service/IEvaluateTaskService.java
copy to src/main/java/org/springblade/modules/assessment/service/IAssessmentSetService.java
File was copied from src/main/java/org/springblade/evaluate/service/IEvaluateTaskService.java
@@ -14,31 +14,32 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.evaluate.service;
package org.springblade.modules.assessment.service;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import org.springblade.evaluate.entity.EvaluateTaskEntity;
import org.springblade.evaluate.vo.EvaluateTaskVO;
import org.springblade.evaluate.excel.EvaluateTaskExcel;
import org.springblade.modules.assessment.entity.AssessmentSetEntity;
import org.springblade.modules.assessment.vo.AssessmentSetVO;
import org.springblade.modules.assessment.excel.AssessmentSetExcel;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;

import java.util.List;

/**
 * 评优任务表 服务类
 * 考核权重 服务类
 *
 * @author aix
 * @since 2023-12-08
 */
public interface IEvaluateTaskService extends BaseService<EvaluateTaskEntity> {
public interface IAssessmentSetService extends BaseService<AssessmentSetEntity> {
    /**
     * 自定义分页
     *
     * @param page
     * @param evaluateTask
     * @param assessmentSet
     * @return
     */
    IPage<EvaluateTaskVO> selectEvaluateTaskPage(IPage<EvaluateTaskVO> page, EvaluateTaskVO evaluateTask);
    IPage<AssessmentSetVO> selectAssessmentSetPage(IPage<AssessmentSetVO> page, AssessmentSetVO assessmentSet);


    /**
@@ -47,6 +48,6 @@
     * @param queryWrapper
     * @return
     */
    List<EvaluateTaskExcel> exportEvaluateTask(Wrapper<EvaluateTaskEntity> queryWrapper);
    List<AssessmentSetExcel> exportAssessmentSet(Wrapper<AssessmentSetEntity> queryWrapper);

}

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

File was renamed from src/main/java/org/springblade/assessmentTask/service/IAssessmentTaskService.java
@@ -14,12 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.assessmentTask.service;
package org.springblade.modules.assessment.service;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import org.springblade.assessmentTask.entity.AssessmentTaskEntity;
import org.springblade.assessmentTask.vo.AssessmentTaskVO;
import org.springblade.assessmentTask.excel.AssessmentTaskExcel;
import org.springblade.modules.assessment.entity.AssessmentTaskEntity;
import org.springblade.modules.assessment.vo.AssessmentTaskVO;
import org.springblade.modules.assessment.excel.AssessmentTaskExcel;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import java.util.List;

 src/main/java/org/springblade/modules/assessment/service/impl/AssessmentSetServiceImpl.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.AssessmentSetEntity;
import org.springblade.modules.assessment.vo.AssessmentSetVO;
import org.springblade.modules.assessment.excel.AssessmentSetExcel;
import org.springblade.modules.assessment.mapper.AssessmentSetMapper;
import org.springblade.modules.assessment.service.IAssessmentSetService;
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-08
 */
@Service
public class AssessmentSetServiceImpl extends BaseServiceImpl<AssessmentSetMapper, AssessmentSetEntity> implements IAssessmentSetService {

    @Override
    public IPage<AssessmentSetVO> selectAssessmentSetPage(IPage<AssessmentSetVO> page, AssessmentSetVO assessmentSet) {
        return page.setRecords(baseMapper.selectAssessmentSetPage(page, assessmentSet));
    }


    @Override
    public List<AssessmentSetExcel> exportAssessmentSet(Wrapper<AssessmentSetEntity> queryWrapper) {
        List<AssessmentSetExcel> assessmentSetList = baseMapper.exportAssessmentSet(queryWrapper);
        //assessmentSetList.forEach(assessmentSet -> {
        //    assessmentSet.setTypeName(DictCache.getValue(DictEnum.YES_NO, AssessmentSet.getType()));
        //});
        return assessmentSetList;
    }

}

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

File was renamed from src/main/java/org/springblade/assessmentTask/service/impl/AssessmentTaskServiceImpl.java
@@ -14,13 +14,13 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.assessmentTask.service.impl;
package org.springblade.modules.assessment.service.impl;

import org.springblade.assessmentTask.entity.AssessmentTaskEntity;
import org.springblade.assessmentTask.vo.AssessmentTaskVO;
import org.springblade.assessmentTask.excel.AssessmentTaskExcel;
import org.springblade.assessmentTask.mapper.AssessmentTaskMapper;
import org.springblade.assessmentTask.service.IAssessmentTaskService;
import org.springblade.modules.assessment.entity.AssessmentTaskEntity;
import org.springblade.modules.assessment.vo.AssessmentTaskVO;
import org.springblade.modules.assessment.excel.AssessmentTaskExcel;
import org.springblade.modules.assessment.mapper.AssessmentTaskMapper;
import org.springblade.modules.assessment.service.IAssessmentTaskService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;

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

copy from src/main/java/org/springblade/evaluate/vo/EvaluateTaskVO.java
copy to src/main/java/org/springblade/modules/assessment/vo/AssessmentSetVO.java
File was copied from src/main/java/org/springblade/evaluate/vo/EvaluateTaskVO.java
@@ -14,22 +14,27 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.evaluate.vo;
package org.springblade.modules.assessment.vo;

import org.springblade.evaluate.entity.EvaluateTaskEntity;
import org.springblade.core.tool.node.INode;
import org.springblade.modules.assessment.entity.AssessmentSetEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * 评优任务表 视图实体类
 * 考核权重 视图实体类
 *
 * @author aix
 * @since 2023-12-08
 */
@Data
@EqualsAndHashCode(callSuper = true)
public class EvaluateTaskVO extends EvaluateTaskEntity {
public class AssessmentSetVO extends AssessmentSetEntity {
    private static final long serialVersionUID = 1L;

    private String userName;

    private String deptName;

    private String postName;

}

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

File was renamed from src/main/java/org/springblade/assessmentTask/vo/AssessmentTaskVO.java
@@ -14,10 +14,9 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.assessmentTask.vo;
package org.springblade.modules.assessment.vo;

import org.springblade.assessmentTask.entity.AssessmentTaskEntity;
import org.springblade.core.tool.node.INode;
import org.springblade.modules.assessment.entity.AssessmentTaskEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;


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

New file
@@ -0,0 +1,76 @@
/*
 *      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.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.assessment.entity.AssessmentSetEntity;
import org.springblade.modules.assessment.vo.AssessmentSetVO;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;

import java.util.List;
import java.util.Objects;

/**
 * 考核权重 包装类,返回视图层所需的字段
 *
 * @author aix
 * @since 2023-12-08
 */
public class AssessmentSetWrapper extends BaseEntityWrapper<AssessmentSetEntity, AssessmentSetVO>  {

    @Autowired
    private IUserService userService;

    public static AssessmentSetWrapper build() {
        return new AssessmentSetWrapper();
     }

    @Override
    public AssessmentSetVO entityVO(AssessmentSetEntity assessmentSet) {
        AssessmentSetVO assessmentSetVO = Objects.requireNonNull(BeanUtil.copy(assessmentSet, AssessmentSetVO.class));

        //User createUser = UserCache.getUser(assessmentSet.getCreateUser());
        //User updateUser = UserCache.getUser(assessmentSet.getUpdateUser());
        //assessmentSetVO.setCreateUserName(createUser.getName());
        //assessmentSetVO.setUpdateUserName(updateUser.getName());

        return assessmentSetVO;
    }

    @Override
    public IPage<AssessmentSetVO> pageVO(IPage<AssessmentSetEntity> pages) {
        List<AssessmentSetVO> records = listVO(pages.getRecords());
        for (AssessmentSetVO vo:records) {
            User user = UserCache.getUser(vo.getToUserId());
            vo.setUserName(user.getName());
            vo.setDeptName(SysCache.getDeptName(Long.valueOf(user.getDeptId())));
            vo.setPostName(SysCache.getPostName(Long.valueOf(user.getPostId())));
        }
        IPage<AssessmentSetVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
        pageVo.setRecords(records);
        return pageVo;
    }


}

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

File was renamed from src/main/java/org/springblade/assessmentTask/wrapper/AssessmentTaskWrapper.java
@@ -14,12 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.assessmentTask.wrapper;
package org.springblade.modules.assessment.wrapper;

import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.assessmentTask.entity.AssessmentTaskEntity;
import org.springblade.assessmentTask.vo.AssessmentTaskVO;
import org.springblade.modules.assessment.entity.AssessmentTaskEntity;
import org.springblade.modules.assessment.vo.AssessmentTaskVO;
import java.util.Objects;

/**

 src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java

File was renamed from src/main/java/org/springblade/evaluate/controller/EvaluateTaskController.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.evaluate.controller;
package org.springblade.modules.evaluate.controller;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -28,14 +28,14 @@
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.EvaluateTaskEntity;
import org.springblade.modules.evaluate.excel.EvaluateTaskExcel;
import org.springblade.modules.evaluate.service.IEvaluateTaskService;
import org.springblade.modules.evaluate.vo.EvaluateTaskVO;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.evaluate.entity.EvaluateTaskEntity;
import org.springblade.evaluate.vo.EvaluateTaskVO;
import org.springblade.evaluate.excel.EvaluateTaskExcel;
import org.springblade.evaluate.wrapper.EvaluateTaskWrapper;
import org.springblade.evaluate.service.IEvaluateTaskService;
import org.springblade.modules.evaluate.wrapper.EvaluateTaskWrapper;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;

 src/main/java/org/springblade/modules/evaluate/dto/EvaluateTaskDTO.java

File was renamed from src/main/java/org/springblade/evaluate/dto/EvaluateTaskDTO.java
@@ -14,9 +14,9 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.evaluate.dto;
package org.springblade.modules.evaluate.dto;

import org.springblade.evaluate.entity.EvaluateTaskEntity;
import org.springblade.modules.evaluate.entity.EvaluateTaskEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;


 src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskEntity.java

File was renamed from src/main/java/org/springblade/evaluate/entity/EvaluateTaskEntity.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.evaluate.entity;
package org.springblade.modules.evaluate.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

 src/main/java/org/springblade/modules/evaluate/excel/EvaluateTaskExcel.java

File was renamed from src/main/java/org/springblade/evaluate/excel/EvaluateTaskExcel.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.evaluate.excel;
package org.springblade.modules.evaluate.excel;


import lombok.Data;

 src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskMapper.java

File was renamed from src/main/java/org/springblade/evaluate/mapper/EvaluateTaskMapper.java
@@ -14,15 +14,16 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.evaluate.mapper;
package org.springblade.modules.evaluate.mapper;

import org.springblade.evaluate.entity.EvaluateTaskEntity;
import org.springblade.evaluate.vo.EvaluateTaskVO;
import org.springblade.evaluate.excel.EvaluateTaskExcel;
import org.springblade.modules.evaluate.entity.EvaluateTaskEntity;
import org.springblade.modules.evaluate.vo.EvaluateTaskVO;
import org.springblade.modules.evaluate.excel.EvaluateTaskExcel;
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;

/**

 src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskMapper.xml

File was renamed from src/main/java/org/springblade/evaluate/mapper/EvaluateTaskMapper.xml
@@ -1,9 +1,9 @@
<?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.evaluate.mapper.EvaluateTaskMapper">
<mapper namespace="org.springblade.modules.evaluate.mapper.EvaluateTaskMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="evaluateTaskResultMap" type="org.springblade.evaluate.entity.EvaluateTaskEntity">
    <resultMap id="evaluateTaskResultMap" type="org.springblade.modules.evaluate.entity.EvaluateTaskEntity">
        <result column="id" property="id"/>
        <result column="tenant_id" property="tenantId"/>
        <result column="task_name" property="taskName"/>
@@ -30,7 +30,7 @@
    </select>


    <select id="exportEvaluateTask" resultType="org.springblade.evaluate.excel.EvaluateTaskExcel">
    <select id="exportEvaluateTask" resultType="org.springblade.modules.evaluate.excel.EvaluateTaskExcel">
        SELECT * FROM yw_evaluate_task ${ew.customSqlSegment}
    </select>


 src/main/java/org/springblade/modules/evaluate/service/IEvaluateTaskService.java

File was renamed from src/main/java/org/springblade/evaluate/service/IEvaluateTaskService.java
@@ -14,12 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.evaluate.service;
package org.springblade.modules.evaluate.service;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import org.springblade.evaluate.entity.EvaluateTaskEntity;
import org.springblade.evaluate.vo.EvaluateTaskVO;
import org.springblade.evaluate.excel.EvaluateTaskExcel;
import org.springblade.modules.evaluate.entity.EvaluateTaskEntity;
import org.springblade.modules.evaluate.vo.EvaluateTaskVO;
import org.springblade.modules.evaluate.excel.EvaluateTaskExcel;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import java.util.List;

 src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskServiceImpl.java

File was renamed from src/main/java/org/springblade/evaluate/service/impl/EvaluateTaskServiceImpl.java
@@ -14,13 +14,13 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.evaluate.service.impl;
package org.springblade.modules.evaluate.service.impl;

import org.springblade.evaluate.entity.EvaluateTaskEntity;
import org.springblade.evaluate.vo.EvaluateTaskVO;
import org.springblade.evaluate.excel.EvaluateTaskExcel;
import org.springblade.evaluate.mapper.EvaluateTaskMapper;
import org.springblade.evaluate.service.IEvaluateTaskService;
import org.springblade.modules.evaluate.entity.EvaluateTaskEntity;
import org.springblade.modules.evaluate.vo.EvaluateTaskVO;
import org.springblade.modules.evaluate.excel.EvaluateTaskExcel;
import org.springblade.modules.evaluate.mapper.EvaluateTaskMapper;
import org.springblade.modules.evaluate.service.IEvaluateTaskService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;

 src/main/java/org/springblade/modules/evaluate/vo/EvaluateTaskVO.java

File was renamed from src/main/java/org/springblade/evaluate/vo/EvaluateTaskVO.java
@@ -14,10 +14,9 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.evaluate.vo;
package org.springblade.modules.evaluate.vo;

import org.springblade.evaluate.entity.EvaluateTaskEntity;
import org.springblade.core.tool.node.INode;
import org.springblade.modules.evaluate.entity.EvaluateTaskEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;


 src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java

File was renamed from src/main/java/org/springblade/evaluate/wrapper/EvaluateTaskWrapper.java
@@ -14,12 +14,13 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.evaluate.wrapper;
package org.springblade.modules.evaluate.wrapper;

import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.evaluate.entity.EvaluateTaskEntity;
import org.springblade.evaluate.vo.EvaluateTaskVO;
import org.springblade.modules.evaluate.entity.EvaluateTaskEntity;
import org.springblade.modules.evaluate.vo.EvaluateTaskVO;

import java.util.Objects;

/**