From 3201bba04baf50d368fbc4ac11658701e97a0a97 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期三, 05 三月 2025 09:59:05 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitsController.java | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitsController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitsController.java index cd86296..58c48a3 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitsController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitsController.java @@ -2,9 +2,9 @@ import com.doumee.core.annotation.excel.ExcelExporter; import com.doumee.core.annotation.pr.PreventRepeat; -import com.doumee.core.model.ApiResponse; -import com.doumee.core.model.PageWrap; -import com.doumee.core.model.PageData; +import com.doumee.service.business.third.model.ApiResponse; +import com.doumee.service.business.third.model.PageWrap; +import com.doumee.service.business.third.model.PageData; import com.doumee.core.utils.Constants; import com.doumee.dao.business.model.Visits; import com.doumee.service.business.VisitsService; @@ -77,6 +77,13 @@ visitsService.visitCancel(visitId); return ApiResponse.success(null); } + @ApiOperation("閲嶆柊涓嬪彂澶辫触鐨勯绾�") + @GetMapping("/visitResend") + @RequiresPermissions("business:visits:update") + public ApiResponse visitResend(@RequestParam Integer visitId) { + visitsService.visitResend(visitId); + return ApiResponse.success(null); + } @ApiOperation("鏍规嵁鏃ユ湡(starttime)鍚屾璁垮鏁版嵁") @PostMapping("/syncByDate") @@ -104,7 +111,7 @@ @GetMapping("/{id}") @RequiresPermissions("business:visits:query") public ApiResponse<Visits> findById(@PathVariable Integer id) { - return ApiResponse.success(visitsService.findById(id)); + return ApiResponse.success(visitsService.findById(id,null)); } @ApiOperation("婊炵暀浜哄憳") -- Gitblit v1.9.3