From 517ecf9879052b2f3fbad25c0469935cc45553a7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 25 七月 2024 18:24:24 +0800
Subject: [PATCH] 变更
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java
index 2397c4e..f80b863 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java
+++ b/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,21 +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.isNotNull(serviceMedicalevaluation.getInfoid())){
- wrappers.eq(ServiceMedicalevaluation::getInfoid ,serviceMedicalevaluation.getInfoid());
+ if (StringUtils.isNotNull(serviceMedicalevaluation.getInfoid())) {
+ wrappers.eq(ServiceMedicalevaluation::getInfoid, serviceMedicalevaluation.getInfoid());
}
- if (StringUtils.isNotBlank(serviceMedicalevaluation.getDonorno())){
- wrappers.eq(ServiceMedicalevaluation::getDonorno ,serviceMedicalevaluation.getDonorno());
+ if (StringUtils.isNotBlank(serviceMedicalevaluation.getDonorno())) {
+ wrappers.eq(ServiceMedicalevaluation::getDonorno, serviceMedicalevaluation.getDonorno());
}
return this.list(wrappers);
}
@@ -58,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);
}
--
Gitblit v1.9.3