From 9398b7743fa976b016dfbb2b9cf4a04db340508e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 09 十月 2025 11:56:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetRepairRequestController.java | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetRepairRequestController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetRepairRequestController.java
index 0a44643..38d3d8b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetRepairRequestController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetRepairRequestController.java
@@ -1,28 +1,32 @@
package com.ruoyi.web.controller.api;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.TDept;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.dto.AddAssetRepairRequestDTO;
+import com.ruoyi.system.dto.AddContractDTO;
import com.ruoyi.system.model.AssetMain;
+import com.ruoyi.system.model.AssetRepairRequestItem;
import com.ruoyi.system.query.AssetRepairRequestListQuery;
import com.ruoyi.system.query.AssetStatisticsListQuery;
-import com.ruoyi.system.service.AssetMainService;
-import com.ruoyi.system.service.AssetRepairRecordService;
-import com.ruoyi.system.service.TDeptService;
+import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.AssetRepairRequestVO;
import com.ruoyi.system.vo.AssetStatisticsVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -41,6 +45,10 @@
public class AssetRepairRequestController {
@Resource
private AssetRepairRecordService assetRepairRecordService;
+ @Resource
+ private AssetRepairRequestService assetRepairRequestService;
+ @Resource
+ private AssetRepairRequestItemService assetRepairRequestItemService;
@Autowired
private TokenService tokenService;
@Autowired
@@ -66,5 +74,33 @@
query.setAssetMainIds(assetMainIds);
return R.ok(assetRepairRecordService.pageList(query));
}
+ @Log(title = "资产报修-新增", businessType = BusinessType.INSERT)
+ @ApiOperation(value = "资产报修新增")
+ @PostMapping(value = "/add")
+ public R add(@RequestBody AddAssetRepairRequestDTO dto) {
+ assetRepairRequestService.save(dto);
+ assetRepairRequestItemService.saveBatch(dto.getList());
+ return R.ok();
+
+ }
+ @Log(title = "资产报修-编辑", businessType = BusinessType.INSERT)
+ @ApiOperation(value = "资产报修编辑")
+ @PostMapping(value = "/update")
+ public R update(@RequestBody AddAssetRepairRequestDTO dto) {
+ assetRepairRequestService.updateById(dto);
+ assetRepairRequestItemService.remove(new LambdaQueryWrapper<AssetRepairRequestItem>()
+ .eq(AssetRepairRequestItem::getRepairRequestId, dto.getId()));
+ assetRepairRequestItemService.saveBatch(dto.getList());
+ return R.ok();
+ }
+ @Log(title = "资产报修-删除", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "资产报修-删除")
+ @DeleteMapping(value = "/delete")
+ public R delete(@RequestParam String ids) {
+ assetRepairRequestItemService.remove(new LambdaQueryWrapper<AssetRepairRequestItem>()
+ .in(AssetRepairRequestItem::getRepairRequestId, Arrays.asList(ids.split(","))));
+ assetRepairRequestService.removeBatchByIds(Arrays.asList(ids.split(",")));
+ return R.ok();
+ }
}
--
Gitblit v1.7.1