变更

liusheng

2024-07-25 517ecf9879052b2f3fbad25c0469935cc45553a7

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java

@@ -7,13 +7,16 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.project.domain.vo.MedicalEvaluationVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

import java.util.ArrayList;
import java.util.Map;

import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.mapper.ServiceMedicalevaluationMapper;
import com.ruoyi.project.domain.ServiceMedicalevaluation;
@@ -21,13 +24,13 @@

/**
 * 医学评估Service业务层处理
 * 
 *
 * @author ruoyi
 * @date 2021-11-19
 */
@Slf4j
@Service
public class ServiceMedicalevaluationServiceImpl extends ServiceImpl<ServiceMedicalevaluationMapper, ServiceMedicalevaluation> implements IServiceMedicalevaluationService 
{
public class ServiceMedicalevaluationServiceImpl extends ServiceImpl<ServiceMedicalevaluationMapper, ServiceMedicalevaluation> implements IServiceMedicalevaluationService {

    @Autowired
    ServiceMedicalevaluationMapper serviceMedicalevaluationMapper;
@@ -35,18 +38,21 @@

    /**
     * 查询医学评估列表
     * 
     *
     * @param serviceMedicalevaluation 医学评估
     * @return 医学评估
     */
    @Override
    public List<ServiceMedicalevaluation> queryList(ServiceMedicalevaluation serviceMedicalevaluation) {
        LambdaQueryWrapper<ServiceMedicalevaluation> wrappers = Wrappers.lambdaQuery();
        if (StringUtils.isNotNull(serviceMedicalevaluation.getId())){
            wrappers.eq(ServiceMedicalevaluation::getId ,serviceMedicalevaluation.getId());
        if (StringUtils.isNotNull(serviceMedicalevaluation.getId())) {
            wrappers.eq(ServiceMedicalevaluation::getId, serviceMedicalevaluation.getId());
        }
        if (StringUtils.isNotBlank(serviceMedicalevaluation.getDonorno())){
            wrappers.eq(ServiceMedicalevaluation::getDonorno ,serviceMedicalevaluation.getDonorno());
        if (StringUtils.isNotNull(serviceMedicalevaluation.getInfoid())) {
            wrappers.eq(ServiceMedicalevaluation::getInfoid, serviceMedicalevaluation.getInfoid());
        }
        if (StringUtils.isNotBlank(serviceMedicalevaluation.getDonorno())) {
            wrappers.eq(ServiceMedicalevaluation::getDonorno, serviceMedicalevaluation.getDonorno());
        }
        return this.list(wrappers);
    }
@@ -55,17 +61,19 @@
    public List<MedicalEvaluationVO> selectVOList(MedicalEvaluationVO medicalEvaluationVO) {

        SysUser user = SecurityUtils.getLoginUser().getUser();
        List <SysRole> l = user.getRoles();
        log.info("用户的角色是：{}", user);
        List<SysRole> l = user.getRoles();
        Boolean b = false;
        for(SysRole r : l){
            if(r.getRoleId().longValue() == 3){
        for (SysRole r : l) {
            if (r.getRoleId().longValue() == 3) {
                b = true;
            }
        }
        if(b){
            medicalEvaluationVO.setBasecreateby(user.getUserName());
        if (b) {
//            medicalEvaluationVO.setBasecreateby(user.getUserName());
            medicalEvaluationVO.setReporterno(user.getUserName());
        }

        log.info("selectVOList的入参是：{}", medicalEvaluationVO);
        return serviceMedicalevaluationMapper.selectVOList(medicalEvaluationVO);
    }