增加app考核api

xieb

2023-12-09 ffbd58c43e629668614e24d6f73a9bfebda3c41d

增加app考核api

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

@@ -37,4 +37,12 @@

    private String postName;

    private String toUserName;

    private String toDeptName;

    private String toPostName;

    private AssessmentTaskVO assessmentTaskVO;

}

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

@@ -16,18 +16,23 @@
 */
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;
import org.springblade.common.cache.UserCache;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.modules.assessment.entity.AssessmentSetEntity;
import org.springblade.modules.assessment.entity.AssessmentTaskEntity;
import org.springblade.modules.assessment.service.IAssessmentTaskService;
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.time.LocalDateTime;
import java.util.List;
import java.util.Objects;

@@ -39,8 +44,11 @@
 */
public class AssessmentSetWrapper extends BaseEntityWrapper<AssessmentSetEntity, AssessmentSetVO>  {

    @Autowired
    private IUserService userService;
    private static final IAssessmentTaskService assessmentTaskService;

    static {
        assessmentTaskService = SpringUtil.getBean(IAssessmentTaskService.class);
    }

    public static AssessmentSetWrapper build() {
        return new AssessmentSetWrapper();
@@ -62,10 +70,19 @@
    public IPage<AssessmentSetVO> pageVO(IPage<AssessmentSetEntity> pages) {
        List<AssessmentSetVO> records = listVO(pages.getRecords());
        for (AssessmentSetVO vo:records) {
            User user = UserCache.getUser(vo.getToUserId());
            User user = UserCache.getUser(vo.getUserId()); //被考核人
            vo.setUserName(user.getName());
            vo.setDeptName(SysCache.getDeptName(Long.valueOf(user.getDeptId())));
            vo.setPostName(SysCache.getPostName(Long.valueOf(user.getPostId())));

            user = UserCache.getUser(vo.getToUserId()); //考核人
            vo.setToUserName(user.getName());
            vo.setToDeptName(SysCache.getDeptName(Long.valueOf(user.getDeptId())));
            vo.setToPostName(SysCache.getPostName(Long.valueOf(user.getPostId())));

            QueryWrapper<AssessmentTaskEntity> wrapper = new QueryWrapper<>();
            wrapper.gt("end_time", LocalDateTime.now());
            vo.setAssessmentTaskVO(AssessmentTaskWrapper.build().entityVO(assessmentTaskService.list(wrapper).get(0)));
        }
        IPage<AssessmentSetVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
        pageVo.setRecords(records);