自报增加设备产品类别

quality/src/main/java/com/foreverwin/mesnac/quality/model/SelfReport.java

@@ -145,7 +145,19 @@ public class SelfReport extends Model<SelfReport> {
    @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;

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'
         <where>
             <if test="ew!=null">
                 <if test="ew.entity!=null">
@@ -598,6 +600,7 @@
                         </if>
                     </if>
                 </if>
+                <if test="ew.entity.productCategory!=null and ew.entity.productCategory!=''"> AND PC.VALUE LIKE '%'|| #{ew.entity.productCategory}|| '%' </if>
                 <if test="startTime!=null"> AND ZSR.CREATED_DATE_TIME >=#{startTime}</if>
                 <if test="endTime!=null"> AND ZSR.CREATED_DATE_TIME &lt;=#{endTime}</if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">