下钻接口修改时间筛选

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml

@@ -345,8 +345,12 @@
             a.inspection_unit_code= b.use_unit_code
           and ((b.supervise_org_code != '50' and b.supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (b.supervise_org_code = '50' and b.office_region LIKE CONCAT ('%', #{dto.cityCode}, '%')))
           and a.status = '6616'
+          <if test="dto.beginDate != null and dto.beginDate != ''">
           and date_ge(CAST(a.accept_date as date),#{dto.beginDate})
+          </if>
+          <if test="dto.endDate != null and dto.endDate != ''">
           and date_le(CAST(a.accept_date as date),#{dto.endDate})
+          </if>
         <if test="businessType !=null and businessType !=''">
             and a.inspection_type = #{businessType}
         </if>
@@ -361,8 +365,12 @@
             a.inspection_unit_code= b.use_unit_code
           and ((b.supervise_org_code != '50' and b.supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (b.supervise_org_code = '50' and b.office_region LIKE CONCAT ('%', #{dto.cityCode}, '%')))
           and a.status != '6610'  and a.status != '6615'  and a.status != '6617' and a.status != '6616'
+          <if test="dto.beginDate != null and dto.beginDate != ''">
                  and date_ge(CAST(a.application_date as date),#{dto.beginDate})
+          </if>
+        <if test="dto.endDate != null and dto.endDate != ''">
           and date_le(CAST(a.application_date as date),#{dto.endDate})
+        </if>
         <if test="businessType !=null and businessType !=''">
             and a.inspection_type = #{businessType}
         </if>
@@ -377,8 +385,12 @@
         a.inspection_unit_code= b.use_unit_code
         and ((b.supervise_org_code != '50' and b.supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (b.supervise_org_code = '50' and b.office_region LIKE CONCAT ('%', #{dto.cityCode}, '%')))
         and a.status = '6616'
-        and date_ge(CAST(a.accept_date as date),#{dto.beginDate})
-        and date_le(CAST(a.accept_date as date),#{dto.endDate})
+          <if test="dto.beginDate != null and dto.beginDate != ''">
+          and date_ge(CAST(a.accept_date as date),#{dto.beginDate})
+          </if>
+          <if test="dto.endDate != null and dto.endDate != ''">
+          and date_le(CAST(a.accept_date as date),#{dto.endDate})
+          </if>
         <if test="dto.companyName != null and dto.companyName != ''">
             and application_unit_name like CONCAT('%', #{dto.companyName}, '%')
         </if>