From 2944ea778f0fc87c8e09ae47200d9de8069049e3 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 26 十二月 2025 10:46:37 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml
index 5e4eb10..e021b56 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml
@@ -6,7 +6,8 @@
<resultMap type="com.ruoyi.project.domain.ServiceEthicalreviewopinions" id="ServiceEthicalreviewopinionsResult">
<result property="id" column="ID"/>
- <result property="del_flag" column="del_flag"/>
+ <result property="delFlag" column="del_flag"/>
+ <result property="caseNo" column="case_no"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
@@ -19,10 +20,21 @@
<result property="conclusiontime" column="ConclusionTime"/>
<result property="conclusionannex" column="ConclusionAnnex"/>
<result property="conclusionorder" column="ConclusionOrder"/>
+ <result property="sendType" column="send_type"/>
+ <result property="receiveStatus" column="receive_status"/>
+ <result property="deptCode" column="dept_code"/>
+ <result property="deptName" column="dept_name"/>
+ <result property="organType" column="organ_type"/>
</resultMap>
<sql id="selectServiceEthicalreviewopinionsVo">
select ID,
+ case_no,
+ dept_code,
+ dept_name,
+ organ_type,
+ send_type,
+ receive_status,
del_flag,
create_by,
create_time,
@@ -45,6 +57,10 @@
<include refid="selectServiceEthicalreviewopinionsVo"/>
<where>
<if test="infoid != null ">and InfoID = #{infoid}</if>
+ <if test="deptCode != null ">and dept_code = #{deptCode}</if>
+ <if test="deptName != null ">and dept_name = #{deptName}</if>
+ <if test="organType != null ">and organ_type = #{organType}</if>
+ <if test="caseNo != null ">and case_no = #{caseNo}</if>
<if test="donorno != null and donorno != ''">and DonorNo = #{donorno}</if>
<if test="expertopinion != null and expertopinion != ''">and ExpertOpinion = #{expertopinion}</if>
<if test="expertconclusion != null ">and ExpertConclusion = #{expertconclusion}</if>
@@ -52,8 +68,13 @@
<if test="conclusiontime != null ">and ConclusionTime = #{conclusiontime}</if>
<if test="conclusionannex != null and conclusionannex != ''">and ConclusionAnnex = #{conclusionannex}</if>
<if test="conclusionorder != null ">and ConclusionOrder = #{conclusionorder}</if>
+ <if test="sendType != null ">and send_type = #{sendType}</if>
+ <if test="receiveStatus != null ">and receive_status = #{receiveStatus}</if>
+ send_type,
+ receive_status,
</where>
</select>
+
<select id="selectVOList" resultType="com.ruoyi.project.domain.vo.EthicalReviewVO">
SELECT
service_donatebaseinfo.ID as id,
@@ -104,10 +125,16 @@
service_donatebaseinfo.deptname,
service_ethicalreviewopinions.ID as fcid,
service_ethicalreviewopinions.ExpertOpinion as expertopinion,
+ service_ethicalreviewopinions.send_type as sendType,
+ service_ethicalreviewopinions.receive_status as receiveStatus,
service_ethicalreviewopinions.ExpertConclusion as expertconclusion,
service_ethicalreviewopinions.ExpertName as expertname,
service_ethicalreviewopinions.ConclusionTime as conclusiontime,
service_ethicalreviewopinions.ConclusionAnnex as conclusionannex,
+ service_ethicalreviewopinions.case_no as case_no,
+ service_ethicalreviewopinions.dept_name as dept_name,
+ service_ethicalreviewopinions.dept_code as dept_code,
+ service_ethicalreviewopinions.organ_type as organ_type,
service_ethicalreviewopinions.ConclusionOrder as conclusionorder
FROM
service_donatebaseinfo
@@ -131,6 +158,9 @@
<if test="recordstate != null and recordstate != ''">and `service_donatebaseinfo`.`RecordState` =
#{recordstate}
</if>
+ <if test="caseNo != null and caseNo != ''">and `service_donatebaseinfo`.`case_no` =
+ #{caseNo}
+ </if>
<if test="basecreateby != null and basecreateby != ''">and `service_donatebaseinfo`.`create_by` =
#{basecreateby}
</if>
@@ -141,12 +171,13 @@
</if>
<if test="city != null and city != ''">and `base_organization`.`City` = #{city}</if>
<if test="fcid != null ">and `service_ethicalreviewopinions`.`ID` = #{fcid}</if>
- <if test="workflow != null "> and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
+ <if test="workflow != null ">and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
</where>
order by `service_ethicalreviewopinions`.`ConclusionTime` desc
</select>
+
<select id="countNumber" resultType="java.lang.Integer">
select count(*)
from service_donateflowchart
--
Gitblit v1.9.3