数据清洗字段修改

src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java

@@ -127,5 +127,15 @@ public class FilterUdiRelRequest extends ListPageRequest {
     private String payFeeCode;
 
     private String keyWords;
+    /**
+     * 无码类型 0、默认不是无码类型；1、部分早期未赋予追溯码；5、最小包装无追溯码；6、无追溯码；7、其他原因
+     */
+    private Integer notCodeType;
+
+    /**
+     * 是否已经人工审核  0：未审核；1：已审核
+     */
+    private Integer manuReview;
+
 
 }

src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java

@@ -285,39 +285,33 @@ public class UdiRelevanceResponse {
     public int getBhzxxsbzsl() {
         if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {
             return 1;
-        } else
+        } else return bhzxxsbzsl;
-            return bhzxxsbzsl;
     }
 
 
     public Boolean getAllowNoBatch() {
-        if (allowNoBatch == null)
+        if (allowNoBatch == null) return false;
-            return false;
         return allowNoBatch;
     }
 
     public Boolean getAllowNoExpire() {
-        if (allowNoExpire == null)
+        if (allowNoExpire == null) return false;
-            return false;
         return allowNoExpire;
     }
 
     public Boolean getAllowNoProduct() {
-        if (allowNoProduct == null)
+        if (allowNoProduct == null) return false;
-            return false;
         return allowNoProduct;
     }
 
     public Boolean getAllowNoSerial() {
 
-        if (allowNoSerial == null)
+        if (allowNoSerial == null) return true;
-            return true;
         return allowNoSerial;
     }
 
     public Boolean getUseDy() {
-        if (isUseDy == null)
+        if (isUseDy == null) return false;
-            return false;
         return isUseDy;
     }
 
@@ -337,4 +331,14 @@ public class UdiRelevanceResponse {
 
     private String zczbhhzbapzbhSys;
 
+    /**
+     * 无码类型 0、默认不是无码类型；1、部分早期未赋予追溯码；5、最小包装无追溯码；6、无追溯码；7、其他原因
+     */
+    private Integer notCodeType;
+
+    /**
+     * 是否已经人工审核  0：未审核；1：已审核
+     */
+    private Integer manuReview;
+
 }

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -411,8 +411,8 @@
 
     <select id="filterUdiGp" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
             resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
-        select
+        select IF((COUNT(DISTINCT IF(basic_products.bhltcjsl = 1, basic_products.bhsycjsl, 0)) - 1) > 1, '多种包装规格',
-        IF ( (COUNT(DISTINCT IF(basic_products.bhltcjsl = 1,basic_products.bhsycjsl,0))-1) > 1,'多种包装规格',basic_products.bzgg) AS bzgg,
+                  basic_products.bzgg) AS bzgg,
                basic_udirel.*,
                bht.name                   classifyName,
                basic_products.originUuid,
@@ -578,12 +578,16 @@
                     or thirdId3 LIKE concat('%', #{thrPiId}, '%')
                     or thirdId4 LIKE concat('%', #{thrPiId}, '%'))
             </if>
-            <if test="uuid != '' and uuid != null">
+            <if test="notCodeType != '' and notCodeType != null">
-                AND basic_udirel.uuid = #{uuid}
+                AND basic_udirel.notCodeType = #{notCodeType}
+            </if>
+            <if test="manuReview != '' and thirdId != null">
+                AND manuReview = #{manuReview}
             </if>
             <if test="thirdId != '' and thirdId != null">
                 AND thirdId = #{thirdId}
             </if>
+
             <if test="udplatCode != '' and udplatCode != null">
                 AND udplatCode = #{udplatCode}
             </if>
@@ -612,7 +616,8 @@
                     )
             </if>
             <if test="filterType != null and filterType == 2 and productsType == 2">
-                AND  ( (mainId = '' or mainId is null)  or  (basic_products.nameCode = '' or basic_products.nameCode is null)
+                AND ((mainId = '' or mainId is null) or
+                     (basic_products.nameCode = '' or basic_products.nameCode is null)
                     )
             </if>
             <if test="filterType != null and filterType == 3">
@@ -983,7 +988,6 @@
     </select>
 
 
-
     <select id="selectByThirdId" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
             resultType="com.glxp.api.entity.basic.UdiRelevanceEntity">
         select *