代码提交

liusheng

2024-05-13 39fc3bbaf0c3d4bdfc9183cee6384ae0540711a9

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

@@ -113,6 +113,9 @@
            <if test="residenceprovince != null  and residenceprovince != ''">and ResidenceProvince =
                #{residenceprovince}
            </if>
            <if test="terminationCase != null">and termination_case =
                #{terminationCase}
            </if>
            <if test="residenceprovincename != null  and residenceprovincename != ''">and ResidenceProvinceName like
                concat('%', #{residenceprovincename}, '%')
            </if>
@@ -214,6 +217,7 @@
            <if test="businessarea != null ">and businessarea = #{businessarea}</if>
            <if test="donatetime != null ">and donatetime = #{donatetime}</if>
            <if test="donateno != null ">and donateno = #{donateno}</if>
            <if test="workflow != null ">and workflow = #{workflow}</if>
        </where>

        order by ReportTime desc
@@ -237,8 +241,8 @@
        inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
        <where>
            AND b.del_flag=0
            <if test="starttime != null ">and b.ReportTime >= #{starttime}</if>
            <if test="endtime != null ">and b.ReportTime &lt;= #{endtime}</if>
            <if test="starttime != null ">and b.donatetime >= #{starttime}</if>
            <if test="endtime != null ">and b.donatetime &lt;= #{endtime}</if>
            <if test="city != null and city != ''">and o.City = #{city}</if>
            <if test="reporterno != null and reporterno != ''">and b.ReporterNo = #{reporterno}</if>
        </where>