diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmFileInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmFileInfo.java
index 709b00ba..0b2fa507 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmFileInfo.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmFileInfo.java
@@ -29,6 +29,11 @@ public class BmFileInfo extends BaseEntity
@ApiModelProperty(value = "任务类型")
private Long taskType;
+ /** 任务id */
+ @Excel(name = "任务id")
+ @ApiModelProperty(value = "任务id")
+ private Long taskId;
+
/** 模块id */
@Excel(name = "模块id")
@ApiModelProperty(value = "模块id")
@@ -49,4 +54,10 @@ public class BmFileInfo extends BaseEntity
@ApiModelProperty(value = "文件类型")
private Long fileType;
+ /** 数据字典 */
+ @Excel(name = "数据字典")
+ @ApiModelProperty(value = "数据字典")
+ private Long dicId;
+
+
}
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnitType.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnitType.java
new file mode 100644
index 00000000..764bc863
--- /dev/null
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnitType.java
@@ -0,0 +1,30 @@
+//package com.bonus.material.basic.domain;
+//
+//import com.bonus.common.core.annotation.Excel;
+//import com.bonus.common.core.web.domain.BaseEntity;
+//import io.swagger.annotations.ApiModelProperty;
+//import lombok.Data;
+//
+///**
+// * @Author ma_sh
+// * @create 2024/10/14 15:29
+// */
+//@Data
+//public class BmUnitType extends BaseEntity {
+//
+// private Integer isAll;
+//
+// @ApiModelProperty(value = "主键id")
+// private Long typeId;
+//
+// @ApiModelProperty(value = "单位类型名称")
+// @Excel(name = "单位类型")
+// private String typeName;
+//
+// @ApiModelProperty(value = "单位类型")
+// private String dictType;
+//
+// /** 删除标志(0代表存在 2代表删除) */
+// private String delFlag;
+//
+//}
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml
index 15e24530..7aa97639 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml
@@ -6,26 +6,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
- select id, task_type, model_id, name, url, file_type, create_by, create_time from bm_file_info
+ select id, task_type, task_id, model_id, name, url, file_type, dic_id, create_by, create_time from bm_file_info
@@ -38,19 +42,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into bm_file_info
task_type,
+ task_id,
model_id,
name,
url,
file_type,
+ dic_id,
create_by,
create_time,
#{taskType},
+ #{taskId},
#{modelId},
#{name},
#{url},
#{fileType},
+ #{dicId},
#{createBy},
#{createTime},
@@ -60,10 +68,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update bm_file_info
task_type = #{taskType},
+ task_id = #{taskId},
model_id = #{modelId},
name = #{name},
url = #{url},
file_type = #{fileType},
+ dic_id = #{dicId},
create_by = #{createBy},
create_time = #{createTime},
@@ -85,8 +95,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
delete from bm_file_info
and task_type = #{taskType}
+ and task_id = #{taskId}
and model_id = #{modelId}
and file_type = #{fileType}
+ and dic_id = #{dicId}
\ No newline at end of file