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 b3754eec..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 @@ -24,6 +24,11 @@ public class BmFileInfo extends BaseEntity /** 主键id */ private Long id; + /** 任务类型, 参考数据字典 tm_task_type */ + @Excel(name = "任务类型") + @ApiModelProperty(value = "任务类型") + private Long taskType; + /** 任务id */ @Excel(name = "任务id") @ApiModelProperty(value = "任务id") @@ -44,6 +49,11 @@ public class BmFileInfo extends BaseEntity @ApiModelProperty(value = "文件路径") private String url; + /** 文件类型, 参考数据字典 bm_file_type */ + @Excel(name = "文件类型") + @ApiModelProperty(value = "文件类型") + private Long fileType; + /** 数据字典 */ @Excel(name = "数据字典") @ApiModelProperty(value = "数据字典") 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 ddfa77d7..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 @@ -5,26 +5,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select id, task_id, model_id, name, url, dic_id, 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 @@ -37,19 +41,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}, @@ -59,10 +67,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}, @@ -84,8 +94,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}