Merge branch 'dev' into 'test'

修复BUG712，组织物料信息查询范围调整

See merge request jygk/dsc-base!25

zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/api/departmentmaterial/dto/DepartmentMaterialPageReqDTO.java

@@ -46,4 +46,7 @@ public class DepartmentMaterialPageReqDTO extends PageParam {
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
+
+    @Schema(description = "是否是公司")
+    private Boolean isCompany;
 }

zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/api/departmentmaterial/dto/DepartmentMaterialRespDTO.java

@@ -1,9 +1,12 @@
 package com.zt.plat.module.base.api.departmentmaterial.dto;
 
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.Map;
 
 /**
  * 组织架构物料 Response DTO
@@ -58,4 +61,13 @@ public class DepartmentMaterialRespDTO {
 
     @Schema(description = "状态编码")
     private String status;
+
+    @JsonIgnore
+    @Schema(description = "物料基础字段 + 属性编码->原值的动态键值，基础字段优先，序列化时直接展开为顶层字段")
+    private Map<String, Object> flatAttributes;
+
+    @JsonAnyGetter
+    public Map<String, Object> getFlatAttributes() {
+        return flatAttributes;
+    }
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/departmentmaterial/vo/DepartmentMaterialPageReqVO.java

@@ -45,4 +45,9 @@ public class DepartmentMaterialPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "是否是公司")
+    private Boolean isCompany;
+
+    @Schema(description = "部门ID集合(内部使用)")
+    private List<Long> deptIds;
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/departmentmaterial/vo/DepartmentMaterialRespVO.java

@@ -1,5 +1,7 @@
 package com.zt.plat.module.base.controller.admin.departmentmaterial.vo;
 
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -77,4 +79,13 @@ public class DepartmentMaterialRespVO {
     // base_material_status 系统字典取值
     private String status;
 
+    @JsonIgnore
+    @Schema(description = "物料基础字段 + 属性编码->原值的动态键值，基础字段优先，序列化时直接展开为顶层字段")
+    private Map<String, Object> flatAttributes;
+
+    @JsonAnyGetter
+    public Map<String, Object> getFlatAttributes() {
+        return flatAttributes;
+    }
+
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/departmentmaterial/DepartmentMaterialMapper.java

@@ -23,6 +23,7 @@ public interface DepartmentMaterialMapper extends BaseMapperX<DepartmentMaterial
         .inIfPresent(DepartmentMaterialDO::getInfomationId, reqVO.getInfomationIds())
         .eqIfPresent(DepartmentMaterialDO::getClassesId, reqVO.getClassesId())
         .eqIfPresent(DepartmentMaterialDO::getDeptId, reqVO.getDeptId())
+        .inIfPresent(DepartmentMaterialDO::getDeptId, reqVO.getDeptIds())
         .eqIfPresent(DepartmentMaterialDO::getDictionaryDataValue, reqVO.getDictionaryDataValue())
     .eqIfPresent(DepartmentMaterialDO::getStatus, reqVO.getStatus())
         .eqIfPresent(DepartmentMaterialDO::getRemark, reqVO.getRemark())