From 96f4d991ab02a0d4360fac3c850f32bdd7bd0c78 Mon Sep 17 00:00:00 2001 From: itcast Date: Fri, 21 Nov 2025 14:02:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/back/domain/BackCsDeviceDetails.java | 6 ++++++ .../material/back/mapper/BackChangeMapper.java | 1 + .../back/service/impl/BackChangeServiceImpl.java | 3 +++ .../devchange/service/DevChangeServiceImpl.java | 10 +++------- .../com/bonus/material/scrap/domain/ToBeScrap.java | 1 + .../resources/bootstrap-material_mall_local.yml | 11 +++++++---- .../mapper/material/back/BackChangeMapper.xml | 13 +++++++++++++ .../mapper/material/devchange/DevChangeMapper.xml | 8 ++++++++ .../mapper/material/repair/RepairMapper.xml | 6 ++++++ .../resources/mapper/material/scrap/ScrapMapper.xml | 6 ++++++ 10 files changed, 54 insertions(+), 11 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/domain/BackCsDeviceDetails.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/domain/BackCsDeviceDetails.java index 8279770..1d22314 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/domain/BackCsDeviceDetails.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/domain/BackCsDeviceDetails.java @@ -31,6 +31,12 @@ public class BackCsDeviceDetails { @ApiModelProperty(value = "类目") private String category; + @ApiModelProperty(value = "工具类目") + private String toolTypeId; + + @ApiModelProperty(value = "装备类目") + private String categoryEquipment; + @ApiModelProperty(value = "名称") private String typeName; diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/mapper/BackChangeMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/mapper/BackChangeMapper.java index 1519bed..aa4935a 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/mapper/BackChangeMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/mapper/BackChangeMapper.java @@ -140,4 +140,5 @@ public interface BackChangeMapper { * @return */ int updateToolInfoRepairNum(BackCsDeviceDetails csDeviceDetails); + } 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 cdf1e9f..9d5b074 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 @@ -50,7 +50,10 @@ public class BackChangeServiceImpl implements BackChangeService { } Long thisLoginUserDeptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); dto.setCompanyId(thisLoginUserDeptId); + + return mapper.getDevDetailsInfo(dto); + } catch (Exception e) { log.error(e.getMessage()); return new ArrayList<>(); diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java index 205f59b..da73fcb 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java @@ -210,13 +210,9 @@ public class DevChangeServiceImpl implements DevChangeService { try { Long thisLoginUserDeptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); dto.setCompanyId(thisLoginUserDeptId); - if("1".equals(dto.getDevType())){ - return mapper.getDevDetailsInfoEquipment(dto); - } else if ("2".equals(dto.getDevType())) { - return mapper.getDevDetailsInfoTool(dto); - }else { - return mapper.getDevDetailsInfo(dto); - } + + return mapper.getDevDetailsInfo(dto); + } catch (Exception e) { log.error(e.getMessage()); return new ArrayList<>(); diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/scrap/domain/ToBeScrap.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/scrap/domain/ToBeScrap.java index c59bdd8..c2a377e 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/scrap/domain/ToBeScrap.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/scrap/domain/ToBeScrap.java @@ -29,6 +29,7 @@ public class ToBeScrap { */ private String type; + /** * 类型id */ diff --git a/bonus-modules/bonus-material-mall/src/main/resources/bootstrap-material_mall_local.yml b/bonus-modules/bonus-material-mall/src/main/resources/bootstrap-material_mall_local.yml index 72abfef..3a08796 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/bootstrap-material_mall_local.yml +++ b/bonus-modules/bonus-material-mall/src/main/resources/bootstrap-material_mall_local.yml @@ -6,20 +6,23 @@ server: spring: cloud: nacos: + username: nacos + password: nacos discovery: # 服务注册地址 - server-addr: 127.0.0.1:18848 - namespace: 37661b6d-55f6-4d12-b2ed-e6ff49e6bb9a + server-addr: 127.0.0.1:8848 + namespace: material_mall config: # 配置中心地址 - server-addr: 127.0.0.1:18848 - namespace: 37661b6d-55f6-4d12-b2ed-e6ff49e6bb9a + server-addr: 127.0.0.1:8848 + namespace: material_mall # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + #加密组件 jasypt: encryptor: 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 f717412..6139f56 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 @@ -173,6 +173,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND cd.pro_code = #{proCode} + + AND cdc.dev_type = #{devType} + + GROUP BY mdi.code @@ -197,6 +201,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN tool_type tt4 ON tt3.parent_id = tt4.type_id tl.manage_mode = '0' AND cdc.del_flag = '0' + + AND cdc.dev_type = #{devType} + + AND tt1.type_name like concat('%',#{typeName},'%') @@ -236,6 +244,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN tool_type tt4 ON tt3.parent_id = tt4.type_id tl.manage_mode = '1' AND cdc.del_flag = '0' + + AND cdc.dev_type = #{devType} + + AND tt1.type_name like concat('%',#{typeName},'%') @@ -404,4 +416,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" cd.create_time DESC + \ No newline at end of file diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml index 834634f..d0e312e 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml @@ -336,6 +336,10 @@ AND mdi.on_company = #{companyId} + + AND 1=0 + + UNION ALL @@ -352,6 +356,7 @@ tl.type_id AS typeId, tl.id AS id FROM tool_ledger tl + LEFT JOIN tool_type tt ON tl.type_id = tt.type_id LEFT JOIN tool_type tt1 ON tt.parent_id = tt1.type_id LEFT JOIN tool_type tt2 ON tt1.parent_id = tt2.type_id @@ -377,6 +382,9 @@ AND tl.company_id = #{companyId} + + AND 1=0 + diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/repair/RepairMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/repair/RepairMapper.xml index ba7e5b7..ee1f53f 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/repair/RepairMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/repair/RepairMapper.xml @@ -163,6 +163,9 @@ AND tl.tool_code like concat('%',#{code},'%') + + AND 1=0 + UNION @@ -193,6 +196,9 @@ AND mdi.`code` like concat('%',#{code},'%') + + AND 1=0 +