1.产品信息实体类字段补全

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;

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

api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml

@@ -271,6 +271,16 @@
     <update id="updateUdiInfoByUuid" parameterType="com.glxp.api.admin.entity.basic.UdiInfoEntity">
         update basic_products
             <trim prefix="set" suffixOverrides=",">
+                <if test="ggxh != null">ggxh=#{ggxh},</if>
+                <if test="qxlb != null">qxlb=#{qxlb},</if>
+                <if test="cplb != null">cplb=#{cplb},</if>
+                <if test="flbm != null">flbm=#{flbm},</if>
+                <if test="ylqxzcrbarmc != null">ylqxzcrbarmc=#{ylqxzcrbarmc},</if>
+                <if test="ylqxzcrbarywmc != null">ylqxzcrbarywmc=#{ylqxzcrbarywmc},</if>
+                <if test="tyshxydm != null">tyshxydm=#{tyshxydm},</if>
+                <if test="zczbhhzbapzbh != null">zczbhhzbapzbh=#{zczbhhzbapzbh},</if>
+                <if test="cpms != null">cpms=#{cpms},</if>
+                <if test="measname != null">measname=#{measname},</if>
                 <if test="allowNoBatch != null">allowNoBatch=#{allowNoBatch},</if>
                 <if test="allowNoExpire != null">allowNoExpire=#{allowNoExpire},</if>
                 <if test="allowNoProduct != null">allowNoProduct=#{allowNoProduct},</if>