From 73f5b82df781d2b061ba24d29182f6898b5535d9 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期日, 28 十二月 2025 14:34:04 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java | 67 +++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 13 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java
index 60f40e7..fb10d55 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java
@@ -5,14 +5,18 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.project.common.CalculateDateUtils;
+import com.ruoyi.project.domain.ServiceDonatebaseinfo;
import com.ruoyi.project.domain.ServiceDonatebaseinfoReport;
import com.ruoyi.project.domain.ServiceDonatebaseinfoReportFile;
import com.ruoyi.project.domain.ServiceTransport;
import com.ruoyi.project.mapper.ServiceDonatebaseinfoReportMapper;
import com.ruoyi.project.service.IServiceDonatebaseinfoReportFileService;
import com.ruoyi.project.service.IServiceDonatebaseinfoReportService;
+import com.ruoyi.project.service.IServiceDonatebaseinfoService;
import com.ruoyi.project.service.IServiceTransportService;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -35,9 +39,10 @@
private IServiceDonatebaseinfoReportFileService serviceDonatebaseinfoReportFileService;
@Autowired
private IServiceTransportService serviceTransportService;
-
@Autowired
private ServiceDonatebaseinfoReportMapper serviceDonatebaseinfoReportMapper;
+ @Autowired
+ private IServiceDonatebaseinfoService serviceDonatebaseinfoService;
/**
* 鏌ヨ鎹愮尞涓婃姤鍩虹鍒楄〃
@@ -48,6 +53,11 @@
@Override
public Page<ServiceDonatebaseinfoReport> queryList(ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
LambdaQueryWrapper<ServiceDonatebaseinfoReport> wrappers = getWrapper(serviceDonatebaseinfoReport);
+ // 娣诲姞create_time涓嶄负绌虹殑鏉′欢
+ wrappers.isNotNull(ServiceDonatebaseinfoReport::getCreateTime);
+ // 鐒跺悗杩涜鍊掑簭鎺掑簭
+ wrappers.orderByDesc(ServiceDonatebaseinfoReport::getCreateTime);
+
// 鍒涘缓鍒嗛〉瀵硅薄锛岃缃〉鐮佸拰姣忛〉澶у皬
int currentPage = (serviceDonatebaseinfoReport.getPageNum() == null || serviceDonatebaseinfoReport.getPageNum() < 1) ? 1 : serviceDonatebaseinfoReport.getPageNum();
int size = (serviceDonatebaseinfoReport.getPageSize() == null || serviceDonatebaseinfoReport.getPageSize() < 1) ? 10 : serviceDonatebaseinfoReport.getPageSize();
@@ -101,6 +111,30 @@
//鎵�鏈夌姸鎬佺殑鎬绘暟
map.put("all", all);
return map;
+ }
+
+ /**
+ * 鍒涘缓妗ｆ
+ *
+ * @param serviceDonatebaseinfoReport
+ * @return
+ */
+ @Override
+ public Boolean createDocument(ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
+ //灏唕eport鏁版嵁澶嶅埗鍒皊erviceDonatebaseinfo涓�
+ ServiceDonatebaseinfo serviceDonatebaseinfo1 = DtoConversionUtils.sourceToTarget(serviceDonatebaseinfoReport, ServiceDonatebaseinfo.class);
+ serviceDonatebaseinfo1.setId(null);
+ //鍏堥�氳繃caseNo鏌ヨ鏄惁瀛樺湪
+ ServiceDonatebaseinfo serviceDonatebaseinfo = new ServiceDonatebaseinfo();
+ serviceDonatebaseinfo.setCaseNo(serviceDonatebaseinfoReport.getCaseNo());
+ List<ServiceDonatebaseinfo> serviceDonatebaseinfos = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo);
+ if (CollectionUtils.isNotEmpty(serviceDonatebaseinfos) && serviceDonatebaseinfos.size() > 0) {
+ serviceDonatebaseinfo1.setId(serviceDonatebaseinfos.get(0).getId());
+ serviceDonatebaseinfoService.updateById(serviceDonatebaseinfo1);
+ return true;
+ }
+ //鍒涘缓
+ return serviceDonatebaseinfoService.save(serviceDonatebaseinfo1);
}
private LambdaQueryWrapper<ServiceDonatebaseinfoReport> getWrapper(ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
@@ -216,11 +250,11 @@
if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getPatientstate())) {
wrappers.eq(ServiceDonatebaseinfoReport::getPatientstate, serviceDonatebaseinfoReport.getPatientstate());
}
- if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getReporterno())) {
- wrappers.eq(ServiceDonatebaseinfoReport::getReporterno, serviceDonatebaseinfoReport.getReporterno());
+ if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getInfoNo())) {
+ wrappers.eq(ServiceDonatebaseinfoReport::getInfoNo, serviceDonatebaseinfoReport.getInfoNo());
}
- if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getReportername())) {
- wrappers.like(ServiceDonatebaseinfoReport::getReportername, serviceDonatebaseinfoReport.getReportername());
+ if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getInfoName())) {
+ wrappers.like(ServiceDonatebaseinfoReport::getInfoName, serviceDonatebaseinfoReport.getInfoName());
}
if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getReporterphone())) {
wrappers.eq(ServiceDonatebaseinfoReport::getReporterphone, serviceDonatebaseinfoReport.getReporterphone());
@@ -231,12 +265,6 @@
if (serviceDonatebaseinfoReport.getTerminationCase() != null) {
wrappers.eq(ServiceDonatebaseinfoReport::getTerminationCase, serviceDonatebaseinfoReport.getTerminationCase());
}
- if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getUserNo())) {
- wrappers.eq(ServiceDonatebaseinfoReport::getUserNo, serviceDonatebaseinfoReport.getUserNo());
- }
- if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getUserName())) {
- wrappers.eq(ServiceDonatebaseinfoReport::getUserName, serviceDonatebaseinfoReport.getUserName());
- }
if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getDeptNo())) {
wrappers.eq(ServiceDonatebaseinfoReport::getDeptNo, serviceDonatebaseinfoReport.getDeptNo());
}
@@ -246,9 +274,22 @@
if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getIsTransport())) {
wrappers.eq(ServiceDonatebaseinfoReport::getIsTransport, serviceDonatebaseinfoReport.getIsTransport());
}
- if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getGscScore())) {
- wrappers.eq(ServiceDonatebaseinfoReport::getGscScore, serviceDonatebaseinfoReport.getGscScore());
+ if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getGcsScore())) {
+ wrappers.eq(ServiceDonatebaseinfoReport::getGcsScore, serviceDonatebaseinfoReport.getGcsScore());
}
+ if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getRhYin())) {
+ wrappers.eq(ServiceDonatebaseinfoReport::getRhYin, serviceDonatebaseinfoReport.getRhYin());
+ }
+ if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getBloodType())) {
+ wrappers.eq(ServiceDonatebaseinfoReport::getBloodType, serviceDonatebaseinfoReport.getBloodType());
+ }
+ if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getCoordinatorName())) {
+ wrappers.like(ServiceDonatebaseinfoReport::getCoordinatorName, serviceDonatebaseinfoReport.getCoordinatorName());
+ }
+ if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getCoordinatorNo())) {
+ wrappers.eq(ServiceDonatebaseinfoReport::getCoordinatorNo, serviceDonatebaseinfoReport.getCoordinatorNo());
+ }
+
return wrappers;
}
--
Gitblit v1.9.3