From 92ff484325b9af3afd081ec079f74fbc6dd3fea8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 27 十月 2025 15:43:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetInventoryTaskServiceImpl.java | 3 +++
ruoyi-system/src/main/resources/mapper/system/AssetMainMapper.xml | 2 +-
ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetRepairRecordDetailVO.java | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetInventoryTaskController.java | 3 ++-
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetInventoryTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetInventoryTaskController.java
index 8739ae6..45878dc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetInventoryTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetInventoryTaskController.java
@@ -31,6 +31,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
+import javax.validation.constraints.NotEmpty;
import java.util.List;
/**
@@ -133,7 +134,7 @@
@ApiOperation("盘点结果处理")
@PostMapping("/result")
- public R<?> handleResult(@Valid @RequestBody List<AssetInventoryTaskItemDTO> dtoList) {
+ public R<?> handleResult(@Valid @RequestBody List<AssetInventoryTaskItemDTO> dtoList) {
assetInventoryTaskService.handleResult(dtoList);
return R.ok();
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetInventoryTaskServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetInventoryTaskServiceImpl.java
index fc6519c..3da8e7a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetInventoryTaskServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetInventoryTaskServiceImpl.java
@@ -459,6 +459,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void handleResult(List<AssetInventoryTaskItemDTO> dtoList) {
+ if (CollUtil.isEmpty(dtoList)) {
+ throw new ServiceException("盘点结果数据不能为空");
+ }
Map<Integer, Integer> taskItemMap = dtoList.stream()
.collect(Collectors.toMap(AssetInventoryTaskItemDTO::getAssetInventoryTaskItemId, AssetInventoryTaskItemDTO::getDeal));
List<AssetInventoryTaskItem> assetInventoryTaskItems = assetInventoryTaskItemService.listByIds(taskItemMap.keySet());
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetRepairRecordDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetRepairRecordDetailVO.java
index e8a69fe..89cc52b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetRepairRecordDetailVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetRepairRecordDetailVO.java
@@ -62,7 +62,7 @@
private Integer repairRequestId;
@ApiModelProperty(value = "关联报修单编号")
- private Integer repairRequestNo;
+ private String repairRequestNo;
@ApiModelProperty(value = "维修资产列表")
private List<AssetRepairRecordAssetVO> assetList;
diff --git a/ruoyi-system/src/main/resources/mapper/system/AssetMainMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AssetMainMapper.xml
index 65c5362..fbd2a94 100644
--- a/ruoyi-system/src/main/resources/mapper/system/AssetMainMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/AssetMainMapper.xml
@@ -136,7 +136,7 @@
<if test="query != null and query.assetTypeId != null">
AND (am.asset_type_id = #{query.assetTypeId} OR FIND_IN_SET(#{query.assetTypeId},at.parent_id))
</if>
- <if test="query != null and query.ownershipDeptId != null">
+ <if test="query != null and query.ownershipDeptId != null and query.ownershipDeptId != 100 and query.ownershipDeptId != 102">
AND am.ownership_dept_id = #{query.ownershipDeptId}
</if>
<if test="query != null and query.assetStatus != null and query.assetStatus != ''">
--
Gitblit v1.7.1