From bbe0a2fd03063316e50cf141986bda984599bbda Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:41:42 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/java/com/matrix/system/hive/dao/SysProjServicesDao.java | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/dao/SysProjServicesDao.java b/zq-erp/src/main/java/com/matrix/system/hive/dao/SysProjServicesDao.java
index 8614295..588612c 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/dao/SysProjServicesDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/dao/SysProjServicesDao.java
@@ -1,10 +1,13 @@
package com.matrix.system.hive.dao;
-import com.matrix.system.hive.bean.SysProjServices;
-import org.apache.ibatis.annotations.Param;
-
import com.matrix.core.pojo.PaginationVO;
-
+import com.matrix.system.app.dto.ServiceOrderListDto;
+import com.matrix.system.app.vo.ServiceOrderListVo;
+import com.matrix.system.hive.bean.SysProjServices;
+import com.matrix.system.hive.dto.ServiceOrderTimeDto;
+import com.matrix.system.shopXcx.api.dto.ErpServiceOrderListDto;
+import com.matrix.system.shopXcx.api.vo.ErpServiceOrderListVo;
+import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
@@ -34,7 +37,38 @@
public SysProjServices selectById(Long id);
- public void updateOrderTime(@Param("createTime") Date createTime, @Param("id") Long id);
-
+ public void updateOrderTime(@Param("serviceOrderTimeDto") ServiceOrderTimeDto serviceOrderTimeDto);
+ List<ServiceOrderListVo> selectApiServiceOrderListInPage(@Param("record") ServiceOrderListDto serviceOrderListDto, @Param("pageVo") PaginationVO pageVo);
+
+ int selectApiServiceOrderListTotal(@Param("record") ServiceOrderListDto serviceOrderListDto);
+
+ /**
+ * 小程序端查询客户预约单
+ * @param orderListDto
+ * @return
+ */
+ List<ErpServiceOrderListVo> findWxServiceOrderList(ErpServiceOrderListDto orderListDto);
+
+ /**
+ * 小程序端查询客户预约单详情
+ * @param id
+ * @return
+ */
+ ErpServiceOrderListVo findWxServiceOrderById(Long id);
+
+ /**
+ * 查询预约时间在1小时之内且没有通知过的服务单
+ * @return
+ */
+ List<SysProjServices> selectNeedNoticeService();
+
+ /**
+ * 设置服务单为已通知
+ * @param noticedIds
+ * @return
+ */
+ int updateNoticeTimes(@Param("list")List<Long> noticedIds);
+
+ List<SysProjServices> selectProjServicesByOrderItemId(@Param("itemId") Long itemId);
}
\ No newline at end of file
--
Gitblit v1.9.1