修改耗材维护编辑不能勾选和资质bug

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);
         }

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<SupCertSetEntity> supCertEntityList = supCertSetService.filterCertSets(filterCertSetsRequest);
         if(supCertEntityList.size()!=0){
             return ResultVOUtils.error(999,"证书已存在!");

src/main/java/com/glxp/api/entity/purchase/SupCertSetEntity.java

@@ -109,6 +109,7 @@ public class SupCertSetEntity {
 
 
 
+
     public List<String> getFlbmList() {
         if (StrUtil.isNotEmpty(flbm)) {
             return Arrays.asList(flbm.split(","));

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;
 
 
 }

src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml

@@ -16,6 +16,9 @@
             <if test="need!=null">
                 and `need` = #{need}
             </if>
+            <if test="updateType!=null">
+                and id != #{id}
+            </if>
             <if test="lastUpdateTime!=null and lastUpdateTime!=''">
                 <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
             </if>

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);