xieb
2024-01-16 206d42486e2093aa470c7663f002a9335a33eb95
考核评分记录
5 files modified
55 ■■■■■ changed files
src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.xml 45 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/assessment/service/IAssessmentScoreService.java 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/assessment/service/impl/AssessmentScoreServiceImpl.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java
@@ -103,7 +103,7 @@
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "分页", notes = "传入assessmentScore")
    public R<IPage<AssessmentScoreVO>> listInfo(AssessmentScoreVO assessmentScore, Query query) {
        return R.data(assessmentScoreService.selectAssessmentScoreInfoPage(Condition.getPage(query), assessmentScore));
        return R.data(assessmentScoreService.selectAssessmentScoreInfoV2Page(Condition.getPage(query), assessmentScore));
    }
    @GetMapping("/listGroupByTask/{type}/{taskId}")
src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.java
@@ -45,6 +45,8 @@
    List<AssessmentScoreVO> selectAssessmentScoreInfoPage(IPage page, AssessmentScoreVO assessmentScore);
    List<AssessmentScoreVO> selectAssessmentScoreInfoV2Page(IPage page, AssessmentScoreVO assessmentScore);
    List<AssessmentScoreEntity> selectAssessmentScoreGroupByBeidPage(IPage page, AssessmentScoreVO assessmentScore);
src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.xml
@@ -90,6 +90,51 @@
        </where>
    </select>
    <select id="selectAssessmentScoreInfoV2Page" resultMap="assessmentScoreResultInfoMap">
        select a.user_name as scoreUserName,a.dept_name as scoreDeptName,a.post_name as scorePostName,
               b.user_name,b.dept_name ,b.post_name,
        <if test="assessmentScore.type != null and assessmentScore.type == 0">
            c.score_val,c.remark,c.type,c.weight
        </if>
        <if test="assessmentScore.type != null and assessmentScore.type == 1">
            d.score_val,d.remark,d.type,d.weight
        </if>
        from yw_assessment_set_assessor a
        LEFT JOIN yw_assessment_set b ON (a.assessment_set_id = b.id)
        <if test="assessmentScore.type != null and assessmentScore.type == 0">
            LEFT JOIN yw_assessment_score c ON (a.user_id = c.score_user_id and (b.user_id = c.be_id) and c.is_deleted = 0)
        </if>
        <if test="assessmentScore.type != null and assessmentScore.type == 1">
            LEFT JOIN yw_assessment_score d ON (a.user_id = d.score_user_id and (b.dept_id = d.be_id) and d.is_deleted = 0)
        </if>
        <where>
            and a.is_deleted = 0
            <if test="assessmentScore.assessmentTaskId != null and assessmentScore.assessmentTaskId != ''">
                and b.assessment_task_id = #{assessmentScore.assessmentTaskId}
            </if>
            <if test="assessmentScore.type != null and assessmentScore.type == 0">
                and b.user_id is not null
            </if>
            <if test="assessmentScore.type != null and assessmentScore.type == 1">
                and b.user_id is null
            </if>
            <if test="assessmentScore.userName != null and assessmentScore.userName != ''">
                and b.user_name like concat('%', #{assessmentScore.userName}, '%')
            </if>
            <if test="assessmentScore.scoreUserName != null and assessmentScore.scoreUserName != ''">
                and a.user_name like concat('%', #{assessmentScore.scoreUserName}, '%')
            </if>
            <if test="assessmentScore.deptName != null and assessmentScore.deptName != '' and assessmentScore.type != null and assessmentScore.type == 1">
                and d.dept_name like concat('%', #{assessmentScore.deptName}, '%')
            </if>
            <if test="assessmentScore.deptName != null and assessmentScore.deptName != '' and assessmentScore.type != null and assessmentScore.type == 0">
                and c.dept_name like concat('%', #{assessmentScore.deptName}, '%')
            </if>
        </where>
    </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
        <if test="assessmentScore.type != null and assessmentScore.type == 0">
src/main/java/org/springblade/modules/assessment/service/IAssessmentScoreService.java
@@ -42,6 +42,7 @@
    IPage<AssessmentScoreVO> selectAssessmentScorePage(IPage<AssessmentScoreVO> page, AssessmentScoreVO assessmentScore);
    IPage<AssessmentScoreVO> selectAssessmentScoreInfoPage(IPage<AssessmentScoreVO> page, AssessmentScoreVO assessmentScore);
    IPage<AssessmentScoreVO> selectAssessmentScoreInfoV2Page(IPage<AssessmentScoreVO> page, AssessmentScoreVO assessmentScore);
    IPage<AssessmentScoreEntity> selectAssessmentScoreGroupByBeidPage(IPage<AssessmentScoreEntity> page, AssessmentScoreVO assessmentScore);
src/main/java/org/springblade/modules/assessment/service/impl/AssessmentScoreServiceImpl.java
@@ -50,6 +50,11 @@
    }
    @Override
    public IPage<AssessmentScoreVO> selectAssessmentScoreInfoV2Page(IPage<AssessmentScoreVO> page, AssessmentScoreVO assessmentScore) {
        return page.setRecords(baseMapper.selectAssessmentScoreInfoV2Page(page, assessmentScore));
    }
    @Override
    public IPage<AssessmentScoreEntity> selectAssessmentScoreGroupByBeidPage(IPage<AssessmentScoreEntity> page, AssessmentScoreVO assessmentScore) {
        return page.setRecords(baseMapper.selectAssessmentScoreGroupByBeidPage(page, assessmentScore));
    }