From f2ebcbc23517db261ac352668e09e457c4ab8a2f Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 29 七月 2024 18:30:28 +0800
Subject: [PATCH] 变更
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorpaymentServiceImpl.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 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..e8ca745 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());
@@ -98,8 +101,8 @@
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy骞碝M鏈坉d鏃�");
dataMap.put("RQ", simpleDateFormat.format(new Date()));
- dataMap.put("FKDW", serviceDonorpayment.getHospitalname());
- dataMap.put("JBR", StringUtils.isEmpty(serviceDonorpayment.getHandledPerson()) ? "" : serviceDonorpayment.getHandledPerson());
+ dataMap.put("JSDW", serviceDonorpayment.getHospitalname());
+
ServiceDonorchargeorgan serviceDonorchargeorgan = new ServiceDonorchargeorgan();
serviceDonorchargeorgan.setPaymentid(id);
List<ServiceDonorchargeorgan> serviceDonorchargeorgans = serviceDonorchargeorganMapper.selectServiceDonorchargeorganList(serviceDonorchargeorgan);
@@ -114,10 +117,11 @@
map.put("XH", count);
map.put("JXZ", StringUtils.isEmpty(serviceDonorchargeorgan1.getDonorname()) ? "" : serviceDonorchargeorgan1.getDonorname());
map.put("XM", StringUtils.isEmpty(serviceDonorchargeorgan1.getOrganname()) ? "" : serviceDonorchargeorgan1.getOrganname());
- map.put("XTBH", StringUtils.isEmpty(serviceDonorchargeorgan1.getCaseno()) ? "" : serviceDonorchargeorgan1.getCaseno());
- map.put("ST", StringUtils.isEmpty(serviceDonorchargeorgan1.getName()) ? "" : serviceDonorchargeorgan1.getName());
+ map.put("GJFPBH", StringUtils.isEmpty(serviceDonorchargeorgan1.getCaseno()) ? "" : serviceDonorchargeorgan1.getCaseno());
+ map.put("STXS", StringUtils.isEmpty(serviceDonorchargeorgan1.getName()) ? "" : serviceDonorchargeorgan1.getName());
map.put("JE", serviceDonorchargeorgan1.getOrgancharge() == BigDecimal.ZERO ? "" : serviceDonorchargeorgan1.getOrgancharge());
+ map.put("BZ", StringUtils.isEmpty(serviceDonorchargeorgan1.getOrganchargedesc()) ? "" : serviceDonorchargeorgan1.getOrganchargedesc());
hj += serviceDonorchargeorgan1.getOrgancharge().doubleValue();
newsList.add(map);
@@ -125,7 +129,12 @@
}
dataMap.put("items", newsList);
- dataMap.put("BYHJ", hj);
+ dataMap.put("HJ", hj);
+ dataMap.put("SKDW", "娴欐睙鐪佷汉姘戝尰闄㈡禉姹熺渷浜轰綋鍣ㄥ畼鑾峰彇鏈嶅姟绠＄悊涓績");
+ dataMap.put("KHYH", "涓浗鍐滀笟閾惰鏉窞鏈濇櫀鏀");
+ dataMap.put("ZH", "19015601040025130");
+// dataMap.put("LXR", StringUtils.isEmpty(serviceDonorpayment.getUserName()) ? "" : serviceDonorpayment.getUserName());
+ dataMap.put("LXR", "閮戜寒锛�18868898880锛�");
}
--
Gitblit v1.9.3