From 7b51c9e1abc198a501f7858599da9c116130fd6f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 27 三月 2025 16:47:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitsService.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitsService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitsService.java
index b89edf1..945014b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitsService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitsService.java
@@ -1,7 +1,9 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.dao.admin.response.PCWorkPlatformDataVO;
import com.doumee.dao.business.dto.ResetPasswordDTO;
import com.doumee.dao.business.model.Visits;
import com.doumee.dao.web.reqeust.AuditApproveDTO;
@@ -27,7 +29,7 @@
*/
Integer create(Visits visits);
- Integer createFk(Visits visits,Boolean isERP);
+ Integer createFk(Visits visits, Boolean isERP, Integer source);
/**
* 璁垮鎶ュ
@@ -44,6 +46,7 @@
* @param id 涓婚敭
*/
void deleteById(Integer id);
+ void deleteById(Integer id,LoginUserInfo user);
/**
* 鍒犻櫎
@@ -79,7 +82,7 @@
* @param id 涓婚敭
* @return Visits
*/
- Visits findById(Integer id);
+ Visits findById(Integer id,Integer memberId);
/**
* 鏉′欢鏌ヨ鍗曟潯璁板綍
@@ -138,6 +141,21 @@
void visitLevel(Integer visitId);
void visitCancel(Integer visitId);
-
+ /**
+ * 澶勭悊寰呭鏍搞�佸鏍镐腑銆佸凡瀹℃牳鐨勬暟鎹彇娑堜笟鍔�
+ * 2025骞�3鏈�25鏃�14:10:10
+ */
+ void visitsSelfCancel(Integer visitId,Integer memberId);
+ void visitsCancel(Integer visitId,LoginUserInfo loginUserInfo);
void resetPassword(ResetPasswordDTO resetPasswordDTO);
+
+ void visitResend(Integer visitId);
+
+ PCWorkPlatformDataVO getPcWorkPlatformData(Integer queryType ,LoginUserInfo loginUserInfo);
+
+ /**
+ * 鍗冲皢瓒呮椂閫氱煡
+ */
+ void syncTimeOutData();
+ void visitNoCheckCancel();
}
--
Gitblit v1.9.3