From 8ab31157536e116dba27e942a05a20e3caaa4812 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期三, 28 八月 2024 09:22:52 +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 | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 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 62e35ec..532e499 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 @@ -1,6 +1,5 @@ package com.doumee.api.business; -import com.doumee.api.BaseController; import com.doumee.core.annotation.excel.ExcelExporter; import com.doumee.core.annotation.pr.PreventRepeat; import com.doumee.core.model.ApiResponse; @@ -18,9 +17,9 @@ import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; -import java.util.Date; import java.util.List; +import com.doumee.api.BaseController; /** * @author 姹熻箘韫� * @date 2023/11/30 15:33 @@ -78,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") @@ -105,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