From 7426f4da7d59cc3897c39b7cc977ad02949e8df5 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期二, 03 十一月 2026 09:44:10 +0800
Subject: [PATCH] 器官费用增加删除
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java | 8 ++++++++
ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml | 11 +++++++++++
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonorchargeorganMapper.java | 5 +++++
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonorchargeorganService.java | 5 +++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java | 2 +-
5 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java
index 34877d4..fd5dfd4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java
@@ -207,7 +207,7 @@
@Log(title = "鎹愮尞鍣ㄥ畼", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
- return toAjax(serviceDonorchargeorganService.removeByIds(Arrays.asList(ids)));
+ return toAjax(serviceDonorchargeorganService.removeByIds(ids) > 0);
}
@RepeatSubmit
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonorchargeorganMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonorchargeorganMapper.java
index 658b651..a665122 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonorchargeorganMapper.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonorchargeorganMapper.java
@@ -31,6 +31,11 @@
public Boolean updateDonorchargeorgan(ServiceDonorchargeorgan serviceDonorchargeorgan);
+ /**
+ * 閫昏緫鍒犻櫎锛氫笉闄愬畾 del_flag 褰撳墠鍊硷紙鍏煎 NULL锛夛紝缁熶竴缃负 1
+ */
+ public int removeByIds(@Param("ids") Long[] ids);
+
public List<SpStatChange> getListBySpStatChange(@Param("PABEGTIME") String PABEGTIME, @Param("PAENDTIME") String PAENDTIME, @Param("PAHOSPITALNAME") String PAHOSPITALNAME);
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonorchargeorganService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonorchargeorganService.java
index f02abb1..198da0e 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonorchargeorganService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonorchargeorganService.java
@@ -27,6 +27,11 @@
public Boolean updateDonorchargeorgan(ServiceDonorchargeorgan serviceDonorchargeorgan);
+ /**
+ * 閫昏緫鍒犻櫎鍣ㄥ畼璐圭敤锛坉el_flag 缃� 1锛�
+ */
+ public int removeByIds(Long[] ids);
+
public List<ServiceDonorchargeorgan> queryListBypaymentidIsNull(ServiceDonorchargeorgan serviceDonorchargeorgan);
/**
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java
index 3800c85..c610b67 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java
@@ -106,6 +106,14 @@
}
@Override
+ public int removeByIds(Long[] ids) {
+ if (ids == null || ids.length == 0) {
+ return 0;
+ }
+ return serviceDonorchargeorganMapper.removeByIds(ids);
+ }
+
+ @Override
public List<ServiceDonorchargeorgan> queryListBypaymentidIsNull(ServiceDonorchargeorgan serviceDonorchargeorgan) {
List<ServiceDonorchargeorgan> serviceDonorchargeorgans = serviceDonorchargeorganMapper.queryListBypaymentidIsNull(serviceDonorchargeorgan);
return serviceDonorchargeorgans;
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
index 49514fd..dbd68d4 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
@@ -76,6 +76,7 @@
resultMap="ServiceDonorchargeorganResult">
<include refid="selectServiceDonorchargeorganVo"/>
<where>
+ and (del_flag = 0 or del_flag is null)
<if test="infoid != null ">and InfoID = #{infoid}</if>
<if test="receiveTime != null ">and receive_time = #{receiveTime}</if>
<if test="paymentid != null ">and paymentid = #{paymentid}</if>
@@ -135,6 +136,7 @@
from service_donorchargeorgan o
left join service_donatebaseinfo b on b.ID = o.InfoID
<where>
+ and (o.del_flag = 0 or o.del_flag is null)
<if test="selectAll != true ">
and (o.paymentid IS NULL or o.paymentid=0 or organcharge-amount>0)
and (organ_charge_state =0 OR organ_charge_state IS null)
@@ -164,6 +166,15 @@
order by b.donatetime
</select>
+ <update id="removeByIds">
+ update service_donorchargeorgan
+ set del_flag = 1
+ where id in
+ <foreach collection="ids" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </update>
+
<update id="updateDonorchargeorgan" parameterType="com.ruoyi.project.domain.ServiceDonorchargeorgan">
update service_donorchargeorgan
<set>
--
Gitblit v1.9.3