新购接口优化
This commit is contained in:
parent
a3bab5db4a
commit
3b62cf4c24
|
|
@ -21,11 +21,11 @@ public class PurchaseCheckFileDto {
|
||||||
|
|
||||||
@ApiModelProperty(value = "附件名称")
|
@ApiModelProperty(value = "附件名称")
|
||||||
@NotBlank(message = "附件名称不能为空")
|
@NotBlank(message = "附件名称不能为空")
|
||||||
private String fileName;
|
private String name;
|
||||||
|
|
||||||
@ApiModelProperty(value = "附件地址url")
|
@ApiModelProperty(value = "附件地址url")
|
||||||
@NotBlank(message = "附件地址url不能为空")
|
@NotBlank(message = "附件地址url不能为空")
|
||||||
private String fileUrl;
|
private String url;
|
||||||
|
|
||||||
@ApiModelProperty(value = "任务ID")
|
@ApiModelProperty(value = "任务ID")
|
||||||
@NotBlank(message = "任务ID不能为空")
|
@NotBlank(message = "任务ID不能为空")
|
||||||
|
|
|
||||||
|
|
@ -5,8 +5,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<mapper namespace="com.bonus.material.purchase.mapper.PurchaseCheckFileMapper">
|
<mapper namespace="com.bonus.material.purchase.mapper.PurchaseCheckFileMapper">
|
||||||
<resultMap type="com.bonus.material.purchase.domain.dto.PurchaseCheckFileDto" id="PurchaseCheckFileResult">
|
<resultMap type="com.bonus.material.purchase.domain.dto.PurchaseCheckFileDto" id="PurchaseCheckFileResult">
|
||||||
<result property="id" column="id" />
|
<result property="id" column="id" />
|
||||||
<result property="fileName" column="file_name" />
|
<result property="name" column="name" />
|
||||||
<result property="fileUrl" column="file_url" />
|
<result property="url" column="url" />
|
||||||
<result property="taskId" column="task_id" />
|
<result property="taskId" column="task_id" />
|
||||||
<result property="dictCode" column="dict_code" />
|
<result property="dictCode" column="dict_code" />
|
||||||
<result property="dictLabel" column="dict_label" />
|
<result property="dictLabel" column="dict_label" />
|
||||||
|
|
@ -15,11 +15,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<sql id="selectPurchaseCheckFileJoinVo">
|
<sql id="selectPurchaseCheckFileJoinVo">
|
||||||
SELECT
|
SELECT
|
||||||
sdd.dict_code,sdd.dict_label,
|
sdd.dict_code,sdd.dict_label,
|
||||||
bfi.id,bfi.file_name,bfi.file_url
|
bfi.id,bfi.name,bfi.url
|
||||||
FROM
|
FROM
|
||||||
sys_dict_data sdd
|
sys_dict_data sdd
|
||||||
LEFT JOIN
|
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
|
WHERE
|
||||||
sdd.dict_type = 'purchase_check_report_type'
|
sdd.dict_type = 'purchase_check_report_type'
|
||||||
</sql>
|
</sql>
|
||||||
|
|
@ -33,8 +33,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
insert into bm_file_info
|
insert into bm_file_info
|
||||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||||
<if test="modelId != null">model_id,</if>
|
<if test="modelId != null">model_id,</if>
|
||||||
<if test="fileName != null">file_name,</if>
|
<if test="name != null">name,</if>
|
||||||
<if test="fileUrl != null">file_url,</if>
|
<if test="url != null">url,</if>
|
||||||
<if test="dictCode != null">dic_id,</if>
|
<if test="dictCode != null">dic_id,</if>
|
||||||
<if test="createBy != null">create_by,</if>
|
<if test="createBy != null">create_by,</if>
|
||||||
create_time,
|
create_time,
|
||||||
|
|
@ -42,8 +42,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
</trim>
|
</trim>
|
||||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||||
<if test="modelId != null">#{modelId,jdbcType=INTEGER},</if>
|
<if test="modelId != null">#{modelId,jdbcType=INTEGER},</if>
|
||||||
<if test="fileName != null">#{fileName,jdbcType=VARCHAR},</if>
|
<if test="name != null">#{name,jdbcType=VARCHAR},</if>
|
||||||
<if test="fileUrl != null">#{fileUrl,jdbcType=VARCHAR},</if>
|
<if test="url != null">#{url,jdbcType=VARCHAR},</if>
|
||||||
<if test="dictCode != null">#{dictCode},</if>
|
<if test="dictCode != null">#{dictCode},</if>
|
||||||
<if test="createBy != null">#{createBy,jdbcType=VARCHAR},</if>
|
<if test="createBy != null">#{createBy,jdbcType=VARCHAR},</if>
|
||||||
now(),
|
now(),
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue