From 25fb6d7ba484738ebe9c577eba4f3596520caf60 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 08 三月 2024 18:54:55 +0800
Subject: [PATCH] yxh
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorpaymentServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorpaymentServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorpaymentServiceImpl.java
index 164366b..473f576 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorpaymentServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorpaymentServiceImpl.java
@@ -7,7 +7,8 @@
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.project.domain.*;
+import com.ruoyi.project.domain.ServiceDonorchargeorgan;
+import com.ruoyi.project.domain.ServiceDonorpayment;
import com.ruoyi.project.mapper.ServiceDonorchargeorganMapper;
import com.ruoyi.project.mapper.ServiceDonorpaymentMapper;
import com.ruoyi.project.service.IServiceDonorpaymentService;
@@ -17,7 +18,6 @@
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
-import java.time.LocalDate;
import java.util.*;
/**
@@ -59,8 +59,11 @@
if (StringUtils.isNotBlank(serviceDonorpayment.getHospitalname())) {
wrappers.eq(ServiceDonorpayment::getHospitalname, serviceDonorpayment.getHospitalname());
}
- if (StringUtils.isNotBlank(serviceDonorpayment.getHandledPerson())) {
- wrappers.eq(ServiceDonorpayment::getHandledPerson, serviceDonorpayment.getHandledPerson());
+ if (StringUtils.isNotBlank(serviceDonorpayment.getUserName())) {
+ wrappers.eq(ServiceDonorpayment::getUserName, serviceDonorpayment.getUserName());
+ }
+ if (StringUtils.isNotBlank(serviceDonorpayment.getUserNo())) {
+ wrappers.eq(ServiceDonorpayment::getUserNo, serviceDonorpayment.getUserNo());
}
if (StringUtils.isNotBlank(serviceDonorpayment.getHospitalno())) {
wrappers.eq(ServiceDonorpayment::getHospitalno, serviceDonorpayment.getHospitalno());
@@ -99,7 +102,7 @@
dataMap.put("RQ", simpleDateFormat.format(new Date()));
dataMap.put("FKDW", serviceDonorpayment.getHospitalname());
- dataMap.put("JBR", StringUtils.isEmpty(serviceDonorpayment.getHandledPerson()) ? "" : serviceDonorpayment.getHandledPerson());
+ dataMap.put("JBR", StringUtils.isEmpty(serviceDonorpayment.getUserName()) ? "" : serviceDonorpayment.getUserName());
ServiceDonorchargeorgan serviceDonorchargeorgan = new ServiceDonorchargeorgan();
serviceDonorchargeorgan.setPaymentid(id);
List<ServiceDonorchargeorgan> serviceDonorchargeorgans = serviceDonorchargeorganMapper.selectServiceDonorchargeorganList(serviceDonorchargeorgan);
--
Gitblit v1.9.3