diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index 8f8cd162..b8d2e035 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -306,9 +306,9 @@ public class UdiRelevanceController { udiProductEntity.setCpms(udiRelevanceSaveRequest.getCpms()); udiProductEntity.setPrice(udiRelevanceSaveRequest.getPrice()); udiProductEntity.setSpmc(udiRelevanceSaveRequest.getSpmc()); -// udiProductEntity.setAllowNoBatch(udiRelevanceSaveRequest.getAllowNoBatch()); -// udiProductEntity.setAllowNoExpire(udiRelevanceSaveRequest.getAllowNoExpire()); -// udiProductEntity.setAllowNoProduct(udiRelevanceSaveRequest.getAllowNoProduct()); + udiProductEntity.setAllowNoBatch(udiRelevanceSaveRequest.getAllowNoBatch()); + udiProductEntity.setAllowNoExpire(udiRelevanceSaveRequest.getAllowNoExpire()); + udiProductEntity.setAllowNoProduct(udiRelevanceSaveRequest.getAllowNoProduct()); udiProductEntity.setZxxsbzbhsydysl(udiRelevanceEntity.getUseNum()); udiProductEntity.setBasicPrductRemak1(udiRelevanceSaveRequest.getBasicPrductRemak1()); udiProductEntity.setBasicPrductRemak2(udiRelevanceSaveRequest.getBasicPrductRemak2()); @@ -318,7 +318,7 @@ public class UdiRelevanceController { udiProductEntity.setBasicPrductRemak6(udiRelevanceSaveRequest.getBasicPrductRemak6()); udiProductEntity.setBasicPrductRemak7(udiRelevanceSaveRequest.getBasicPrductRemak7()); udiProductEntity.setBasicPrductRemak8(udiRelevanceSaveRequest.getBasicPrductRemak8()); - udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity); +// udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity); if (StrUtil.isNotEmpty(udiRelevanceSaveRequest.getOriginUuid())) { udiProductEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI); } diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java index 3e38a53a..dc0d134f 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java @@ -86,6 +86,8 @@ public class SupCertSetController { FilterCertSetsRequest filterCertSetsRequest=new FilterCertSetsRequest(); filterCertSetsRequest.setType(supCertSetEntity.getType()); filterCertSetsRequest.setName(supCertSetEntity.getName()); + filterCertSetsRequest.setId(supCertSetEntity.getId()); + filterCertSetsRequest.setUpdateType(1); List supCertEntityList = supCertSetService.filterCertSets(filterCertSetsRequest); if(supCertEntityList.size()!=0){ return ResultVOUtils.error(999,"证书已存在!"); diff --git a/src/main/java/com/glxp/api/entity/purchase/SupCertSetEntity.java b/src/main/java/com/glxp/api/entity/purchase/SupCertSetEntity.java index 357e3bdf..144dfd67 100644 --- a/src/main/java/com/glxp/api/entity/purchase/SupCertSetEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/SupCertSetEntity.java @@ -109,6 +109,7 @@ public class SupCertSetEntity { + public List getFlbmList() { if (StrUtil.isNotEmpty(flbm)) { return Arrays.asList(flbm.split(",")); diff --git a/src/main/java/com/glxp/api/req/purchase/FilterCertSetsRequest.java b/src/main/java/com/glxp/api/req/purchase/FilterCertSetsRequest.java index 5a1e558b..9cd31fe6 100644 --- a/src/main/java/com/glxp/api/req/purchase/FilterCertSetsRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/FilterCertSetsRequest.java @@ -8,10 +8,12 @@ import lombok.Data; public class FilterCertSetsRequest extends ListPageRequest { private String name; + private Integer id; private Integer type; private Integer need; private String lastUpdateTime; + private Integer updateType; } diff --git a/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml b/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml index 86803735..0a2cb1a1 100644 --- a/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml @@ -16,6 +16,9 @@ and `need` = #{need} + + and id != #{id} + = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index b7860a72..a8784ded 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -17,6 +17,7 @@ CALL Pro_Temp_ColumnWork('basic_udirel', 'lowStockNum', 'varchar(255) ', 1); CALL Pro_Temp_ColumnWork('basic_udirel', 'useExpireTime', 'int', 1); CALL Pro_Temp_ColumnWork('basic_udirel', 'dispatch', 'tinyint', 1); CALL Pro_Temp_ColumnWork('basic_udirel', 'groupBuy', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_udirel', 'isDateBy', 'tinyint', 1); CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailDispatch', 'tinyint', 1); CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailGroupBuy', 'tinyint', 1);