From 2b7ad68415a5bced753fa76699fa16ee3142859b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 25 十二月 2023 19:30:02 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java | 43 ++++++++++++++++++++++++++++++++-----------
1 files changed, 32 insertions(+), 11 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 ec0acea..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
@@ -122,6 +122,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);
}
@@ -448,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));
@@ -748,6 +752,10 @@
@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());
@@ -764,20 +772,33 @@
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);
+// //淇濆瓨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
// public List<DonateByRegionVO> OrgansOfHospitalByMonth() {
--
Gitblit v1.9.3