diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java index d51adc94..6eaac046 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java +++ b/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; + } diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java index 90f08ef1..7532a4c4 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/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 - return bhzxxsbzsl; + } else return bhzxxsbzsl; } public Boolean getAllowNoBatch() { - if (allowNoBatch == null) - return false; + if (allowNoBatch == null) return false; return allowNoBatch; } public Boolean getAllowNoExpire() { - if (allowNoExpire == null) - return false; + if (allowNoExpire == null) return false; return allowNoExpire; } public Boolean getAllowNoProduct() { - if (allowNoProduct == null) - return false; + if (allowNoProduct == null) return false; return allowNoProduct; } public Boolean getAllowNoSerial() { - if (allowNoSerial == null) - return true; + if (allowNoSerial == null) return true; return allowNoSerial; } public Boolean getUseDy() { - if (isUseDy == null) - return false; + if (isUseDy == null) 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; + } diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 8da82ac7..0ef44037 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -411,10 +411,10 @@ @@ -983,7 +988,6 @@ -