From f2caaf3dcfb44e0cdec149758d37e57a1e75952f Mon Sep 17 00:00:00 2001 From: yangxiaozhong <429869597@qq.com> Date: Wed, 14 Jan 2026 14:00:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=A4=E5=B0=98=E7=B3=BB=E7=BB=9F=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E8=AF=A6=E6=83=85=E9=A1=B5=E4=BB=A5=E5=8F=8A=E8=AE=BE?= =?UTF-8?q?=E6=88=90=E4=BF=A1=E6=81=AF=E4=B8=AD=E7=9A=84=E5=A4=9A=E9=80=89?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=9A=84=E9=80=89=E6=8B=A9=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=88=E7=94=B1=E4=B8=8B=E6=8B=89=E6=A1=86=E5=A4=9A=E9=80=89?= =?UTF-8?q?=E5=8F=98=E4=B8=BAcheckbox=E5=A4=9A=E9=80=89=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/file/vo/file/FilePresignedUrlRespVO.java | 2 ++ .../module/infra/dal/dataobject/file/FileDO.java | 2 ++ .../dustcompanyinfo/DustCompanyinfoController.java | 2 +- .../admin/dustdustinfo/vo/DustDustinfoRespVO.java | 10 +++++----- .../dustdustinfo/vo/DustDustinfoSaveReqVO.java | 6 +++--- .../dustequipinfo/DustEquipinfoController.java | 13 +++++++++++-- .../admin/dustequipinfo/vo/DustEquipinfoRespVO.java | 2 +- .../dustequipinfo/vo/DustEquipinfoSaveReqVO.java | 4 ++-- .../dustcompanyinfo/DustCompanyinfoServiceImpl.java | 6 +----- .../dustdustinfo/DustDustinfoServiceImpl.java | 6 +++++- .../dustequipinfo/DustEquipinfoServiceImpl.java | 10 ++++++---- 11 files changed, 39 insertions(+), 24 deletions(-) diff --git a/yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FilePresignedUrlRespVO.java b/yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FilePresignedUrlRespVO.java index 72be6ae26..081fba177 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FilePresignedUrlRespVO.java +++ b/yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FilePresignedUrlRespVO.java @@ -4,11 +4,13 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; @AllArgsConstructor @NoArgsConstructor @Schema(description = "管理后台 - 文件预签名地址 Response VO") @Data +@Accessors(chain = true) public class FilePresignedUrlRespVO { @Schema(description = "配置编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "11") diff --git a/yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/file/FileDO.java b/yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/file/FileDO.java index 5cb666ef5..61c302a71 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/file/FileDO.java +++ b/yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/file/FileDO.java @@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; +import lombok.experimental.Accessors; /** * 文件表 @@ -21,6 +22,7 @@ import lombok.*; @NoArgsConstructor @AllArgsConstructor @TenantIgnore +@Accessors(chain = true) public class FileDO extends BaseDO { /** 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 c17b9b81f..4f3522c75 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 @@ -89,7 +89,7 @@ public class DustCompanyinfoController { DustDustinfoDO dustDustinfo = dustDustinfoService.getDustDustinfo(id); List list = Arrays.stream(dustDustinfo.getDustTechnology().split(",")).toList(); DustDustinfoRespVO dustinfoRespVO = BeanUtils.toBean(dustDustinfo, DustDustinfoRespVO.class); - dustinfoRespVO.setDustTechnologys(list); + dustinfoRespVO.setDustTechnology(list); 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 c2110bd91..0827964be 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 @@ -32,12 +32,12 @@ public class DustDustinfoRespVO { @Schema(description = "高风险工艺", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty(value = "高风险工艺", converter = DictConvert.class) @DictFormat("dust_technology") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 - private String dustTechnology; + private List dustTechnology; - @Schema(description = "高风险工艺", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty(value = "高风险工艺", converter = DictConvert.class) - @DictFormat("dust_technology") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 - private List dustTechnologys; +// @Schema(description = "高风险工艺", requiredMode = Schema.RequiredMode.REQUIRED) +// @ExcelProperty(value = "高风险工艺", converter = DictConvert.class) +// @DictFormat("dust_technology") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 +// private List dustTechnologys; @Schema(description = "主要粉尘类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") @ExcelProperty("主要粉尘类型") diff --git a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustdustinfo/vo/DustDustinfoSaveReqVO.java b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustdustinfo/vo/DustDustinfoSaveReqVO.java index cacd0dd96..685915130 100644 --- a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustdustinfo/vo/DustDustinfoSaveReqVO.java +++ b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustdustinfo/vo/DustDustinfoSaveReqVO.java @@ -23,10 +23,10 @@ public class DustDustinfoSaveReqVO { @Schema(description = "高风险工艺", requiredMode = Schema.RequiredMode.REQUIRED) // @NotEmpty(message = "高风险工艺不能为空") - private String dustTechnology; + private List dustTechnology; - @NotEmpty(message = "高风险工艺不能为空") - private List dustTechnologys; +// @NotEmpty(message = "高风险工艺不能为空") +// private List dustTechnologys; @Schema(description = "主要粉尘类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") @NotEmpty(message = "主要粉尘类型不能为空") 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 995148254..b6e9590d5 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 @@ -13,6 +13,8 @@ import jakarta.validation.*; import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; +import java.util.function.Function; +import java.util.stream.Collectors; import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -80,7 +82,7 @@ public class DustEquipinfoController { DustEquipinfoRespVO respVO = BeanUtils.toBean(dustEquipinfo, DustEquipinfoRespVO.class); if (dustEquipinfo != null && dustEquipinfo.getDustTechnology()!= null) { List list = Arrays.stream(dustEquipinfo.getDustTechnology().split(",")).toList(); - respVO.setDustTechnologys(list); + respVO.setDustTechnology(list); } return success(respVO); } @@ -92,8 +94,15 @@ public class DustEquipinfoController { PageResult pageResult = dustEquipinfoService.getDustEquipinfoPage(pageReqVO); PageResult result = BeanUtils.toBean(pageResult, DustEquipinfoRespVO.class); List list = result.getList(); + List list1 = pageResult.getList(); + // 将 list1 转换为 Map，以 ID 作为 key + Map doMap = list1.stream() + .collect(Collectors.toMap(DustEquipinfoDO::getId, Function.identity())); for (DustEquipinfoRespVO vo : list) { - vo.setDustTechnologys(Arrays.stream(vo.getDustTechnology().split(",")).toList()); + DustEquipinfoDO dustEquipinfoDO = doMap.get(vo.getId()); + if (dustEquipinfoDO != null && dustEquipinfoDO.getDustTechnology() != null){ + vo.setDustTechnology(Arrays.stream(dustEquipinfoDO.getDustTechnology().split(",")).toList()); + } } return success(result); } 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 49b79f1e1..e4c3c16a9 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 @@ -69,7 +69,7 @@ public class DustEquipinfoRespVO { @Schema(description = "高风险工艺", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty(value = "高风险工艺", converter = DictConvert.class) @DictFormat("dust_technology") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 - private String dustTechnology; + private List dustTechnology; private List dustTechnologys; @Schema(description = "日产尘量Kg", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustequipinfo/vo/DustEquipinfoSaveReqVO.java b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustequipinfo/vo/DustEquipinfoSaveReqVO.java index 0d799bd08..784b2cb26 100644 --- a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustequipinfo/vo/DustEquipinfoSaveReqVO.java +++ b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustequipinfo/vo/DustEquipinfoSaveReqVO.java @@ -60,8 +60,8 @@ public class DustEquipinfoSaveReqVO { private Long workersNumber; @Schema(description = "高风险工艺", requiredMode = Schema.RequiredMode.REQUIRED) -// @NotEmpty(message = "高风险工艺不能为空") - private String dustTechnology; + @NotEmpty(message = "高风险工艺不能为空") + private List dustTechnology; private List dustTechnologys; @Schema(description = "日产尘量Kg", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dustcompanyinfo/DustCompanyinfoServiceImpl.java b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dustcompanyinfo/DustCompanyinfoServiceImpl.java index 1e7c66d51..62bb04827 100644 --- a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dustcompanyinfo/DustCompanyinfoServiceImpl.java +++ b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dustcompanyinfo/DustCompanyinfoServiceImpl.java @@ -45,9 +45,7 @@ public class DustCompanyinfoServiceImpl implements DustCompanyinfoService { if(insert>0){ //插入涉尘信息子表 DustDustinfoSaveReqVO dustDustinfo = createReqVO.getDustDustinfo(); - if(dustDustinfo != null){ - String dustTechnology = String.join(",", dustDustinfo.getDustTechnologys()); - dustDustinfo.setDustTechnology(dustTechnology); + if(dustDustinfo != null && dustDustinfo.getDustTechnology() != null){ dustDustinfo.setId(dustCompanyinfo.getId());//涉尘信息id和企业基础信息id一样 dustDustinfoService.createDustDustinfo(dustDustinfo); } @@ -68,8 +66,6 @@ public class DustCompanyinfoServiceImpl implements DustCompanyinfoService { //插入涉尘信息子表 DustDustinfoSaveReqVO dustDustinfo = updateReqVO.getDustDustinfo(); if(dustDustinfo != null){ - String dustTechnology = String.join(",", dustDustinfo.getDustTechnologys()); - dustDustinfo.setDustTechnology(dustTechnology); dustDustinfoService.updateDustDustinfo(dustDustinfo); } } diff --git a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dustdustinfo/DustDustinfoServiceImpl.java b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dustdustinfo/DustDustinfoServiceImpl.java index fe0303aa6..a3ef9ee0f 100644 --- a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dustdustinfo/DustDustinfoServiceImpl.java +++ b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dustdustinfo/DustDustinfoServiceImpl.java @@ -34,8 +34,10 @@ public class DustDustinfoServiceImpl implements DustDustinfoService { @Override public String createDustDustinfo(DustDustinfoSaveReqVO createReqVO) { + String join = String.join(",", createReqVO.getDustTechnology()); // 插入 DustDustinfoDO dustDustinfo = BeanUtils.toBean(createReqVO, DustDustinfoDO.class); + dustDustinfo.setDustTechnology(join); dustDustinfoMapper.insert(dustDustinfo); // 返回 @@ -44,10 +46,12 @@ public class DustDustinfoServiceImpl implements DustDustinfoService { @Override public void updateDustDustinfo(DustDustinfoSaveReqVO updateReqVO) { + String join = String.join(",", updateReqVO.getDustTechnology()); // 校验存在 validateDustDustinfoExists(updateReqVO.getId()); // 更新 DustDustinfoDO updateObj = BeanUtils.toBean(updateReqVO, DustDustinfoDO.class); + updateObj.setDustTechnology(join); dustDustinfoMapper.updateById(updateObj); } @@ -82,4 +86,4 @@ public class DustDustinfoServiceImpl implements DustDustinfoService { return dustDustinfoMapper.selectPage(pageReqVO); } -} \ No newline at end of file +} diff --git a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dustequipinfo/DustEquipinfoServiceImpl.java b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dustequipinfo/DustEquipinfoServiceImpl.java index 9d810f70e..8dc5aab4a 100644 --- a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dustequipinfo/DustEquipinfoServiceImpl.java +++ b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dustequipinfo/DustEquipinfoServiceImpl.java @@ -35,9 +35,10 @@ public class DustEquipinfoServiceImpl implements DustEquipinfoService { @Override public String createDustEquipinfo(DustEquipinfoSaveReqVO createReqVO) { // 插入 - String join = String.join(",", createReqVO.getDustTechnologys()); - createReqVO.setDustTechnology(join); + String join = String.join(",", createReqVO.getDustTechnology()); +// createReqVO.setDustTechnology(join); DustEquipinfoDO dustEquipinfo = BeanUtils.toBean(createReqVO, DustEquipinfoDO.class); + dustEquipinfo.setDustTechnology(join); dustEquipinfoMapper.insert(dustEquipinfo); // 返回 @@ -46,12 +47,13 @@ public class DustEquipinfoServiceImpl implements DustEquipinfoService { @Override public void updateDustEquipinfo(DustEquipinfoSaveReqVO updateReqVO) { - String join = String.join(",", updateReqVO.getDustTechnologys()); - updateReqVO.setDustTechnology(join); + String join = String.join(",", updateReqVO.getDustTechnology()); +// updateReqVO.setDustTechnology(join); // 校验存在 validateDustEquipinfoExists(updateReqVO.getId()); // 更新 DustEquipinfoDO updateObj = BeanUtils.toBean(updateReqVO, DustEquipinfoDO.class); + updateObj.setDustTechnology(join); dustEquipinfoMapper.updateById(updateObj); }