From f6e70c3fb69538f2c47ed3b1cfc5d0275a73f9cf Mon Sep 17 00:00:00 2001 From: jiang Date: Tue, 25 Nov 2025 15:50:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../back/controller/BackChangeController.java | 10 +--- .../service/impl/BackChangeServiceImpl.java | 2 +- .../mapper/material/back/BackChangeMapper.xml | 54 ++++++++++--------- .../material/devchange/MaDevInfoMapper.xml | 3 +- 4 files changed, 32 insertions(+), 37 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/controller/BackChangeController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/controller/BackChangeController.java index 2c1dfde..b169203 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/controller/BackChangeController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/controller/BackChangeController.java @@ -36,14 +36,8 @@ public class BackChangeController extends BaseController { @ApiOperation(value = "获取添加设备详情") @GetMapping("/getDevDetailsInfo") public AjaxResult getDevDetailsInfo(BackCsDeviceDetails dto) { - try { - startPage(); - List list = service.getDevDetailsInfo(dto); - return AjaxResult.success(getDataTable(list)); - } catch (Exception e) { - log.error("查询失败，请联系管理员:{}", e.getMessage()); - return AjaxResult.error("查询失败，请联系管理员"); - } + List list = service.getDevDetailsInfo(dto); + return AjaxResult.success(list); } /** diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/service/impl/BackChangeServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/service/impl/BackChangeServiceImpl.java index 9d5b074..a0b02a7 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/service/impl/BackChangeServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/service/impl/BackChangeServiceImpl.java @@ -165,7 +165,7 @@ public class BackChangeServiceImpl implements BackChangeService { } // 编码重复 String devCode = details.getDevCode(); - if (StringUtils.isNotBlank(devCode) && devCodeSet.contains(devCode)) { + if (!devCode.equals("/") && StringUtils.isNotBlank(devCode) && devCodeSet.contains(devCode)) { return AjaxResult.error("添加的列表中设备编号存在重复：" + devCode); } else if (StringUtils.isNotBlank(devCode)) { devCodeSet.add(devCode); diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml index 3896b81..bd0f543 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml @@ -138,15 +138,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHEN mt.level = 6 THEN CONCAT(mt5.type_name, '>', mt4.type_name, '>', mt3.type_name, '>', mt2.type_name,'>', mt1.type_name, '>', mt.type_name) ELSE mt.type_name - END AS category, - mdi.device_name AS typeName, + END AS category, + mdi.device_name AS typeName, mdi.item_type_model AS typeModelName, - mdi.manage_type AS manageType, - mdi.code AS devCode, - mdi.device_count AS useNum, - 1 AS devType, - mdi.type_id AS typeId, - mdi.ma_id AS id + mdi.manage_type AS manageType, + mdi.code AS devCode, + mdi.device_count AS useNum, + 1 AS devType, + mdi.type_id AS typeId, + mdi.ma_id AS id FROM ma_dev_info mdi LEFT JOIN cs_device_change_details cdc ON mdi.code = cdc.dev_code LEFT JOIN cs_device_change cd ON cd.id = cdc.change_id @@ -157,7 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id LEFT JOIN ma_type mt5 ON mt4.parent_id = mt5.type_id - mdi.is_active = '1' and mdi.ma_status = 2 AND cdc.del_flag = '0' + mdi.is_active = '1' and mdi.ma_status = 2 AND cdc.del_flag = '0' AND mdi.device_name like concat('%',#{typeName},'%') @@ -183,14 +183,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" UNION ALL SELECT CONCAT(tt4.type_name, '>', tt3.type_name, '>', tt2.type_name) as category, - tt1.type_name as typeName, - tt.type_name as typeModelName, - tl.manage_mode as manageType, - IFNULL(tl.tool_code,'/') as devCode, - IFNULL(tl.in_num, 0) as useNum, - 2 as devType, - tl.type_id as typeId, - tl.id as id + tt1.type_name as typeName, + tt.type_name as typeModelName, + tl.manage_mode as manageType, + IFNULL(tl.tool_code,'/') as devCode, + IFNULL(tl.in_num, 0) as useNum, + 2 as devType, + tl.type_id as typeId, + tl.id as id FROM tool_ledger tl LEFT JOIN cs_device_change_details cdc ON tl.tool_code = cdc.dev_code LEFT JOIN cs_device_change cd ON cd.id = cdc.change_id @@ -222,18 +222,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY tl.tool_code - + HAVING useNum > 0 UNION ALL SELECT CONCAT(tt4.type_name, '>', tt3.type_name, '>', tt2.type_name) as category, - tt1.type_name as typeName, - tt.type_name as typeModelName, - tl.manage_mode as manageType, - IFNULL(tl.tool_code,'/') as devCode, - IFNULL(tl.in_num, 0) as useNum, - 2 as devType, - tl.type_id as typeId, - tl.id as id + tt1.type_name as typeName, + tt.type_name as typeModelName, + tl.manage_mode as manageType, + IFNULL(tl.tool_code,'/') as devCode, + IFNULL(tl.in_num, 0) as useNum, + 2 as devType, + tl.type_id as typeId, + tl.id as id FROM tool_ledger tl LEFT JOIN cs_device_change_details cdc ON tl.type_id = cdc.dev_type_id LEFT JOIN cs_device_change cd ON cd.id = cdc.change_id @@ -264,7 +264,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND cd.pro_code = #{proCode} + GROUP BY tl.id + HAVING useNum > 0 SELECT COUNT(1) - FROM ma_dev_info d - JOIN ma_type t ON d.type_id = t.type_id + FROM ma_dev_info WHERE is_active = '1' and entry_status = '1'