diff --git a/src/main/java/com/glxp/api/res/collect/RelCodeBatchResponse.java b/src/main/java/com/glxp/api/res/collect/RelCodeBatchResponse.java index 848b08a8..cc13680d 100644 --- a/src/main/java/com/glxp/api/res/collect/RelCodeBatchResponse.java +++ b/src/main/java/com/glxp/api/res/collect/RelCodeBatchResponse.java @@ -1,5 +1,7 @@ package com.glxp.api.res.collect; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -84,4 +86,28 @@ public class RelCodeBatchResponse { private Integer packLayer; private String erpId; + private String parentCode; + + /** + * curCode + */ + + @TableField(value = "curCode") + @ApiModelProperty(value = "") + private String curCode; + + + @TableField(value = "oneLevelCount") + @ApiModelProperty(value = "") + private Integer oneLevelCount; + + + @TableField(value = "twoLevelCount") + @ApiModelProperty(value = "") + private Integer twoLevelCount; + + + @TableField(value = "threeLevelCount") + @ApiModelProperty(value = "") + private Integer threeLevelCount; } diff --git a/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml b/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml index b750ea30..af6385a1 100644 --- a/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml @@ -42,7 +42,12 @@ bp.cpmctymc, bp.bhxjsl, bp.packLevel AS packLayer, - bp.packUnit + bp.packUnit, + a.parentCode, + a.curCode, + a.oneLevelCount, + a.twoLevelCount, + a.threeLevelCount from rel_code_batch a LEFT JOIN basic_products bp ON bp.nameCode = a.productCode @@ -59,7 +64,10 @@ and ( a.productCode LIKE concat('%', #{keyWords}, '%') or a.subTypeNo LIKE concat('%', #{keyWords}, '%') - or a.packageSpec LIKE concat('%', #{keyWords}, '%')) + or a.packageSpec LIKE concat('%', #{keyWords}, '%') + or a.curCode LIKE concat('%', #{keyWords}, '%') + or a.parentCode LIKE concat('%', #{keyWords}, '%') + ) AND a.lineName LIKE concat('%', #{lineName}, '%')