diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseCheckFileDto.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseCheckFileDto.java index 6fb93b5d..290c139b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseCheckFileDto.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseCheckFileDto.java @@ -21,11 +21,11 @@ public class PurchaseCheckFileDto { @ApiModelProperty(value = "附件名称") @NotBlank(message = "附件名称不能为空") - private String fileName; + private String name; @ApiModelProperty(value = "附件地址url") @NotBlank(message = "附件地址url不能为空") - private String fileUrl; + private String url; @ApiModelProperty(value = "任务ID") @NotBlank(message = "任务ID不能为空") diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckFileMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckFileMapper.xml index 7f33a0b6..8cdd713b 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckFileMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckFileMapper.xml @@ -5,8 +5,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + + @@ -15,11 +15,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT sdd.dict_code,sdd.dict_label, - bfi.id,bfi.file_name,bfi.file_url + bfi.id,bfi.name,bfi.url FROM sys_dict_data sdd LEFT JOIN - bm_file_info bfi ON bfi.dic_id = sdd.dict_code and bfi.task_id = #{taskId} and bfi.model_id = #{typeId} + bm_file_info bfi ON bfi.dic_id = sdd.dict_code and bfi.task_type = #{taskType} and bfi.model_id = #{typeId} WHERE sdd.dict_type = 'purchase_check_report_type' @@ -33,8 +33,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into bm_file_info model_id, - file_name, - file_url, + name, + url, dic_id, create_by, create_time, @@ -42,8 +42,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{modelId,jdbcType=INTEGER}, - #{fileName,jdbcType=VARCHAR}, - #{fileUrl,jdbcType=VARCHAR}, + #{name,jdbcType=VARCHAR}, + #{url,jdbcType=VARCHAR}, #{dictCode}, #{createBy,jdbcType=VARCHAR}, now(),