From c7d99f5e11c4cf0667f67b8170e1c585db2e2016 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期六, 08 二月 2025 15:34:15 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwWorkorderCloudController.java | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwWorkorderCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwWorkorderCloudController.java
index e7c0fb6..2c44494 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwWorkorderCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwWorkorderCloudController.java
@@ -7,7 +7,9 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.dto.YwWorkorderDataDTO;
import com.doumee.dao.business.model.YwWorkorder;
+import com.doumee.dao.business.vo.YwWorkorderDataVO;
import com.doumee.service.business.YwWorkorderService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -36,6 +38,8 @@
@PostMapping("/create")
@CloudRequiredPermission("business:ywworkorder:create")
public ApiResponse create(@RequestBody YwWorkorder ywWorkorder,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ ywWorkorder.setLoginUserInfo(this.getLoginUser(token));
+ ywWorkorder.setOrigin(Constants.ZERO);
return ApiResponse.success(ywWorkorderService.create(ywWorkorder));
}
@@ -43,7 +47,7 @@
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:ywworkorder:delete")
public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
- ywWorkorderService.deleteById(id);
+ ywWorkorderService.deleteById(id,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -56,7 +60,7 @@
for (String id : idArray) {
idList.add(Integer.valueOf(id));
}
- ywWorkorderService.deleteByIdInBatch(idList);
+ ywWorkorderService.deleteByIdInBatch(idList, this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -64,14 +68,45 @@
@PostMapping("/updateById")
@CloudRequiredPermission("business:ywworkorder:update")
public ApiResponse updateById(@RequestBody YwWorkorder ywWorkorder,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ ywWorkorder.setLoginUserInfo(this.getLoginUser(token));
ywWorkorderService.updateById(ywWorkorder);
return ApiResponse.success(null);
}
+ @ApiOperation("鍒嗘淳宸ュ崟")
+ @PostMapping("/dispatchOrder")
+ @CloudRequiredPermission("business:ywworkorder:update")
+ public ApiResponse dispatchOrder(@RequestBody YwWorkorder ywWorkorder,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ ywWorkorder.setLoginUserInfo(this.getLoginUser(token));
+ ywWorkorderService.dispatchOrder(ywWorkorder);
+ return ApiResponse.success(null);
+ }
+ @ApiOperation("澶勭悊宸ュ崟")
+ @PostMapping("/dealOrder")
+ @CloudRequiredPermission("business:ywworkorder:update")
+ public ApiResponse dealOrder(@RequestBody YwWorkorder ywWorkorder,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ ywWorkorder.setLoginUserInfo(this.getLoginUser(token));
+ ywWorkorderService.dealOrder(ywWorkorder);
+ return ApiResponse.success(null);
+ }
+
+
+ @ApiOperation("鑾峰彇宸ュ崟鏁伴噺淇℃伅")
+ @PostMapping("/getDataVO")
+ @CloudRequiredPermission("business:ywworkorder:update")
+ public ApiResponse<YwWorkorderDataVO> getDataVO(@RequestBody YwWorkorderDataDTO dto,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ YwWorkorderDataVO ywWorkorderDataVO = ywWorkorderService.getDataVO(dto);
+ return ApiResponse.success(ywWorkorderDataVO);
+ }
+
+
+
+
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@CloudRequiredPermission("business:ywworkorder:query")
public ApiResponse<PageData<YwWorkorder>> findPage (@RequestBody PageWrap<YwWorkorder> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(ywWorkorderService.findPage(pageWrap));
}
@@ -79,6 +114,7 @@
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:ywworkorder:exportExcel")
public void exportExcel (@RequestBody PageWrap<YwWorkorder> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
ExcelExporter.build(YwWorkorder.class).export(ywWorkorderService.findPage(pageWrap).getRecords(), "杩愮淮宸ュ崟淇℃伅琛�", response);
}
--
Gitblit v1.9.3