diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/model/SelfReport.java b/quality/src/main/java/com/foreverwin/mesnac/quality/model/SelfReport.java index d26629f9..bf6b6302 100644 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/model/SelfReport.java +++ b/quality/src/main/java/com/foreverwin/mesnac/quality/model/SelfReport.java @@ -145,7 +145,19 @@ public class SelfReport extends Model { @TableField(exist = false) private String description; + /** + * 产品类型 + */ + @TableField(exist = false) + private String productCategory; + public String getProductCategory() { + return productCategory; + } + + public void setProductCategory(String productCategory) { + this.productCategory = productCategory; + } public String getHandle() { return handle; diff --git a/quality/src/main/resources/mapper/SelfReportMapper.xml b/quality/src/main/resources/mapper/SelfReportMapper.xml index de56462e..11fdb2e8 100644 --- a/quality/src/main/resources/mapper/SelfReportMapper.xml +++ b/quality/src/main/resources/mapper/SelfReportMapper.xml @@ -563,6 +563,8 @@ JOIN ITEM I ON I.ITEM = ZSR.ITEM AND I.CURRENT_REVISION='true' LEFT JOIN ITEM_T IT ON I.HANDLE = IT.ITEM_BO AND IT.LOCALE = #{locale} LEFT JOIN Z_NWA_USER B ON ZSR.SITE = B.SITE AND ZSR.CREATE_USER = B.USER_NAME + JOIN SHOP_ORDER SO ON SO.shop_order=zsr.SHOP_order and so.site=zsr.site + LEFT JOIN CUSTOM_FIELDS PC ON PC.HANDLE = SO.HANDLE AND PC."ATTRIBUTE" = 'PRODUCT_CATEGORY' @@ -598,6 +600,7 @@ + AND PC.VALUE LIKE '%'|| #{ew.entity.productCategory}|| '%' AND ZSR.CREATED_DATE_TIME >=#{startTime} AND ZSR.CREATED_DATE_TIME <=#{endTime}