被考核人投票结果按名称、部门名称过滤

xieb

2024-01-10 fcd66f067b1bc5ef617ee0f1044463ad3f532ee4

被考核人投票结果按名称、部门名称过滤

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

@@ -94,25 +94,18 @@

    @GetMapping("/listGroupByTask/{type}/{taskId}")
    @ApiOperation(value = "后台考核任务考核结果", notes = "传入要查询的任务id")
    public R listGroupByTask(@ApiIgnore @PathVariable Integer type,@PathVariable Long taskId, Query query) {
        QueryWrapper<AssessmentScoreEntity> setEntityQueryWrapper = new QueryWrapper<>();
        setEntityQueryWrapper.select("id,assessment_task_id,be_id,score_user_id,SUM(weight*score_val*0.01) as score_val,type");
        setEntityQueryWrapper.eq("type", type);
        setEntityQueryWrapper.eq("assessment_task_id",taskId);
        setEntityQueryWrapper.groupBy("be_id");
        IPage<AssessmentScoreEntity> pages = assessmentScoreService.page(Condition.getPage(query),setEntityQueryWrapper);
    public R listGroupByTask(@ApiIgnore @PathVariable Integer type,@PathVariable Long taskId, Query query, AssessmentScoreVO assessmentScore) {
//        QueryWrapper<AssessmentScoreEntity> setEntityQueryWrapper = new QueryWrapper<>();
//        setEntityQueryWrapper.select("id,assessment_task_id,be_id,score_user_id,SUM(weight*score_val*0.01) as score_val,type");
//        setEntityQueryWrapper.eq("type", type);
//        setEntityQueryWrapper.eq("assessment_task_id",taskId);
//        setEntityQueryWrapper.groupBy("be_id");
//        IPage<AssessmentScoreEntity> pages = assessmentScoreService.page(Condition.getPage(query),setEntityQueryWrapper);
        assessmentScore.setType(type);
        assessmentScore.setAssessmentTaskId(taskId);
        IPage<AssessmentScoreEntity> pages = assessmentScoreService.selectAssessmentScoreGroupByBeidPage(Condition.getPage(query), assessmentScore);

        return R.data(AssessmentScoreWrapper.build().pageVO(pages));
    }

    @GetMapping("/listResultScore/{taskId}/{userId}")
    @ApiOperation(value = "后台考核任务考核结果", notes = "传入要查询的任务id")
    public R listResultScore(@PathVariable Long taskId,@PathVariable Long userId) {
        QueryWrapper<AssessmentSetAssessorEntity> assessmentSetAssessorEntityQueryWrapper = new QueryWrapper<>();
        assessmentSetAssessorEntityQueryWrapper.eq("",taskId);
        assessmentSetAssessorEntityQueryWrapper.eq("",userId);

        return null;
    }

    @GetMapping("/listMyScore/{userId}")

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

@@ -42,6 +42,8 @@
     */
    List<AssessmentScoreVO> selectAssessmentScorePage(IPage page, AssessmentScoreVO assessmentScore);

    List<AssessmentScoreEntity> selectAssessmentScoreGroupByBeidPage(IPage page, AssessmentScoreVO assessmentScore);


    /**
     * 获取导出数据

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

@@ -6,10 +6,14 @@
    <resultMap id="assessmentScoreResultMap" type="org.springblade.modules.assessment.entity.AssessmentScoreEntity">
        <result column="id" property="id"/>
        <result column="tenant_id" property="tenantId"/>
        <result column="assessment_task_id" property="assessmentTaskId"/>
        <result column="be_id" property="beId"/>
        <result column="score_user_id" property="scoreUserId"/>
        <result column="score_val" property="scoreVal"/>
        <result column="remark" property="remark"/>
        <result column="type" property="type"/>
        <result column="range_val" property="rangeVal"/>
        <result column="weight" property="weight"/>
        <result column="create_user" property="createUser"/>
        <result column="create_dept" property="createDept"/>
        <result column="create_time" property="createTime"/>
@@ -24,6 +28,27 @@
        select * from yw_assessment_score where is_deleted = 0
    </select>

    <select id="selectAssessmentScoreGroupByBeidPage" resultMap="assessmentScoreResultMap">
        select a.id,a.assessment_task_id,a.be_id,a.score_user_id,SUM(a.weight*a.score_val*0.01) as score_val,a.type from yw_assessment_score a
        LEFT JOIN blade_user b on (a.be_id = b.id)
        LEFT JOIN blade_dept c on (a.be_id = c.id)
    <where>
        <if test="assessmentScore.type != null and assessmentScore.type != ''">
            and a.type = #{assessmentScore.type}
        </if>
        <if test="assessmentScore.assessmentTaskId != null and assessmentScore.assessmentTaskId != ''">
            and a.assessment_task_id = #{assessmentScore.assessmentTaskId}
        </if>
        <if test="assessmentScore.userName != null and assessmentScore.userName != ''">
            and b.name like concat('%', #{assessmentScore.userName},'%')
        </if>
        <if test="assessmentScore.deptName != null and assessmentScore.deptName != ''">
            and c.dept_name like concat('%', #{assessmentScore.deptName},'%')
        </if>
    </where>
    group by a.be_id
    </select>


    <select id="exportAssessmentScore" resultType="org.springblade.modules.assessment.excel.AssessmentScoreExcel">
        SELECT * FROM yw_assessment_score ${ew.customSqlSegment}

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

@@ -39,6 +39,7 @@
     * @return
     */
    IPage<AssessmentScoreVO> selectAssessmentScorePage(IPage<AssessmentScoreVO> page, AssessmentScoreVO assessmentScore);
    IPage<AssessmentScoreEntity> selectAssessmentScoreGroupByBeidPage(IPage<AssessmentScoreEntity> page, AssessmentScoreVO assessmentScore);


    /**

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

@@ -16,18 +16,16 @@
 */
package org.springblade.modules.assessment.service.impl;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.modules.assessment.entity.AssessmentScoreEntity;
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.springblade.modules.assessment.vo.AssessmentScoreVO;
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;

@@ -46,6 +44,11 @@
        return page.setRecords(baseMapper.selectAssessmentScorePage(page, assessmentScore));
    }

    @Override
    public IPage<AssessmentScoreEntity> selectAssessmentScoreGroupByBeidPage(IPage<AssessmentScoreEntity> page, AssessmentScoreVO assessmentScore) {
        return page.setRecords(baseMapper.selectAssessmentScoreGroupByBeidPage(page, assessmentScore));
    }


    @Override
    public List<AssessmentScoreExcel> exportAssessmentScore(Wrapper<AssessmentScoreEntity> queryWrapper) {