From 88f2a615a6c547adfd992334f42d7cd4aea8d55b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 11 十月 2025 11:28:12 +0800
Subject: [PATCH] 资产报修
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetRepairRequestController.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 3 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 38d3d8b..4f34495 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
@@ -5,6 +5,7 @@
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.SysUser;
import com.ruoyi.common.core.domain.entity.TDept;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.BusinessType;
@@ -12,14 +13,19 @@
import com.ruoyi.system.dto.AddAssetRepairRequestDTO;
import com.ruoyi.system.dto.AddContractDTO;
import com.ruoyi.system.model.AssetMain;
+import com.ruoyi.system.model.AssetRepairRequest;
import com.ruoyi.system.model.AssetRepairRequestItem;
import com.ruoyi.system.query.AssetRepairRequestListQuery;
import com.ruoyi.system.query.AssetStatisticsListQuery;
import com.ruoyi.system.service.*;
+import com.ruoyi.system.vo.AssetRepairListVO;
import com.ruoyi.system.vo.AssetRepairRequestVO;
import com.ruoyi.system.vo.AssetStatisticsVO;
+import com.ruoyi.system.vo.GrabListVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -48,11 +54,15 @@
@Resource
private AssetRepairRequestService assetRepairRequestService;
@Resource
+ private OaApprovalApplicationAssetItemService approvalApplicationAssetItemService;
+ @Resource
private AssetRepairRequestItemService assetRepairRequestItemService;
@Autowired
private TokenService tokenService;
@Autowired
private TDeptService deptService;
+ @Autowired
+ private ISysUserService sysUserService;
@Resource
private AssetMainService assetMainService;
@@ -65,25 +75,54 @@
return R.ok(new PageInfo<>());
} else {
query.setDeptIds(deptIds);
+ List<Long> userIds = sysUserService.selectAllList().stream().filter(e -> deptIds.contains(Integer.valueOf(e.getDeptId())))
+ .map(SysUser::getUserId).collect(Collectors.toList());
+ if (userIds.isEmpty()){
+ return R.ok(new PageInfo<>());
+ }
+ }
+
+ return R.ok(assetRepairRecordService.pageList(query));
+ }
+ @ApiOperation("资产报修不分页列表")
+ @PostMapping("/listAll")
+ public R<List<AssetRepairRequestVO>> listAll(@RequestBody AssetRepairRequestListQuery query) {
+ String deptId = tokenService.getLoginUser().getDeptId();
+ List<Integer> deptIds = deptService.getAllSubDeptIds(deptId);
+ if (deptIds.isEmpty()) {
+ return R.ok(new ArrayList<>());
+ } else {
+ query.setDeptIds(deptIds);
+ List<Long> userIds = sysUserService.selectAllList().stream().filter(e -> deptIds.contains(Integer.valueOf(e.getDeptId())))
+ .map(SysUser::getUserId).collect(Collectors.toList());
+ if (userIds.isEmpty()){
+ return R.ok(new ArrayList<>());
+ }
}
List<Integer> assetMainIds = assetMainService.lambdaQuery().in(AssetMain::getOwnershipDeptId, deptIds).list()
.stream().map(AssetMain::getId).collect(Collectors.toList());
if (assetMainIds.isEmpty()){
- return R.ok(new PageInfo<>());
+ return R.ok(new ArrayList<>());
}
query.setAssetMainIds(assetMainIds);
- return R.ok(assetRepairRecordService.pageList(query));
+ return R.ok(assetRepairRecordService.listAll(query));
}
@Log(title = "资产报修-新增", businessType = BusinessType.INSERT)
@ApiOperation(value = "资产报修新增")
@PostMapping(value = "/add")
public R add(@RequestBody AddAssetRepairRequestDTO dto) {
+ dto.setRepairNo("1");
+ Long userId = tokenService.getLoginUser().getUserId();
+ dto.setReporterId(userId.intValue());
assetRepairRequestService.save(dto);
+ for (AssetRepairRequestItem assetRepairRequestItem : dto.getList()) {
+ assetRepairRequestItem.setRepairRequestId(dto.getId());
+ }
assetRepairRequestItemService.saveBatch(dto.getList());
return R.ok();
}
- @Log(title = "资产报修-编辑", businessType = BusinessType.INSERT)
+ @Log(title = "资产报修-编辑", businessType = BusinessType.UPDATE)
@ApiOperation(value = "资产报修编辑")
@PostMapping(value = "/update")
public R update(@RequestBody AddAssetRepairRequestDTO dto) {
@@ -93,6 +132,20 @@
assetRepairRequestItemService.saveBatch(dto.getList());
return R.ok();
}
+ @ApiOperation(value = "资产报修详情")
+ @GetMapping(value = "/detail")
+ public R<AddAssetRepairRequestDTO> detail(Integer id) {
+ AddAssetRepairRequestDTO res = new AddAssetRepairRequestDTO();
+ AssetRepairRequest assetRepairRequest = assetRepairRequestService.getById(id);
+ BeanUtils.copyProperties(assetRepairRequest, res);
+ List<AssetRepairListVO> items = assetRepairRequestItemService.listDetail(id);
+ res.setListDetail(items);
+ SysUser sysUser = sysUserService.selectUserById(Long.valueOf(assetRepairRequest.getReporterId()));
+ if (sysUser!=null){
+ res.setReporterName(sysUser.getNickName());
+ }
+ return R.ok(res);
+ }
@Log(title = "资产报修-删除", businessType = BusinessType.DELETE)
@ApiOperation(value = "资产报修-删除")
@DeleteMapping(value = "/delete")
--
Gitblit v1.7.1