push

yd-oss-feign/src/main/java/com/yd/oss/feign/response/ApiRelObjectMaterialPageResponse.java

@@ -33,11 +33,21 @@ public class ApiRelObjectMaterialPageResponse {
     private String dataPerson;
     private String dataPerson;
 
 
     /**
     /**
+     * 资料人（字典）名称
+     */
+    private String dataPersonName;
+
+    /**
      * 资料类型（字典）
      * 资料类型（字典）
      */
      */
     private String dataType;
     private String dataType;
 
 
     /**
     /**
+     * 资料类型（字典）名称
+     */
+    private String dataTypeName;
+
+    /**
      * 注意事项
      * 注意事项
      */
      */
     private String precautions;
     private String precautions;

yd-oss-service/src/main/resources/mappers/RelObjectMaterialMapper.xml

@@ -24,12 +24,16 @@
         m.data_person,
         m.data_person,
         m.data_type,
         m.data_type,
         m.precautions,
         m.precautions,
+        CONCAT(
+        '[',
         GROUP_CONCAT(
         GROUP_CONCAT(
         JSON_OBJECT(
         JSON_OBJECT(
         'fileUrl', CONCAT('https://', f.bucket_name, '.', p.endpoint, '/', f.file_key),
         'fileUrl', CONCAT('https://', f.bucket_name, '.', p.endpoint, '/', f.file_key),
         'fileName', f.original_name
         'fileName', f.original_name
         )
         )
-        SEPARATOR ';'
+        SEPARATOR ','
+        ),
+        ']'
         ) as file_infos
         ) as file_infos
         FROM rel_object_material rom
         FROM rel_object_material rom
         LEFT JOIN material m ON m.material_biz_id = rom.material_biz_id AND m.is_deleted = 0
         LEFT JOIN material m ON m.material_biz_id = rom.material_biz_id AND m.is_deleted = 0