是否完成考核

xieb

2023-12-15 7dd9c5ee5fa54e1637c545aa92bb7303b778323f

是否完成考核

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

@@ -67,4 +67,10 @@
    @ApiModelProperty(value = "备注")
    private String remark;

    /**
     * 是否考核完成
     */
    @ApiModelProperty(value = "是否考核完成")
    private Integer isAssessmentOk;

}

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

@@ -49,4 +49,7 @@
     */
    List<AssessmentScoreExcel> exportAssessmentScore(Wrapper<AssessmentScoreEntity> queryWrapper);


    boolean saveOrUpdate(AssessmentScoreEntity entity);

}

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

@@ -16,15 +16,26 @@
 */
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;

/**
@@ -34,7 +45,14 @@
 * @since 2023-12-13
 */
@Service
@AllArgsConstructor
public class AssessmentScoreServiceImpl extends BaseServiceImpl<AssessmentScoreMapper, AssessmentScoreEntity> implements IAssessmentScoreService {

    private final IAssessmentSetService assessmentSetService;
    private final IAssessmentSetDeptService assessmentSetDeptService;

    private final IAssessmentTaskService assessmentTaskService;


    @Override
    public IPage<AssessmentScoreVO> selectAssessmentScorePage(IPage<AssessmentScoreVO> page, AssessmentScoreVO assessmentScore) {
@@ -51,4 +69,31 @@
        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/evaluate/controller/EvaluateTaskController.java

@@ -80,6 +80,14 @@
        return R.data(EvaluateTaskWrapper.build().pageVO(pages));
    }

    @GetMapping("/taskList/{deptId}/{userId}")
    public R taskList(@ApiIgnore @PathVariable Long deptId,@ApiIgnore @PathVariable Long userId) {
        QueryWrapper<EvaluateTaskEntity> wrapper = new QueryWrapper<>();
        wrapper.or().like("candidate_num",deptId).or().like("candidate_num",userId);
        List<EvaluateTaskEntity> list = evaluateTaskService.list(wrapper);
        return R.data(EvaluateTaskWrapper.build().listVO(list));
    }

    /**
     * 评优任务表 自定义分页
     */

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

@@ -82,9 +82,9 @@
    @ApiModelProperty(value = "评优数量")
    private Integer evaluateNum;
    /**
     * 候选人截止日期
     * 最终截止日期
     */
    @ApiModelProperty(value = "候选人截止日期")
    @ApiModelProperty(value = "最终截止日期")
    private Date evaluateCutoffTime;
    /**
     * 评优评选状态