diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java index 8eba1df8..bf9e6518 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java @@ -40,6 +40,33 @@ public class UdiRelevanceEntity { private boolean allowNoExpire; private boolean allowNoProduct; + //规格型号 + private String ggxh; + + //器械类别 + private String qxlb; + + //产品类别 + private String cplb; + + //分类编码 + private String flbm; + + //医疗器械注册人 + private String ylqxzcrbarmc; + + //注册人英文名称 + private String ylqxzcrbarywmc; + + //统一社会信用号 + private String tyshxydm; + + //注册证/备案号 + private String zczbhhzbapzbh; + + //产品描述 + private String cpms; + public Integer getLockStatus() { if (lockStatus == null) return 1; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java index de28d4fe..7040843c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.admin.service.basic.impl; +import cn.hutool.core.bean.BeanUtil; import com.github.pagehelper.PageHelper; import com.glxp.api.admin.constant.ConstantStatus; import com.glxp.api.admin.dao.basic.UdiInfoDao; @@ -282,10 +283,7 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService { } UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); - udiInfoEntity.setAllowNoBatch(udiRelevanceEntity.isAllowNoBatch()); - udiInfoEntity.setAllowNoExpire(udiRelevanceEntity.isAllowNoExpire()); - udiInfoEntity.setAllowNoProduct(udiRelevanceEntity.isAllowNoProduct()); - udiInfoEntity.setUuid(udiRelevanceEntity.getUuid()); + BeanUtil.copyProperties(udiRelevanceEntity, udiInfoEntity); udiInfoDao.updateUdiInfoByUuid(udiInfoEntity); return udiRelevanceDao.updateUdiRelevance(udiRelevanceEntity); } diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml index dbb638fb..a173d598 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml @@ -271,6 +271,16 @@ update basic_products + ggxh=#{ggxh}, + qxlb=#{qxlb}, + cplb=#{cplb}, + flbm=#{flbm}, + ylqxzcrbarmc=#{ylqxzcrbarmc}, + ylqxzcrbarywmc=#{ylqxzcrbarywmc}, + tyshxydm=#{tyshxydm}, + zczbhhzbapzbh=#{zczbhhzbapzbh}, + cpms=#{cpms}, + measname=#{measname}, allowNoBatch=#{allowNoBatch}, allowNoExpire=#{allowNoExpire}, allowNoProduct=#{allowNoProduct},