From e842ed74b3167075e4f8f0cf76b38ddc53a8fb54 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 12 九月 2025 22:18:48 +0800
Subject: [PATCH] 日志修改
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateannexServiceImpl.java | 87 ++++++++++++++++++++++++++++++++++---------
1 files changed, 68 insertions(+), 19 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateannexServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateannexServiceImpl.java
index 004273c..a2e6438 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateannexServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateannexServiceImpl.java
@@ -1,79 +1,128 @@
package com.ruoyi.project.service.impl;
+import java.time.LocalDate;
+import java.time.ZoneId;
import java.util.List;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.project.common.CalculateDateUtils;
import com.ruoyi.project.domain.vo.DonateAnnexVO;
+import com.ruoyi.project.domain.vo.EthicalReviewVO;
+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.ServiceDonateannexMapper;
import com.ruoyi.project.domain.ServiceDonateannex;
import com.ruoyi.project.service.IServiceDonateannexService;
+import org.springframework.transaction.annotation.Transactional;
/**
* 鎹愮尞闄勪欢Service涓氬姟灞傚鐞�
- *
+ *
* @author ruoyi
* @date 2021-11-11
*/
+@Slf4j
@Service
-public class ServiceDonateannexServiceImpl extends ServiceImpl<ServiceDonateannexMapper, ServiceDonateannex> implements IServiceDonateannexService
-{
+public class ServiceDonateannexServiceImpl extends ServiceImpl<ServiceDonateannexMapper, ServiceDonateannex> implements IServiceDonateannexService {
@Autowired
ServiceDonateannexMapper serviceDonateannexMapper;
/**
* 鏌ヨ鎹愮尞闄勪欢鍒楄〃
- *
+ *
* @param serviceDonateannex 鎹愮尞闄勪欢
* @return 鎹愮尞闄勪欢
*/
@Override
public List<ServiceDonateannex> queryList(ServiceDonateannex serviceDonateannex) {
LambdaQueryWrapper<ServiceDonateannex> wrappers = Wrappers.lambdaQuery();
- if (serviceDonateannex.getInfoid() != null){
- wrappers.eq(ServiceDonateannex::getInfoid ,serviceDonateannex.getInfoid());
+ if (serviceDonateannex.getInfoid() != null) {
+ wrappers.eq(ServiceDonateannex::getInfoid, serviceDonateannex.getInfoid());
}
- if (StringUtils.isNotBlank(serviceDonateannex.getDonorno())){
- wrappers.eq(ServiceDonateannex::getDonorno ,serviceDonateannex.getDonorno());
+ if (StringUtils.isNotBlank(serviceDonateannex.getDonorno())) {
+ wrappers.eq(ServiceDonateannex::getDonorno, serviceDonateannex.getDonorno());
}
- if (StringUtils.isNotBlank(serviceDonateannex.getAnnexname())){
- wrappers.like(ServiceDonateannex::getAnnexname ,serviceDonateannex.getAnnexname());
+ if (StringUtils.isNotBlank(serviceDonateannex.getAnnexname())) {
+ wrappers.like(ServiceDonateannex::getAnnexname, serviceDonateannex.getAnnexname());
}
- if (StringUtils.isNotBlank(serviceDonateannex.getAnnexno())){
- wrappers.eq(ServiceDonateannex::getAnnexno ,serviceDonateannex.getAnnexno());
+ if (StringUtils.isNotBlank(serviceDonateannex.getAnnexno())) {
+ wrappers.eq(ServiceDonateannex::getAnnexno, serviceDonateannex.getAnnexno());
}
- if (StringUtils.isNotBlank(serviceDonateannex.getAnnexurl())){
- wrappers.eq(ServiceDonateannex::getAnnexurl ,serviceDonateannex.getAnnexurl());
+ if (StringUtils.isNotBlank(serviceDonateannex.getAnnexurl())) {
+ wrappers.eq(ServiceDonateannex::getAnnexurl, serviceDonateannex.getAnnexurl());
}
return this.list(wrappers);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Boolean updateOrSave(List<ServiceDonateannex> serviceDonateannexs) {
+ for (ServiceDonateannex serviceDonateannex : serviceDonateannexs) {
+ if (serviceDonateannex.getInfoid() == null || serviceDonateannex.getAnnexfilestype() == null) {
+ throw new BaseException("璇锋鏌ヤ富琛╥d鍜岄檮浠剁被鍨嬫槸鍚︿负绌猴紒");
+ }
+ if (serviceDonateannex.getId() == null) {
+ this.save(serviceDonateannex);
+ } else {
+ boolean b = this.updateById(serviceDonateannex);
+ }
+ }
+ return true;
}
@Override
public List<DonateAnnexVO> selectVOList(DonateAnnexVO donateAnnexVO) {
SysUser user = SecurityUtils.getLoginUser().getUser();
- List <SysRole> l = user.getRoles();
+ 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){
+ if (b) {
donateAnnexVO.setCreate_by(user.getUserName());
}
- return serviceDonateannexMapper.selectVOList(donateAnnexVO);
+ List<DonateAnnexVO> donateAnnexVOS = serviceDonateannexMapper.selectVOList(donateAnnexVO);
+ for (DonateAnnexVO donateAnnexVO1 : donateAnnexVOS) {
+ if (donateAnnexVO1.getBirthday() != null) {
+ Map<String, String> map = CalculateDateUtils.calculateAge(donateAnnexVO1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), LocalDate.now());
+ donateAnnexVO1.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
+ donateAnnexVO1.setAgeunit(map.get("ageUnit"));
+ donateAnnexVO1.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
+ donateAnnexVO1.setAgeunit2(map.get("ageUnit2"));
+ }
+ }
+
+ return donateAnnexVOS;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public List<ServiceDonateannex> saveData(List<ServiceDonateannex> serviceDonateannexs) {
+ for (ServiceDonateannex serviceDonateannex : serviceDonateannexs) {
+ log.info("serviceDonateannex鐨勪俊鎭細{}", serviceDonateannex);
+ if (serviceDonateannex.getInfoid() == null || serviceDonateannex.getAnnexfilestype() == null) {
+ throw new BaseException("涓昏〃id鎴栭檮浠剁被鍨婭D涓虹┖锛岃妫�鏌ュ悗鍐嶄繚瀛�");
+ }
+ this.save(serviceDonateannex);
+ }
+ return serviceDonateannexs;
}
}
--
Gitblit v1.9.3