修改

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -349,6 +349,7 @@ public class WorkOrderManageController {
             workOrderManageDto.setEndDate(endDate);
         }
         workOrderManageDto.setOrderStatus(orderStatus);
+        workOrderManageDto.setOrderStatus(orderStatus);
         workOrderManageDto.setEventType(eventType);
         workOrderManageDto.setTenantId(loginUser.getTenantId());
         workOrderManageDto.setOrderTypeId(orderTypeId);

operation_manager/src/main/resources/mapper/order/WorkOrderManageMapper.xml

@@ -604,12 +604,20 @@
       <if test="order.currentUsers != null">
         and FIND_IN_SET(#{order.currentUsers,jdbcType=VARCHAR},t1.current_users)
       </if>
+
       <if test="order.startDate != null and order.endDate != null">
-        and t1.date_create &gt;= date_format(#{order.startDate,jdbcType=VARCHAR},'%Y-%c-%d')
-        and t1.date_create &lt;= DATE_ADD(date_format(#{order.endDate,jdbcType=VARCHAR},'%Y-%c-%d'),INTERVAL 1 DAY)
+        <if test="order.orderStatus == 0">
+          and t1.date_create &gt;= date_format(#{order.startDate,jdbcType=VARCHAR},'%Y-%c-%d')
+          and t1.date_create &lt;= DATE_ADD(date_format(#{order.endDate,jdbcType=VARCHAR},'%Y-%c-%d'),INTERVAL 1 DAY)
+          order by t1.date_create desc
+        </if>
+        <if test="order.orderStatus != 0">
+          and t1.send_time &gt;= date_format(#{order.startDate,jdbcType=VARCHAR},'%Y-%c-%d')
+          and t1.send_time &lt;= DATE_ADD(date_format(#{order.endDate,jdbcType=VARCHAR},'%Y-%c-%d'),INTERVAL 1 DAY)
+          order by t1.send_time desc
+        </if>
       </if>
     </where>
-    order by t1.date_create desc
   </select>
   <!--删除-->
   <delete id="batchDelete">