fix：工单筛选添加服务状态和订单状态

project-order/src/main/java/com/dituhui/pea/order/dao/EngineerInfoDao.java

@@ -20,6 +20,8 @@ public interface EngineerInfoDao extends JpaRepository<EngineerInfoEntity, Integ
 
 
     List<EngineerInfoEntity> findByGroupId(String groupId);
     List<EngineerInfoEntity> findByGroupId(String groupId);
 
 
+    List<EngineerInfoEntity> findByPhone(String phone);
+
     List<EngineerInfoEntity> findByGroupIdIn(List<String> groupIds);
     List<EngineerInfoEntity> findByGroupIdIn(List<String> groupIds);
 
 
     List<EngineerInfoEntity> findByEngineerCodeIn(List<String> engineerCodes);
     List<EngineerInfoEntity> findByEngineerCodeIn(List<String> engineerCodes);

project-order/src/main/java/com/dituhui/pea/order/dto/OrderServiceListReq.java

@@ -33,4 +33,12 @@ public class OrderServiceListReq {
     private String orderId;
     private String orderId;
     private List<String> appointmentStatus;
     private List<String> appointmentStatus;
     private List<String> appointmentType;
     private List<String> appointmentType;
+    /**
+     * 工单状态
+     */
+    private List<String> orderStatus;
+    /**
+     * 服务状态
+     */
+    private List<String> serviceStatus;
 }
 }
\ No newline at end of file

project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderServiceListServiceImpl.java

@@ -53,10 +53,12 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
         lqw.ge(OrderInfo::getDt, startDate);  //预约开始日期
         lqw.ge(OrderInfo::getDt, startDate);  //预约开始日期
         lqw.le(OrderInfo::getDt, endDate);  //预约开始日期
         lqw.le(OrderInfo::getDt, endDate);  //预约开始日期
         //筛选项
         //筛选项
-        lqw.eq(StringUtils.isNotEmpty(reqDTO.getPhone()), OrderInfo::getPhone, reqDTO.getPhone());
         if (StringUtils.isNotBlank(reqDTO.getOrderId())) {
         if (StringUtils.isNotBlank(reqDTO.getOrderId())) {
             lqw.in(StringUtils.isNotEmpty(reqDTO.getOrderId()), OrderInfo::getOrderId, reqDTO.getOrderId().split(","));
             lqw.in(StringUtils.isNotEmpty(reqDTO.getOrderId()), OrderInfo::getOrderId, reqDTO.getOrderId().split(","));
         }
         }
+        lqw.eq(StringUtils.isNotEmpty(reqDTO.getPhone()), OrderInfo::getPhone, reqDTO.getPhone());
+        lqw.in(ListUtils.isNotEmpty(reqDTO.getServiceStatus()), OrderInfo::getServiceStatus, reqDTO.getServiceStatus());
+        lqw.in(ListUtils.isNotEmpty(reqDTO.getOrderStatus()), OrderInfo::getOrderStatus, reqDTO.getOrderStatus());
         lqw.in(ListUtils.isNotEmpty(reqDTO.getBranchIds()), OrderInfo::getOrgBranchId, reqDTO.getBranchIds());
         lqw.in(ListUtils.isNotEmpty(reqDTO.getBranchIds()), OrderInfo::getOrgBranchId, reqDTO.getBranchIds());
         lqw.in(ListUtils.isNotEmpty(reqDTO.getGroupIds()), OrderInfo::getOrgGroupId, reqDTO.getGroupIds());
         lqw.in(ListUtils.isNotEmpty(reqDTO.getGroupIds()), OrderInfo::getOrgGroupId, reqDTO.getGroupIds());
         lqw.in(ListUtils.isNotEmpty(reqDTO.getTeamIds()), OrderInfo::getOrgTeamId, reqDTO.getTeamIds());
         lqw.in(ListUtils.isNotEmpty(reqDTO.getTeamIds()), OrderInfo::getOrgTeamId, reqDTO.getTeamIds());