From 1646cd0dc6af70437ceae7966df33668b444954f Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 19 一月 2024 18:16:04 +0800
Subject: [PATCH] 代码提交，将一些不需要过滤的接口，改为需要过滤
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java | 64 +++++++++++++++++++++++++++++++
1 files changed, 63 insertions(+), 1 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java
index 355eb56..5baef9a 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java
@@ -4,20 +4,25 @@
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.vo.*;
import com.ruoyi.project.mapper.*;
import com.ruoyi.project.service.*;
import com.ruoyi.system.mapper.SysDictDataMapper;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Logger;
/**
* 鎹愮尞鍣ㄥ畼绠＄悊Service涓氬姟灞傚鐞�
@@ -25,6 +30,7 @@
* @author ruoyi
* @date 2021-11-10
*/
+@Slf4j
@Service
public class ServiceDonateorganServiceImpl extends ServiceImpl<ServiceDonateorganMapper, ServiceDonateorgan> implements IServiceDonateorganService {
@@ -61,6 +67,8 @@
@Autowired
private SysDictDataMapper dictDataMapper;
+ @Autowired
+ IServiceOrganallocationService serviceOrganallocationService;
/**
@@ -113,6 +121,9 @@
}
if (serviceDonateorgan.getTransplanttime() != null) {
wrappers.eq(ServiceDonateorgan::getTransplanttime, serviceDonateorgan.getTransplanttime());
+ }
+ if (serviceDonateorgan.getEstimatedtime() != null) {
+ wrappers.eq(ServiceDonateorgan::getEstimatedtime, serviceDonateorgan.getEstimatedtime());
}
return this.list(wrappers);
}
@@ -440,7 +451,8 @@
donateNumber.setNumberOfDonate(serviceDonatebaseinfoMapper.countNumber(timeVO));
donateNumber.setNumberOfMedicalEvaluation(serviceMedicalevaluationMapper.countNumber(timeVO));
donateNumber.setNumberOfRelativeConfirmation(serviceRelativesconfirmationMapper.countNumber(timeVO));
- donateNumber.setNumberOfDonatePeople(serviceOrganallocationMapper.countNumber(timeVO));
+// donateNumber.setNumberOfDonatePeople(serviceOrganallocationMapper.countNumber(timeVO));
+ donateNumber.setNumberOfDonatePeople(serviceDonateorganMapper.countNumber(timeVO));
donateNumber.setNumberOfOrgans(serviceDonateorganMapper.countNumber(timeVO));
donateNumber.setNumberOfWitness(serviceDonationwitnessMapper.countNumber(timeVO));
donateNumber.setNumberOfEthicalReview(serviceEthicalreviewopinionsMapper.countNumber(timeVO));
@@ -736,6 +748,56 @@
return l;
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public List<ServiceDonateorgan> saveData(List<ServiceDonateorgan> serviceDonateorgans) {
+ for (ServiceDonateorgan serviceDonateorgan : serviceDonateorgans) {
+ if (serviceDonateorgan.getInfoid() == null) {
+ throw new BaseException("鏈叧鑱旀崘鐚熀纭�淇℃伅锛宨nfoid涓虹┖浜�" + serviceDonateorgan);
+ }
+
+ String organNumber = serviceDonateorgan.getDonorno() + "." + serviceDonateorgan.getOrganno();
+ if (StringUtils.isEmpty(serviceDonateorgan.getDonorno()) || StringUtils.isEmpty(serviceDonateorgan.getOrganno())) {
+ throw new BaseException("鏂板鏃剁敓鎴愮殑缂栧彿涓虹┖,鍒涘缓澶辫触(璇锋鏌ユ崘鐚�呯紪鍙峰拰鍣ㄥ畼绫诲埆)! 锛�" + serviceDonateorgan.toString());
+ } else {
+ ServiceDonateorgan serviceDonateorgan1 = new ServiceDonateorgan();
+ serviceDonateorgan1.setOrgannumber(organNumber);
+ List<ServiceDonateorgan> listrecord = this.queryList(serviceDonateorgan);
+ if (listrecord.size() > 0) {
+ continue;
+ }
+ }
+ serviceDonateorgan.setOrgannumber(organNumber);
+ log.info("serviceDonateorgan鐨勬暟鎹负: {}", serviceDonateorgan);
+ boolean save = this.save(serviceDonateorgan);
+
+
+// //淇濆瓨service_organallocation
+// ServiceOrganallocation serviceOrganallocation = new ServiceOrganallocation();
+// serviceOrganallocation.setAgeunit(serviceDonateorgan.getAgeunit());
+// serviceOrganallocation.setApplicanttime(serviceDonateorgan.getApplicanttime());
+// serviceOrganallocation.setIdcardno(serviceDonateorgan.getIdcardno());
+// serviceOrganallocation.setIdcardtype(Long.valueOf(serviceDonateorgan.getIdcardtype()));
+// serviceOrganallocation.setOrganid(serviceDonateorgan.getId());
+// serviceOrganallocation.setOrgannumber(serviceDonateorgan.getOrgannumber());
+// log.info("serviceOrganallocation鐨勬暟鎹负: {}", serviceOrganallocation);
+// serviceOrganallocationService.save(serviceOrganallocation);
+ }
+ return serviceDonateorgans;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Boolean editArrayData(List<ServiceDonateorgan> serviceDonateorgans) {
+ for (ServiceDonateorgan serviceDonateorgan : serviceDonateorgans) {
+ if (serviceDonateorgan.getId() == null) {
+ throw new BaseException("id涓虹┖浜� 锛�" + serviceDonateorgan);
+ }
+ this.updateById(serviceDonateorgan);
+ }
+ //灏嗗甫ID鐨勬暟鎹繑鍥�
+ return true;
+ }
// @Override
--
Gitblit v1.9.3