From 406fd36d622b50005efb0f935f029e4bd5877f48 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期六, 19 七月 2025 16:28:07 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 2 +-
ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml | 8 ++++----
ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
index 2440417..6bd0005 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
@@ -132,7 +132,7 @@
wrappers.eq(ServiceFund::getJxrq, serviceFund.getJxrq());
}
// 娣诲姞 group by donorname
- wrappers.groupBy(ServiceFund::getDonorname);
+// wrappers.groupBy(ServiceFund::getDonorname);
return this.list(wrappers);
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
index 71e71ab..1a7ad83 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
@@ -167,10 +167,10 @@
`service_donationwitness`.`create_by` AS `createby`,
`service_donationwitness`.`create_time` AS `createtime`,
`service_donationwitness`.`update_by` AS `updateby`,
- `service_donationwitness`.`update_time` AS `updatetime`
- `service_donationwitness`.`coordinator_in_operating` AS `coordinatorInOperating`
- `service_donationwitness`.`coordinator_out_operating` AS `coordinatorOutOperating`
- `service_donationwitness`.`coordinator_sign` AS `coordinatorSign`
+ `service_donationwitness`.`update_time` AS `updatetime`,
+ `service_donationwitness`.`coordinator_in_operating` AS `coordinatorInOperating`,
+ `service_donationwitness`.`coordinator_out_operating` AS `coordinatorOutOperating`,
+ `service_donationwitness`.`coordinator_sign` AS `coordinatorSign`,
`service_donationwitness`.`coordinator_sign_time` AS `coordinatorSignTime`
FROM
`service_donatebaseinfo`
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
index c30ff7b..4f1ce55 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
@@ -151,9 +151,9 @@
`service_relativesconfirmation`.`update_by` AS `updateBy`,
`service_relativesconfirmation`.`update_time` AS `updateTime`,
`service_relativesconfirmation`.`operatorno` AS `operatorno`,
- `service_relativesconfirmation`.`operatorname` AS `operatorname`
- `service_relativesconfirmation`.`nation` AS `nation`
- `service_relativesconfirmation`.`education` AS `education`
+ `service_relativesconfirmation`.`operatorname` AS `operatorname`,
+ `service_relativesconfirmation`.`nation` AS `nation`,
+ `service_relativesconfirmation`.`education` AS `education`,
`service_relativesconfirmation`.`work` AS `work`
FROM
--
Gitblit v1.9.3