除尘系统信息详情页以及设成信息中的多选字段的选择优化（由下拉框多选变为checkbox多选按钮）

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")

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 {
 
     /**

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<String> 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);
     }

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<String> dustTechnology;
 
-    @Schema(description = "高风险工艺", requiredMode = Schema.RequiredMode.REQUIRED)
+//    @Schema(description = "高风险工艺", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty(value = "高风险工艺", converter = DictConvert.class)
+//    @ExcelProperty(value = "高风险工艺", converter = DictConvert.class)
-    @DictFormat("dust_technology") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
+//    @DictFormat("dust_technology") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
-    private List<String> dustTechnologys;
+//    private List<String> dustTechnologys;
 
     @Schema(description = "主要粉尘类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @ExcelProperty("主要粉尘类型")

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<String> dustTechnology;
 
-    @NotEmpty(message = "高风险工艺不能为空")
+//    @NotEmpty(message = "高风险工艺不能为空")
-    private List<String> dustTechnologys;
+//    private List<String> dustTechnologys;
 
     @Schema(description = "主要粉尘类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @NotEmpty(message = "主要粉尘类型不能为空")

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<String> list = Arrays.stream(dustEquipinfo.getDustTechnology().split(",")).toList();
-            respVO.setDustTechnologys(list);
+            respVO.setDustTechnology(list);
         }
         return success(respVO);
     }
@@ -92,8 +94,15 @@ public class DustEquipinfoController {
         PageResult<DustEquipinfoDO> pageResult = dustEquipinfoService.getDustEquipinfoPage(pageReqVO);
         PageResult<DustEquipinfoRespVO> result = BeanUtils.toBean(pageResult, DustEquipinfoRespVO.class);
         List<DustEquipinfoRespVO> list = result.getList();
+        List<DustEquipinfoDO> list1 = pageResult.getList();
+        // 将 list1 转换为 Map，以 ID 作为 key
+        Map<String, DustEquipinfoDO> 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);
     }

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<String> dustTechnology;
     private List<String> dustTechnologys;
 
     @Schema(description = "日产尘量Kg", requiredMode = Schema.RequiredMode.REQUIRED)

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 = "高风险工艺不能为空")
+    @NotEmpty(message = "高风险工艺不能为空")
-    private String dustTechnology;
+    private List<String> dustTechnology;
     private List<String> dustTechnologys;
 
     @Schema(description = "日产尘量Kg", requiredMode = Schema.RequiredMode.REQUIRED)

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){
+            if(dustDustinfo != null &&  dustDustinfo.getDustTechnology() != null){
-                String dustTechnology = String.join(",", dustDustinfo.getDustTechnologys());
-                dustDustinfo.setDustTechnology(dustTechnology);
                 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);
             }
         }

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);
     }
 
-}
+}

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());
+        String join = String.join(",", createReqVO.getDustTechnology());
-        createReqVO.setDustTechnology(join);
+//        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());
+        String join = String.join(",", updateReqVO.getDustTechnology());
-        updateReqVO.setDustTechnology(join);
+//        updateReqVO.setDustTechnology(join);
         // 校验存在
         validateDustEquipinfoExists(updateReqVO.getId());
         // 更新
         DustEquipinfoDO updateObj = BeanUtils.toBean(updateReqVO, DustEquipinfoDO.class);
+        updateObj.setDustTechnology(join);
         dustEquipinfoMapper.updateById(updateObj);
     }