From 0f2fe7499e107ffd98bf41800045f16bb2f246d3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 17 十月 2024 16:47:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitsService.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 ed0a5fc..fd4e843 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.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.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;
@@ -9,6 +11,7 @@
import com.doumee.dao.web.reqeust.VisitRecordDTO;
import com.doumee.dao.web.response.VisitDetailVO;
import com.doumee.dao.web.response.VisitRecordVO;
+import io.swagger.models.auth.In;
import java.util.List;
@@ -27,7 +30,7 @@
*/
Integer create(Visits visits);
- Integer createFk(Visits visits,Boolean isERP);
+ Integer createFk(Visits visits, Boolean isERP, Integer source);
/**
* 璁垮鎶ュ
@@ -79,7 +82,7 @@
* @param id 涓婚敭
* @return Visits
*/
- Visits findById(Integer id);
+ Visits findById(Integer id,Integer memberId);
/**
* 鏉′欢鏌ヨ鍗曟潯璁板綍
@@ -120,7 +123,7 @@
* @param id
* @return
*/
- VisitDetailVO getVisitDetail(Integer id);
+ VisitDetailVO getVisitDetail(Integer id,Integer memberId);
/**
* 鍐呴儴浜哄憳 浠诲姟涓績
@@ -140,4 +143,8 @@
void visitCancel(Integer visitId);
void resetPassword(ResetPasswordDTO resetPasswordDTO);
+
+ void visitResend(Integer visitId);
+
+ PCWorkPlatformDataVO getPcWorkPlatformData(Integer queryType ,LoginUserInfo loginUserInfo);
}
--
Gitblit v1.9.3