From b39d89ba88e74eedaf94bfbc77c70963beb454d3 Mon Sep 17 00:00:00 2001 From: yangxiaozhong <429869597@qq.com> Date: Wed, 14 Jan 2026 16:57:50 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=A4=E5=B0=98=E7=B3=BB=E7=BB=9F=E7=9A=84?= =?UTF-8?q?=E9=99=A4=E5=B0=98=E7=A7=8D=E7=B1=BBform=E7=9A=84=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=92=8C=E8=AF=A6=E6=83=85=E9=A1=B5=E7=9A=84=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E4=B8=BB=E8=A6=81=E7=B2=89=E5=B0=98=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=9A=84form=E8=A1=A8=E5=8D=95=E7=9A=84=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=92=8C=E8=AF=A6=E6=83=85=E9=A1=B5=E7=9A=84=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DustCompanyinfoController.java | 17 +++++++++++++++++ .../dustdustinfo/vo/DustDustinfoRespVO.java | 1 + .../dustequipinfo/DustEquipinfoController.java | 16 ++++++++++++++++ .../dustequipinfo/vo/DustEquipinfoRespVO.java | 1 + 4 files changed, 35 insertions(+) diff --git a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustcompanyinfo/DustCompanyinfoController.java b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustcompanyinfo/DustCompanyinfoController.java index 1cd0143fe..02ecea9d8 100644 --- a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustcompanyinfo/DustCompanyinfoController.java +++ b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustcompanyinfo/DustCompanyinfoController.java @@ -2,7 +2,9 @@ package cn.iocoder.yudao.module.system.controller.admin.dustcompanyinfo; import cn.iocoder.yudao.module.system.controller.admin.dustdustinfo.vo.DustDustinfoRespVO; import cn.iocoder.yudao.module.system.dal.dataobject.dustdustinfo.DustDustinfoDO; +import cn.iocoder.yudao.module.system.dal.dataobject.dusttype.DustTypeDO; import cn.iocoder.yudao.module.system.service.dustdustinfo.DustDustinfoService; +import cn.iocoder.yudao.module.system.service.dusttype.DustTypeService; import org.springframework.web.bind.annotation.*; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -43,6 +45,8 @@ public class DustCompanyinfoController { @Resource private DustDustinfoService dustDustinfoService; + @Resource + private DustTypeService dustTypeService; @PostMapping("/create") @Operation(summary = "创建企业基础信息") @@ -90,7 +94,20 @@ public class DustCompanyinfoController { List list = Arrays.stream(dustDustinfo.getDustTechnology().split(",")).toList(); DustDustinfoRespVO dustinfoRespVO = BeanUtils.toBean(dustDustinfo, DustDustinfoRespVO.class); dustinfoRespVO.setDustTechnology(list); + String fullDustName=""; + if (dustDustinfo.getDustType() != null ){ + DustTypeDO dustType = dustTypeService.getDustType(dustDustinfo.getDustType()); + if (dustType != null && dustType.getName()!=null){ + fullDustName = dustType.getName(); + } + DustTypeDO dustType1 = dustTypeService.getDustType(dustType.getParentId()); + if (dustType1!=null && dustType1.getName()!=null){ + fullDustName = dustType1.getName()+"/"+fullDustName; + } + dustinfoRespVO.setDustTypeName(fullDustName); + } respVO.setDustDustinfo(dustinfoRespVO); + return success(respVO); } diff --git a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustdustinfo/vo/DustDustinfoRespVO.java b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustdustinfo/vo/DustDustinfoRespVO.java index 0827964be..0a83ffeab 100644 --- a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustdustinfo/vo/DustDustinfoRespVO.java +++ b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustdustinfo/vo/DustDustinfoRespVO.java @@ -42,6 +42,7 @@ public class DustDustinfoRespVO { @Schema(description = "主要粉尘类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") @ExcelProperty("主要粉尘类型") private String dustType; + private String dustTypeName; @Schema(description = "日产尘量Kg", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("日产尘量Kg") diff --git a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustequipinfo/DustEquipinfoController.java b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustequipinfo/DustEquipinfoController.java index b6e9590d5..2981ec0a2 100644 --- a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustequipinfo/DustEquipinfoController.java +++ b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustequipinfo/DustEquipinfoController.java @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.system.controller.admin.dustequipinfo; +import cn.iocoder.yudao.module.system.dal.dataobject.dusttype.DustTypeDO; +import cn.iocoder.yudao.module.system.service.dusttype.DustTypeService; import org.springframework.web.bind.annotation.*; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -40,6 +42,8 @@ public class DustEquipinfoController { @Resource private DustEquipinfoService dustEquipinfoService; + @Resource + private DustTypeService dustTypeService; @PostMapping("/create") @Operation(summary = "创建除尘系统信息") @PreAuthorize("@ss.hasPermission('system:dust-equipinfo:create')") @@ -84,6 +88,18 @@ public class DustEquipinfoController { List list = Arrays.stream(dustEquipinfo.getDustTechnology().split(",")).toList(); respVO.setDustTechnology(list); } + String fullDustName=""; + if (dustEquipinfo.getDustType() != null ){ + DustTypeDO dustType = dustTypeService.getDustType(dustEquipinfo.getDustType()); + if (dustType != null && dustType.getName()!=null){ + fullDustName = dustType.getName(); + } + DustTypeDO dustType1 = dustTypeService.getDustType(dustType.getParentId()); + if (dustType1!=null && dustType1.getName()!=null){ + fullDustName = dustType1.getName()+"/"+fullDustName; + } + respVO.setDustTypeName(fullDustName); + } return success(respVO); } diff --git a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustequipinfo/vo/DustEquipinfoRespVO.java b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustequipinfo/vo/DustEquipinfoRespVO.java index e4c3c16a9..5394a4552 100644 --- a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustequipinfo/vo/DustEquipinfoRespVO.java +++ b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustequipinfo/vo/DustEquipinfoRespVO.java @@ -61,6 +61,7 @@ public class DustEquipinfoRespVO { @Schema(description = "除尘种类", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") @ExcelProperty("除尘种类") private String dustType; + private String dustTypeName; @Schema(description = "涉粉作业人数", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("涉粉作业人数")