From 17e08759071de47a7513d1cc1408c62d79713cd9 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 28 十月 2026 17:47:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java | 45 +++++++++++++++
ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml | 85 +++++++++++++++++++++------
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorganVO.java | 22 +++++++
3 files changed, 132 insertions(+), 20 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java
index db78a53..2392cc7 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java
@@ -10,6 +10,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
@@ -146,6 +147,7 @@
@Excel(name = "鍣ㄥ畼璐圭敤鏀跺彇鐘舵�侊細0锛氭湭鏀跺彇锛�1锛氬凡鏀跺彇锛�2锛氭斁寮�")
private Long chargestate;
+
/**
* 鍣ㄥ畼瀹為檯鏀跺埌璐圭敤璇存槑
*/
@@ -175,6 +177,32 @@
private String annexFiles;
/**
+ * 妗堜緥鏃堕棿锛堝叧鑱� service_donatebaseinfo.donatetime锛�
+ */
+ @ApiModelProperty("妗堜緥鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(exist = false)
+ private Date donatetime;
+
+ /**
+ * 妗堜緥鏃堕棿鏌ヨ寮�濮�
+ */
+ @ApiModelProperty("妗堜緥鏃堕棿鏌ヨ寮�濮�")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(exist = false)
+ private Date starttime;
+
+ /**
+ * 妗堜緥鏃堕棿鏌ヨ缁撴潫
+ */
+ @ApiModelProperty("妗堜緥鏃堕棿鏌ヨ缁撴潫")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(exist = false)
+ private Date endtime;
+
+ /**
* 澶囨敞
*/
@ApiModelProperty("澶囨敞")
@@ -187,5 +215,22 @@
@ApiModelProperty("鐘舵�侊紙0姝ｅ父 1鍒犻櫎锛�")
private Integer delFlag;
+ /**
+ * 鍣ㄥ畼鐘舵��
+ */
+ @ApiModelProperty("鍣ㄧ鐘舵�侊細1绉绘銆�2澶卞姛銆�3搴撳瓨銆�4宸茬Щ妞嶃��5寮冪敤銆�6鐩寸郴鍏嶉櫎銆�7涓嶈壇浜嬩欢")
+ @Excel(name = "鍣ㄧ鐘舵�侊細1绉绘銆�2澶卞姛銆�3搴撳瓨銆�4宸茬Щ妞嶃��5寮冪敤銆�6鐩寸郴鍏嶉櫎銆�7涓嶈壇浜嬩欢")
+ private String organState;
+
+ /**
+ * 鍣ㄥ畼鐘舵��
+ */
+ @ApiModelProperty("鍣ㄧ鏀惰垂鐘舵�侊細0鏈敹銆�1宸叉敹")
+ @Excel(name = "鍣ㄧ鏀惰垂鐘舵�侊細0鏈敹銆�1宸叉敹")
+ private String organChargeState;
+
+ @ApiModelProperty("鏌ヨ鎵�鏈�")
+ @TableField(exist = false)
+ private Boolean selectAll = false;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorganVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorganVO.java
index fb08ee6..6dfda1a 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorganVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorganVO.java
@@ -53,6 +53,13 @@
private Long infoid;
/**
+ * 妗堜緥鏃堕棿锛堝叧鑱攕ervice_donatebaseinfo琛級
+ */
+ @ApiModelProperty("妗堜緥鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date donatetime;
+
+ /**
* 鎹愮尞浜哄悕瀛�
*/
@ApiModelProperty("鎹愮尞浜哄悕瀛�")
@@ -86,6 +93,7 @@
@ApiModelProperty("鍣ㄥ畼绫诲埆鍚嶇О 璇﹁瀛楀吀sys_Organ")
@Excel(name = "鍣ㄥ畼绫诲埆鍚嶇О 璇﹁瀛楀吀sys_Organ")
private String organname;
+
/**
* 鍣ㄥ畼搴旀敹璐圭敤
@@ -180,5 +188,19 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date receiveTime;
+ /**
+ * 鍣ㄥ畼鐘舵��
+ */
+ @ApiModelProperty("鍣ㄧ鐘舵�侊細1绉绘銆�2澶卞姛銆�3搴撳瓨銆�4宸茬Щ妞嶃��5寮冪敤銆�6鐩寸郴鍏嶉櫎銆�7涓嶈壇浜嬩欢")
+ @Excel(name = "鍣ㄧ鐘舵�侊細1绉绘銆�2澶卞姛銆�3搴撳瓨銆�4宸茬Щ妞嶃��5寮冪敤銆�6鐩寸郴鍏嶉櫎銆�7涓嶈壇浜嬩欢")
+ private String organState;
+
+ /**
+ * 鍣ㄥ畼鐘舵��
+ */
+ @ApiModelProperty("鍣ㄧ鏀惰垂鐘舵�侊細0鏈敹銆�1宸叉敹")
+ @Excel(name = "鍣ㄧ鏀惰垂鐘舵�侊細0鏈敹銆�1宸叉敹")
+ private String organChargeState;
+
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
index a580351..9749fa1 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
@@ -6,6 +6,7 @@
<resultMap type="com.ruoyi.project.domain.ServiceDonorchargeorgan" id="ServiceDonorchargeorganResult">
<result property="id" column="ID"/>
+ <result property="infoid" column="InfoID"/>
<result property="donorchargeid" column="donorchargeid"/>
<result property="paymentid" column="paymentid"/>
<result property="paymentno" column="paymentno"/>
@@ -31,6 +32,9 @@
<result property="name" column="name"/>
<result property="receiveTime" column="receive_time"/>
<result property="annexFiles" column="annex_files"/>
+ <result property="donatetime" column="donatetime"/>
+ <result property="organState" column="organ_state"/>
+ <result property="organChargeState" column="organ_charge_state"/>
</resultMap>
<sql id="selectServiceDonorchargeorganVo">
@@ -60,7 +64,9 @@
caseno,
name,
receive_time,
- annex_files
+ annex_files,
+ organ_state,
+ organ_charge_state
from service_donorchargeorgan
</sql>
@@ -93,29 +99,66 @@
<select id="queryListBypaymentidIsNull" parameterType="com.ruoyi.project.domain.ServiceDonorchargeorgan"
resultMap="ServiceDonorchargeorganResult">
- <include refid="selectServiceDonorchargeorganVo"/>
+ select o.ID,
+ o.donorchargeid,
+ o.paymentid,
+ o.paymentno,
+ o.InfoID,
+ o.donorname,
+ o.HospitalName,
+ o.HospitalNo,
+ o.OrganNo,
+ o.OrganName,
+ o.organcharge,
+ o.organtime,
+ o.chargeoperator,
+ o.amount,
+ o.amounttime,
+ o.amountoperator,
+ o.chargestate,
+ o.organchargedesc,
+ o.del_flag,
+ o.create_by,
+ o.create_time,
+ o.update_by,
+ o.update_time,
+ o.caseno,
+ o.name,
+ o.receive_time,
+ o.annex_files,
+ o.organ_state,
+ o.organ_charge_state,
+ b.donatetime
+ from service_donorchargeorgan o
+ left join service_donatebaseinfo b on b.ID = o.InfoID
<where>
- paymentid IS NULL
- <if test="infoid != null ">and InfoID = #{infoid}</if>
- <if test="receiveTime != null ">and receive_time = #{receiveTime}</if>
- <if test="paymentno != null ">and paymentno = #{paymentno}</if>
- <if test="donorchargeid != null ">and donorchargeID = #{donorchargeid}</if>
- <if test="donorname != null and donorname != ''">and donorname like concat('%', #{donorname}, '%')</if>
- <if test="hospitalname != null and hospitalname != ''">and HospitalName like concat('%', #{hospitalname},
+ <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)
+ </if>
+ <if test="infoid != null ">and o.InfoID = #{infoid}</if>
+ <if test="receiveTime != null ">and o.receive_time = #{receiveTime}</if>
+ <if test="paymentno != null ">and o.paymentno = #{paymentno}</if>
+ <if test="donorchargeid != null ">and o.donorchargeID = #{donorchargeid}</if>
+ <if test="donorname != null and donorname != ''">and o.donorname like concat('%', #{donorname}, '%')</if>
+ <if test="hospitalname != null and hospitalname != ''">and o.HospitalName like concat('%', #{hospitalname},
'%')
</if>
- <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="organcharge != null ">and organcharge = #{organcharge}</if>
- <if test="organtime != null ">and organtime = #{organtime}</if>
- <if test="chargeoperator != null and chargeoperator != ''">and chargeoperator = #{chargeoperator}</if>
- <if test="amount != null ">and amount = #{amount}</if>
- <if test="amounttime != null ">and amounttime = #{amounttime}</if>
- <if test="amountoperator != null and amountoperator != ''">and amountoperator = #{amountoperator}</if>
- <if test="chargestate != null ">and chargestate = #{chargestate}</if>
- <if test="organchargedesc != null and organchargedesc != ''">and organchargedesc = #{organchargedesc}</if>
+ <if test="hospitalno != null and hospitalno != ''">and o.HospitalNo = #{hospitalno}</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="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>
+ <if test="amount != null ">and o.amount = #{amount}</if>
+ <if test="amounttime != null ">and o.amounttime = #{amounttime}</if>
+ <if test="amountoperator != null and amountoperator != ''">and o.amountoperator = #{amountoperator}</if>
+ <if test="chargestate != null ">and o.chargestate = #{chargestate}</if>
+ <if test="organchargedesc != null and organchargedesc != ''">and o.organchargedesc = #{organchargedesc}</if>
+ <if test="starttime != null ">and b.donatetime >= #{starttime}</if>
+ <if test="endtime != null ">and b.donatetime <= #{endtime}</if>
</where>
+ order by b.donatetime
</select>
<update id="updateDonorchargeorgan" parameterType="com.ruoyi.project.domain.ServiceDonorchargeorgan">
@@ -142,6 +185,8 @@
<if test="name != null and name != ''">name = #{name},</if>
<if test="annexFiles != null and annexFiles != ''">annex_files = #{annexFiles},</if>
<if test="receiveTime != null">receive_time = #{receiveTime},</if>
+ <if test="organState != null ">organ_state = #{organState},</if>
+ <if test="organChargeState != null ">organ_charge_state = #{organChargeState},</if>
paymentid = #{paymentid},
update_time = sysdate()
</set>
--
Gitblit v1.9.3