From 52df965c9cbaa015520b4379393a0041eb9ae8da Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 23 二月 2024 18:46:36 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml | 115 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 73 insertions(+), 42 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml
index 3b4070d..c13d8e5 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml
@@ -1,41 +1,57 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceEthicalreviewopinionsMapper">
-
+
<resultMap type="com.ruoyi.project.domain.ServiceEthicalreviewopinions" id="ServiceEthicalreviewopinionsResult">
- <result property="id" column="ID" />
- <result property="del_flag" column="del_flag" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="infoid" column="InfoID" />
- <result property="donorno" column="DonorNo" />
- <result property="expertopinion" column="ExpertOpinion" />
- <result property="expertconclusion" column="ExpertConclusion" />
- <result property="expertname" column="ExpertName" />
- <result property="conclusiontime" column="ConclusionTime" />
- <result property="conclusionannex" column="ConclusionAnnex" />
- <result property="conclusionorder" column="ConclusionOrder" />
+ <result property="id" column="ID"/>
+ <result property="del_flag" column="del_flag"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="infoid" column="InfoID"/>
+ <result property="donorno" column="DonorNo"/>
+ <result property="expertopinion" column="ExpertOpinion"/>
+ <result property="expertconclusion" column="ExpertConclusion"/>
+ <result property="expertname" column="ExpertName"/>
+ <result property="conclusiontime" column="ConclusionTime"/>
+ <result property="conclusionannex" column="ConclusionAnnex"/>
+ <result property="conclusionorder" column="ConclusionOrder"/>
</resultMap>
<sql id="selectServiceEthicalreviewopinionsVo">
- select ID, del_flag, create_by, create_time, update_by, update_time, InfoID, DonorNo, ExpertOpinion, ExpertConclusion, ExpertName, ConclusionTime, ConclusionAnnex, ConclusionOrder from service_ethicalreviewopinions
+ select ID,
+ del_flag,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ InfoID,
+ DonorNo,
+ ExpertOpinion,
+ ExpertConclusion,
+ ExpertName,
+ ConclusionTime,
+ ConclusionAnnex,
+ ConclusionOrder
+ from service_ethicalreviewopinions
</sql>
- <select id="selectServiceEthicalreviewopinionsList" parameterType="com.ruoyi.project.domain.ServiceEthicalreviewopinions" resultMap="ServiceEthicalreviewopinionsResult">
+ <select id="selectServiceEthicalreviewopinionsList"
+ parameterType="com.ruoyi.project.domain.ServiceEthicalreviewopinions"
+ resultMap="ServiceEthicalreviewopinionsResult">
<include refid="selectServiceEthicalreviewopinionsVo"/>
<where>
- <if test="infoid != null "> and InfoID = #{infoid}</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>
- <if test="expertname != null and expertname != ''"> and ExpertName like concat('%', #{expertname}, '%')</if>
- <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="infoid != null ">and InfoID = #{infoid}</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>
+ <if test="expertname != null and expertname != ''">and ExpertName like concat('%', #{expertname}, '%')</if>
+ <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>
</where>
</select>
<select id="selectVOList" resultType="com.ruoyi.project.domain.vo.EthicalReviewVO">
@@ -77,6 +93,8 @@
`service_donatebaseinfo`.`DiseaseType` AS `DiseaseType`,
`service_donatebaseinfo`.`PatientState` AS `PatientState`,
`service_donatebaseinfo`.`create_by` AS `basecreateby`,
+ `service_donatebaseinfo`.`workflow` AS `workflow;`,
+ `service_donatebaseinfo`.`termination_case` AS `terminationCase;`,
`service_donateflowchart`.`ID` AS `fcID`,
`service_donateflowchart`.`InfoID` AS `InfoID`,
`service_donateflowchart`.`DonorNo` AS `fcDonorNo`,
@@ -94,29 +112,42 @@
`service_donatebaseinfo`
LEFT JOIN `service_donateflowchart` ON
`service_donatebaseinfo`.`ID` = `service_donateflowchart`.`InfoID`
- AND `service_donateflowchart`.`FlowName` = '浼︾悊瀹℃煡'
+ AND `service_donateflowchart`.`FlowName` = '浼︾悊瀹℃煡'
LEFT JOIN `base_organization` ON
`base_organization`.`OrganizationID` = `service_donatebaseinfo`.`TreatmentHospitalNo`
<where>
- <if test="donorno != null and donorno != ''"> and `service_donatebaseinfo`.`DonorNo` = #{donorno}</if>
- <if test="name != null and name != ''"> and `service_donatebaseinfo`.`Name` like concat('%', #{name}, '%')</if>
- <if test="idcardno != null and idcardno != ''"> and `service_donatebaseinfo`.`IDCardNo` = #{idcardno}</if>
- <if test="treatmenthospitalno != null and treatmenthospitalno != ''"> and `service_donatebaseinfo`.`TreatmentHospitalNo` = #{treatmenthospitalno}</if>
- <if test="recordstate != null and recordstate != ''"> and `service_donatebaseinfo`.`RecordState` = #{recordstate}</if>
- <if test="basecreateby != null and basecreateby != ''"> and `service_donatebaseinfo`.`create_by` = #{basecreateby}</if>
- <if test="starttime != null "> and `service_donateflowchart`.create_time >= #{starttime} </if>
- <if test="endtime != null "> and `service_donateflowchart`.create_time <= #{endtime}</if>
- <if test="reporterno != null and reporterno != ''"> and `service_donatebaseinfo`.ReporterNo = #{reporterno}</if>
- <if test="city != null and city != ''"> and `base_organization`.`City` = #{city}</if>
- <if test="fcid != null "> and `service_donateflowchart`.`ID` = #{fcid}</if>
+ <if test="donorno != null and donorno != ''">and `service_donatebaseinfo`.`DonorNo` = #{donorno}</if>
+ <if test="name != null and name != ''">and `service_donatebaseinfo`.`Name` like concat('%', #{name}, '%')
+ </if>
+ <if test="idcardno != null and idcardno != ''">and `service_donatebaseinfo`.`IDCardNo` = #{idcardno}</if>
+ <if test="treatmenthospitalno != null and treatmenthospitalno != ''">and
+ `service_donatebaseinfo`.`TreatmentHospitalNo` = #{treatmenthospitalno}
+ </if>
+ <if test="recordstate != null and recordstate != ''">and `service_donatebaseinfo`.`RecordState` =
+ #{recordstate}
+ </if>
+ <if test="basecreateby != null and basecreateby != ''">and `service_donatebaseinfo`.`create_by` =
+ #{basecreateby}
+ </if>
+ <if test="starttime != null ">and `service_donateflowchart`.create_time >= #{starttime}</if>
+ <if test="endtime != null ">and `service_donateflowchart`.create_time <= #{endtime}</if>
+ <if test="reporterno != null and reporterno != ''">and `service_donatebaseinfo`.ReporterNo =
+ #{reporterno}
+ </if>
+ <if test="city != null and city != ''">and `base_organization`.`City` = #{city}</if>
+ <if test="fcid != null ">and `service_donateflowchart`.`ID` = #{fcid}</if>
+ <if test="workflow != null "> and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
</where>
- order by `service_donateflowchart`.`create_time` desc
+ order by `service_donateflowchart`.`create_time` desc
</select>
<select id="countNumber" resultType="java.lang.Integer">
- select count(*) from service_donateflowchart where `service_donateflowchart`.`FlowName` = '浼︾悊瀹℃煡'
- and create_time >= #{starttime} and create_time <= #{endtime}
+ select count(*)
+ from service_donateflowchart
+ where `service_donateflowchart`.`FlowName` = '浼︾悊瀹℃煡'
+ and create_time >= #{starttime}
+ and create_time <= #{endtime}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3