From b1f41c066b0b7c38faffddbfe73b9be8d0bd508e Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期日, 08 十一月 2026 23:42:09 +0800
Subject: [PATCH] 修改了增值税城建税
---
ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
index dbd68d4..0e0c1cf 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
@@ -89,6 +89,17 @@
<if test="hospitalno != null and hospitalno != ''">and HospitalNo = #{hospitalno}</if>
<if test="organno != null and organno != ''">and OrganNo = #{organno}</if>
<if test="organname != null and organname != ''">and OrganName like concat('%', #{organname}, '%')</if>
+ <if test="organState != null and organState != ''">and organ_state = #{organState}</if>
+ <if test="payStatus != null and payStatus != ''">
+ <choose>
+ <when test="payStatus == '宸蹭粯'">
+ and organcharge is not null and (organcharge - IFNULL(amount, 0)) = 0
+ </when>
+ <when test="payStatus == '鏈粯'">
+ and organcharge is not null and (organcharge - IFNULL(amount, 0)) <> 0
+ </when>
+ </choose>
+ </if>
<if test="organcharge != null ">and organcharge = #{organcharge}</if>
<if test="organtime != null ">and organtime = #{organtime}</if>
<if test="chargeoperator != null and chargeoperator != ''">and chargeoperator = #{chargeoperator}</if>
@@ -150,8 +161,20 @@
'%')
</if>
<if test="hospitalno != null and hospitalno != ''">and o.HospitalNo = #{hospitalno}</if>
+ <if test="hospitalnoIsNull == true">and (o.Hospitalname is null or o.Hospitalname = '')</if>
<if test="organno != null and organno != ''">and o.OrganNo = #{organno}</if>
<if test="organname != null and organname != ''">and o.OrganName like concat('%', #{organname}, '%')</if>
+ <if test="organState != null and organState != ''">and o.organ_state = #{organState}</if>
+ <if test="payStatus != null and payStatus != ''">
+ <choose>
+ <when test="payStatus == '宸蹭粯'">
+ and o.organcharge is not null and (o.organcharge - IFNULL(o.amount, 0)) = 0
+ </when>
+ <when test="payStatus == '鏈粯'">
+ and o.organcharge is not null and (o.organcharge - IFNULL(o.amount, 0)) <> 0
+ </when>
+ </choose>
+ </if>
<if test="organcharge != null ">and o.organcharge = #{organcharge}</if>
<if test="organtime != null ">and o.organtime = #{organtime}</if>
<if test="chargeoperator != null and chargeoperator != ''">and o.chargeoperator = #{chargeoperator}</if>
--
Gitblit v1.9.3