代码提交

liusheng

3 天以前 c78537d72205faa764fa4ea0858b7c484728a949

 ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml

@@ -43,11 +43,19 @@
        <result property="organdonation" column="OrganDonation"/>
        <result property="organdonationOther" column="OrganDonation_Other"/>
        <result property="donationcategory" column="DonationCategory"/>
        <result property="coordinatorInOperating" column="coordinator_in_operating"/>
        <result property="coordinatorOutOperating" column="coordinator_out_operating"/>
        <result property="coordinatorSign" column="coordinator_sign"/>
        <result property="coordinatorSignTime" column="coordinator_sign_time"/>
    </resultMap>

    <sql id="selectServiceDonationwitnessVo">
        select ID,
               InfoID,
               coordinator_in_operating,
               coordinator_out_operating,
               coordinator_sign,
               coordinator_sign_time,
               DonorNo,
               GainHospitalNo,
               GainHospitalName,
@@ -121,6 +129,7 @@
        `service_donatebaseinfo`.`create_by` AS `basecreateby`,
        `service_donatebaseinfo`.`workflow` AS `workflow`,
        `service_donatebaseinfo`.`termination_case` AS `terminationCase`,
        `service_donatebaseinfo`.`donatetime` AS `donatetime`,
        `service_donationwitness`.`ID` AS `dwID`,
        `service_donationwitness`.`InfoID` AS `InfoID`,
        `service_donationwitness`.`DonorNo` AS `dwDonorNo`,
@@ -159,15 +168,19 @@
        `service_donationwitness`.`create_time` AS `createtime`,
        `service_donationwitness`.`update_by` AS `updateby`,
        `service_donationwitness`.`update_time` AS `updatetime`
        `service_donationwitness`.`coordinator_in_operating` AS `coordinatorInOperating`
        `service_donationwitness`.`coordinator_out_operating` AS `coordinatorOutOperating`
        `service_donationwitness`.`coordinator_sign` AS `coordinatorSign`
        `service_donationwitness`.`coordinator_sign_time` AS `coordinatorSignTime`
        FROM

        `service_donatebaseinfo`
        LEFT JOIN `service_donationwitness` ON
        `service_donatebaseinfo`.`ID` = `service_donationwitness`.`InfoID`
        LEFT JOIN `base_organization` ON
        `base_organization`.`OrganizationID` = `service_donatebaseinfo`.`TreatmentHospitalNo`

        <where>
            service_donationwitness.del_flag=0
            and service_donatebaseinfo.del_flag=0
            <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>
@@ -187,7 +200,7 @@
                #{reporterno}
            </if>
            <if test="city != null and city != ''">and `base_organization`.`City` = #{city}</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_donationwitness`.`create_time` desc
@@ -248,6 +261,8 @@
        inner join service_donatebaseinfo b on w.InfoID = b.id
        inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
        <where>
            w.del_flag=0
            and b.del_flag=0
            <if test="starttime != null ">and w.OperationBegTime >= #{starttime}</if>
            <if test="endtime != null ">and w.OperationBegTime &lt;= #{endtime}</if>
            <if test="city != null and city != ''">and o.City = #{city}</if>
@@ -267,4 +282,4 @@
    </select>


</mapper>
</mapper>