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 | 158 ++++++++++++++++++----------------------------------
1 files changed, 56 insertions(+), 102 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 fced001..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 {
@@ -62,22 +68,7 @@
private SysDictDataMapper dictDataMapper;
@Autowired
- private IServiceMedicalevaluationService serviceMedicalevaluationService;
-
- @Autowired
- private IServiceRelativesconfirmationService serviceRelativesconfirmationService;
-
- @Autowired
- private IServiceEthicalreviewopinionsService serviceEthicalreviewopinionsService;
-
- @Autowired
- private IServiceOrganallocationService serviceOrganallocationService;
-
- @Autowired
- private IServiceDonationwitnessService serviceDonationwitnessService;
-
- @Autowired
- private IServiceDonatecompletioninfoService serviceDonatecompletioninfoService;
+ IServiceOrganallocationService serviceOrganallocationService;
/**
@@ -130,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);
}
@@ -457,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));
@@ -754,95 +749,54 @@
}
@Override
- public Map<String, Object> getWorkFlow(Long id) {
- //鐢ㄤ簬杩斿洖
- Map<String, Object> map = new ConcurrentHashMap<>();
+ @Transactional(rollbackFor = Exception.class)
+ public List<ServiceDonateorgan> saveData(List<ServiceDonateorgan> serviceDonateorgans) {
+ for (ServiceDonateorgan serviceDonateorgan : serviceDonateorgans) {
+ if (serviceDonateorgan.getInfoid() == null) {
+ throw new BaseException("鏈叧鑱旀崘鐚熀纭�淇℃伅锛宨nfoid涓虹┖浜�" + serviceDonateorgan);
+ }
- ServiceDonateorgan serviceDonateorgan = getById(id);
- if (ObjectUtils.isEmpty(serviceDonateorgan)) {
- return null;
+ 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);
}
- //灏佽serviceDonateorgan娼滃湪鎹愮尞鏁版嵁
- Map<String, String> donateorgan = new HashMap<>();
- donateorgan.put("createtime", serviceDonateorgan.getCreateTime().toString());
- donateorgan.put("updatetime", serviceDonateorgan.getUpdateTime().toString());
- donateorgan.put("process", "");
+ return serviceDonateorgans;
+ }
- //灏佽鍖诲璇勪及
- Map<String, String> medicalevaluation = new HashMap<>();
- ServiceMedicalevaluation serviceMedicalevaluation = new ServiceMedicalevaluation();
- serviceMedicalevaluation.setInfoid(id);
- List<ServiceMedicalevaluation> serviceMedicalevaluations = serviceMedicalevaluationService.queryList(serviceMedicalevaluation);
- if (!CollectionUtils.isEmpty(serviceMedicalevaluations)) {
- medicalevaluation.put("createtime", serviceMedicalevaluations.get(0).getCreateTime().toString());
- medicalevaluation.put("updatetime", serviceMedicalevaluations.get(0).getUpdateTime().toString());
- medicalevaluation.put("process", "");
+ @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);
}
-
- //灏佽鎹愮尞纭
- Map<String, String> relativesconfirmation = new HashMap<>();
- ServiceRelativesconfirmation serviceRelativesconfirmation = new ServiceRelativesconfirmation();
- serviceRelativesconfirmation.setInfoid(id);
- List<ServiceRelativesconfirmation> serviceRelativesconfirmations = serviceRelativesconfirmationService.queryList(serviceRelativesconfirmation);
- if (!CollectionUtils.isEmpty(serviceRelativesconfirmations)) {
- relativesconfirmation.put("createtime", serviceRelativesconfirmations.get(0).getCreateTime().toString());
- relativesconfirmation.put("updatetime", serviceRelativesconfirmations.get(0).getUpdateTime().toString());
- relativesconfirmation.put("process", "");
- }
-
-
- //灏佽浼︾悊瀹℃煡
- Map<String, String> ethicalreviewopinions = new HashMap<>();
- ServiceEthicalreviewopinions serviceEthicalreviewopinions = new ServiceEthicalreviewopinions();
- serviceEthicalreviewopinions.setInfoid(id);
- List<ServiceEthicalreviewopinions> serviceEthicalreviewopinionsList = serviceEthicalreviewopinionsService.queryList(serviceEthicalreviewopinions);
- if (!CollectionUtils.isEmpty(serviceEthicalreviewopinionsList)) {
- ethicalreviewopinions.put("createtime", serviceEthicalreviewopinionsList.get(0).getCreateTime().toString());
- ethicalreviewopinions.put("updatetime", serviceEthicalreviewopinionsList.get(0).getUpdateTime().toString());
- ethicalreviewopinions.put("process", "");
- }
-
- //灏佽鍣ㄥ畼鍒嗛厤
- Map<String, String> organallocationService = new HashMap<>();
- ServiceOrganallocation serviceOrganallocation = new ServiceOrganallocation();
- serviceOrganallocation.setOrganid(id);
- List<ServiceOrganallocation> serviceOrganallocations = serviceOrganallocationService.selectServiceOrganallocationList(serviceOrganallocation);
- if (!CollectionUtils.isEmpty(serviceOrganallocations)) {
- organallocationService.put("createtime", serviceOrganallocations.get(0).getCreateTime().toString());
- organallocationService.put("updatetime", serviceOrganallocations.get(0).getUpdateTime().toString());
- organallocationService.put("process", "");
- }
-
- //灏佽鑾峰彇瑙佽瘉
- Map<String, String> donationwitness = new HashMap<>();
- ServiceDonationwitness serviceDonationwitness = serviceDonationwitnessService.getByInfoId(id);
- if (!ObjectUtils.isEmpty(serviceDonationwitness)) {
- donationwitness.put("createtime", serviceDonationwitness.getCreateTime().toString());
- donationwitness.put("updatetime", serviceDonationwitness.getUpdateTime().toString());
- donationwitness.put("process", "");
- }
-
- //灏佽瀹屾垚鐧昏
- Map<String, String> donatecompletioninfo = new HashMap<>();
- ServiceDonatecompletioninfo serviceDonatecompletioninfo = new ServiceDonatecompletioninfo();
- serviceDonatecompletioninfo.setInfoid(id);
- List<ServiceDonatecompletioninfo> serviceDonatecompletioninfos = serviceDonatecompletioninfoService.queryList(serviceDonatecompletioninfo);
- if (!CollectionUtils.isEmpty(serviceDonatecompletioninfos)) {
- donatecompletioninfo.put("createtime", serviceDonatecompletioninfos.get(0).getCreateTime().toString());
- donatecompletioninfo.put("updatetime", serviceDonatecompletioninfos.get(0).getUpdateTime().toString());
- donatecompletioninfo.put("process", "");
- }
-
- //灏嗘暟鎹皝闂紝骞惰繑鍥�
- map.put("donateorgan", donateorgan);
- map.put("medicalevaluation", medicalevaluation);
- map.put("relativesconfirmation", relativesconfirmation);
- map.put("ethicalreviewopinions", ethicalreviewopinions);
- map.put("organallocationService", organallocationService);
- map.put("donationwitness", donationwitness);
- map.put("donatecompletioninfo", donatecompletioninfo);
-
- return map;
+ //灏嗗甫ID鐨勬暟鎹繑鍥�
+ return true;
}
--
Gitblit v1.9.3