编码对照

api-admin/src/main/java/com/glxp/udidl/admin/controller/udplat/UdplatGoodsMatchController.java

@@ -2,6 +2,7 @@ package com.glxp.udidl.admin.controller.udplat;
 
 import com.glxp.udidl.admin.annotation.AuthRuleAnnotation;
 import com.glxp.udidl.admin.dto.udplat.UdplatGoodsMatchModel;
+import com.glxp.udidl.admin.dto.udplat.UdplatGoodsMatchParam;
 import com.glxp.udidl.admin.service.udplat.UdplatGoodsMatchService;
 import com.glxp.udidl.common.res.BaseResponse;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+
 @RestController
 @RequestMapping("/udplat/goodsMatch")
 public class UdplatGoodsMatchController {
@@ -18,7 +20,25 @@ public class UdplatGoodsMatchController {
 
     @AuthRuleAnnotation("udidl_udplatGoodsMatch_all")
     @PostMapping("/save")
-    public BaseResponse Save(@RequestBody UdplatGoodsMatchModel model){
-        return udplatGoodsMatchService.Save(model);
+    public BaseResponse save(@RequestBody UdplatGoodsMatchModel model){
+        return udplatGoodsMatchService.save(model);
+    }
+    @AuthRuleAnnotation("udidl_udplatGoodsMatch_all")
+    @PostMapping("/list")
+    public  BaseResponse getList(@RequestBody UdplatGoodsMatchParam param){
+        //System.out.println(JSONUtil.toJsonStr(param));
+        return udplatGoodsMatchService.getList(param);
+    }
+
+    @AuthRuleAnnotation("udidl_udplatGoodsMatch_all")
+    @PostMapping("/productlist")
+    public BaseResponse getProductList(String key){
+        return udplatGoodsMatchService.getProductList(key);
+    }
+
+    @AuthRuleAnnotation("udidl_udplatGoodsMatch_all")
+    @PostMapping("/productDetail")
+    public BaseResponse getProductInfoByUuid(String uuid){
+        return udplatGoodsMatchService.getProductInfoByUuid(uuid);
     }
 }

api-admin/src/main/java/com/glxp/udidl/admin/dao/udi/ProductInfoDao.java

@@ -1,5 +1,6 @@
 package com.glxp.udidl.admin.dao.udi;
 
+import com.glxp.udidl.admin.dto.device.ProductDetailModel;
 import com.glxp.udidl.admin.entity.udi.ProductInfoEntity;
 import com.glxp.udidl.admin.req.ListPageRequest;
 import com.glxp.udidl.admin.req.ProductInfoFilterRequest;
@@ -44,5 +45,5 @@ public interface ProductInfoDao {
     List<ProductInfoEntity> selectAllByUuid(@Param("ids") List<String> ids);
 
     List<String> findAllTyshxyh();
-
+    List<ProductDetailModel> selectByDeviceRecordKey(String key);
 }

api-admin/src/main/java/com/glxp/udidl/admin/dao/udplat/UdplatGoodsMatchMapper.java

@@ -1,5 +1,8 @@
 package com.glxp.udidl.admin.dao.udplat;
 
+import com.glxp.udidl.admin.dto.device.ProductGoodsMatchModel;
+import com.glxp.udidl.admin.dto.udplat.UdplatGoodsMatchListModel;
+import com.glxp.udidl.admin.dto.udplat.UdplatGoodsMatchParam;
 import com.glxp.udidl.admin.entity.udplat.UdplatGoodsMatch;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -17,5 +20,6 @@ public interface UdplatGoodsMatchMapper {
 
     int updateByPrimaryKey(UdplatGoodsMatch record);
     UdplatGoodsMatch selectByDeviceRecordKey(String id);
-    //List<UdplatGoodsMatchListModel> getList()
+    List<UdplatGoodsMatchListModel> getList(UdplatGoodsMatchParam param);
+    List<ProductGoodsMatchModel> getMatchList(String uuid);
 }

api-admin/src/main/java/com/glxp/udidl/admin/dto/device/ProductDetailModel.java

@@ -0,0 +1,11 @@
+package com.glxp.udidl.admin.dto.device;
+
+import lombok.Data;
+
+@Data
+public class ProductDetailModel {
+    private String nameCode;//产品标识
+    private String cpmctymc;//产品名称
+    private String packLevel;//包装级别
+    private String bzcj;//包装层级
+}

api-admin/src/main/java/com/glxp/udidl/admin/dto/device/ProductGoodsMatchModel.java

@@ -0,0 +1,10 @@
+package com.glxp.udidl.admin.dto.device;
+
+import com.glxp.udidl.admin.entity.udi.ProductInfoEntity;
+import lombok.Data;
+
+@Data
+public class ProductGoodsMatchModel extends ProductInfoEntity {
+    private String deliveryGoodId;//目录key
+    private String medicalCode;//医保编码
+}

api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatGoodsMatchListModel.java

@@ -0,0 +1,16 @@
+package com.glxp.udidl.admin.dto.udplat;
+
+import lombok.Data;
+
+@Data
+public class UdplatGoodsMatchListModel {
+    private String uuid;//uuid
+    private String nameCode;//最小销售单元产品标识
+    private String ylqxzcrbarmc;//注册/备案人名称
+    private String cpmctymc;//产品名称
+    private String ggxh;    //规格型号
+    private String cpms;    //产品描述
+    private String deviceRecordKey;//产品key
+    private String deliveryGoodId;//目录key
+    private String medicalCode;//医保编码
+}

api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatGoodsMatchModel.java

@@ -12,7 +12,7 @@ public class UdplatGoodsMatchModel {
     /**
      * 配送目录id
      */
-    private Integer deliveryGoodId;
+    private String deliveryGoodId;
 
     /**
      * 医保编码

api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatGoodsMatchParam.java

@@ -0,0 +1,9 @@
+package com.glxp.udidl.admin.dto.udplat;
+
+import lombok.Data;
+
+@Data
+public class UdplatGoodsMatchParam extends BaseParam{
+    private int goodsMatchType;//产品目录 0:全部 1:已对照  2：未对照
+    private int medicalMatchType;//医保编码 0:全部 1:已对照  2：未对照
+}

api-admin/src/main/java/com/glxp/udidl/admin/entity/udplat/UdplatGoods.java

@@ -7,14 +7,14 @@ import java.util.Date;
 
 @Data
 public class UdplatGoods {
-    private long id;
+    private Long id;
     private String uuid;
     private String deliveryGoodId;//配送目录ID/bigint
     private String projectGoodsCode;//联采目录编码/varchar(50)
     private String deliveryGoodsCode;//配送目录编码/varchar(50)
-    private long manufactureId;//平台生产企业ID/bigint(20)
+    private Long manufactureId;//平台生产企业ID/bigint(20)
     private String manufactureName;//平台生产企业名称/varchar(50)
-    private long distributorId; //平台配送企业ID/bigint(20)
+    private Long distributorId; //平台配送企业ID/bigint(20)
     private String distributorName;//平台配送企业名称/varchar(50)
     private String productName; //产品通用名/varchar(255)
     private Integer compId; //组件id/bigint
@@ -25,7 +25,7 @@ public class UdplatGoods {
     private String regNum;//注册证编号/varchar(255)
     private String regName;//注册证名称/varchar(255)
     private String regValidTo;//注册证有效期截止时间/varchar(255)
-    private long unionProjectId;//联采项目ID/bigint(20)
+    private Long unionProjectId;//联采项目ID/bigint(20)
     private String unionProjectName;//采购项目名称/varchar(255)
     private double salePrice;//价格/decimal(18,4)
     private String priceUnitText;//价格单位/varchar(100)

api-admin/src/main/java/com/glxp/udidl/admin/entity/udplat/UdplatGoodsMatch.java

@@ -26,7 +26,7 @@ public class UdplatGoodsMatch {
     /**
      * 配送目录id
      */
-    private Integer deliveryGoodId;
+    private String deliveryGoodId;
 
     /**
      * 医保编码

api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/UdplatGoodsMatchService.java

@@ -1,8 +1,12 @@
 package com.glxp.udidl.admin.service.udplat;
 
 import com.glxp.udidl.admin.dto.udplat.UdplatGoodsMatchModel;
+import com.glxp.udidl.admin.dto.udplat.UdplatGoodsMatchParam;
 import com.glxp.udidl.common.res.BaseResponse;
 
 public interface UdplatGoodsMatchService {
-    BaseResponse Save(UdplatGoodsMatchModel model);
+    BaseResponse save(UdplatGoodsMatchModel model);
+    BaseResponse getList(UdplatGoodsMatchParam param);
+    BaseResponse getProductList(String key);
+    BaseResponse getProductInfoByUuid(String uuid);
 }

api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/impl/UdplatGoodsMatchServiceImpl.java

@@ -1,9 +1,18 @@
 package com.glxp.udidl.admin.service.udplat.impl;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.glxp.udidl.admin.dao.udi.ProductInfoDao;
 import com.glxp.udidl.admin.dao.udplat.UdplatGoodsMatchMapper;
+import com.glxp.udidl.admin.dto.device.ProductDetailModel;
+import com.glxp.udidl.admin.dto.device.ProductGoodsMatchModel;
+import com.glxp.udidl.admin.dto.udplat.UdplatGoodsMatchListModel;
 import com.glxp.udidl.admin.dto.udplat.UdplatGoodsMatchModel;
+import com.glxp.udidl.admin.dto.udplat.UdplatGoodsMatchParam;
 import com.glxp.udidl.admin.entity.udplat.UdplatGoodsMatch;
+import com.glxp.udidl.admin.res.PageSimpleResponse;
 import com.glxp.udidl.admin.service.udplat.UdplatGoodsMatchService;
+import com.glxp.udidl.admin.util.DateUtil;
 import com.glxp.udidl.common.res.BaseResponse;
 import com.glxp.udidl.common.util.ResultVOUtils;
 import org.springframework.beans.BeanUtils;
@@ -11,14 +20,16 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.List;
 
 @Service
 public class UdplatGoodsMatchServiceImpl implements UdplatGoodsMatchService {
     @Autowired
     private UdplatGoodsMatchMapper udplatGoodsMatchMapper;
-
+    @Autowired
+    private ProductInfoDao productInfoDao;
     @Override
-    public BaseResponse Save(UdplatGoodsMatchModel model) {
+    public BaseResponse save(UdplatGoodsMatchModel model) {
         UdplatGoodsMatch udplatGoodsMatch = udplatGoodsMatchMapper.selectByDeviceRecordKey(model.getDeviceRecordKey());
         if(udplatGoodsMatch == null){
             udplatGoodsMatch = new UdplatGoodsMatch();
@@ -34,4 +45,26 @@ public class UdplatGoodsMatchServiceImpl implements UdplatGoodsMatchService {
         }
         return ResultVOUtils.success();
     }
+    public BaseResponse getList(UdplatGoodsMatchParam param){
+        PageHelper.startPage(param.getPage(), param.getLimit());
+        if (param.getEndDate() != null && !param.getEndDate().isEmpty())
+            param.setEndDate(DateUtil.formatDate(DateUtil.addDays(DateUtil.parseDate(param.getEndDate()), 1)));
+        List<UdplatGoodsMatchListModel> list = udplatGoodsMatchMapper.getList(param);
+        PageInfo<UdplatGoodsMatchListModel> pageInfo = new PageInfo<>(list);
+        PageSimpleResponse<UdplatGoodsMatchListModel> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(list);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+    public BaseResponse getProductList(String key){
+        List<ProductDetailModel> list = productInfoDao.selectByDeviceRecordKey(key);
+        return ResultVOUtils.success(list);
+    }
+    public BaseResponse getProductInfoByUuid(String uuid){
+        List<ProductGoodsMatchModel> productInfoEntityList = udplatGoodsMatchMapper.getMatchList(uuid);//productInfoDao.selectByUuid(uuid);
+        if(productInfoEntityList == null || productInfoEntityList.size()<1)
+            return ResultVOUtils.error(-1,"查无记录！");
+        else
+            return ResultVOUtils.success(productInfoEntityList.get(0));
+    }
 }

api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/impl/UdplatGoodsServiceImpl.java

@@ -1,5 +1,6 @@
 package com.glxp.udidl.admin.service.udplat.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.glxp.udidl.admin.dao.udplat.UdplatGoodsMapper;
@@ -45,29 +46,46 @@ public class UdplatGoodsServiceImpl implements UdplatGoodsService {
     }
     @Override
     public BaseResponse importExcel(InputStream is, int type) {
-        List<UdplatGoods> list;
+        int count=0;
         try{
             if(type == 1) {
                 List<HospitalGoods> list1 = getData1(is);
-                list = BeanUtils.convertList2List(list1,UdplatGoods.class);
+                //list = BeanUtils.convertList2List(list1,UdplatGoods.class);
+                if(list1 == null || list1.size()<1)
+                    return ResultVOUtils.error(-1,"无数据！");
+                count = SaveHospitalGoods(list1);
             }else
             if(type == 2){
                 List<DeliveryGoods> list2 = getData2(is);
                 //log.info(JSONUtil.toJsonStr(list2));
-                list = BeanUtils.convertList2List(list2,UdplatGoods.class);
+                //list = BeanUtils.convertList2List(list2,UdplatGoods.class);
+                if(list2 == null || list2.size()<1)
+                    return ResultVOUtils.error(-1,"无数据！");
+                count = SaveDeliveryGoods(list2);
             }else
                 return  ResultVOUtils.error(-1,"文件类型不匹配！");
-            return save(list);
+            UdplatLog udplatLog = new UdplatLog();
+            udplatLog.setDownloadType("import");
+            udplatLog.setTbName("udplat_goods");
+            udplatLog.setType("info");
+            udplatLog.setMsg("执行成功！");
+            udplatLog.setActionDate(DateUtil.parseDate(DateUtil.getDate()));
+            udplatLog.setTotalCount(count);
+            udplatLog.setCreateTime(new Date());
+            logService.insert(udplatLog);
+            return ResultVOUtils.success(count);
+            //return save(list);
         }catch (Exception e){
             UdplatLog udplatLog = new UdplatLog();
             udplatLog.setDownloadType("import");
             udplatLog.setTbName("udplat_goods");
             udplatLog.setType("error");
             udplatLog.setMsg(e.getMessage());
+            udplatLog.setContent(JSON.toJSONString(e.getStackTrace()));
             udplatLog.setActionDate(DateUtil.parseDate(DateUtil.getDate()));
             udplatLog.setCreateTime(new Date());
             logService.insert(udplatLog);
-            return ResultVOUtils.error(-1,"转换格式出错:"+e.getMessage());
+            return ResultVOUtils.error(-1,"出错了:"+e.getMessage());
         }
 
         //return ResultVOUtils.success();
@@ -80,7 +98,92 @@ public class UdplatGoodsServiceImpl implements UdplatGoodsService {
         ExcelUtil<DeliveryGoods> util = new ExcelUtil(DeliveryGoods.class);
         return util.importExcel(is);
     }
-    private BaseResponse save(List<UdplatGoods> list){
+    private int SaveHospitalGoods(List<HospitalGoods> list){
+        int count=0;
+        for(HospitalGoods item:list){
+            String goodId = item.getDeliveryGoodId();
+            if(goodId == null || goodId.isEmpty())
+                continue;
+            UdplatGoods goods = udplatGoodsMapper.selectByGoodId(goodId);
+            HospitalGoodsToUdplatGoods(item,goods);
+            if(goods.getId()>0){
+                goods.setUpdateTime(new Date());
+                udplatGoodsMapper.update(goods);
+            }else
+            {
+                goods.setUuid(BeanUtils.getUUId());
+                goods.setCreateTime(new Date());
+                udplatGoodsMapper.insert(goods);
+            }
+            count++;
+        }
+        return count;
+    }
+    private int SaveDeliveryGoods(List<DeliveryGoods> list){
+        int count=0;
+        for(DeliveryGoods item:list){
+            String goodId = item.getDeliveryGoodId();
+            if(goodId == null || goodId.isEmpty())
+                continue;
+            UdplatGoods goods = udplatGoodsMapper.selectByGoodId(goodId);
+            goods = DeliveryGoodsToUdplatGoods(item,goods);
+            System.out.println(JSON.toJSONString(goods));
+            if(goods.getId()>0L){
+                goods.setUpdateTime(new Date());
+                udplatGoodsMapper.update(goods);
+            }else
+            {
+                goods.setUuid(BeanUtils.getUUId());
+                goods.setCreateTime(new Date());
+                udplatGoodsMapper.insert(goods);
+            }
+            count++;
+        }
+        return count;
+    }
+    private void HospitalGoodsToUdplatGoods(HospitalGoods hospitalGoods, UdplatGoods udplatGoods){
+        if(udplatGoods == null){
+            udplatGoods = new UdplatGoods();
+            udplatGoods.setId(0L);
+        }
+        udplatGoods.setDeliveryGoodId(hospitalGoods.getDeliveryGoodId());
+        udplatGoods.setManufactureName(hospitalGoods.getManufactureName());
+        udplatGoods.setDistributorName(hospitalGoods.getDistributorName());
+        udplatGoods.setProductName(hospitalGoods.getProductName());
+        udplatGoods.setModel(hospitalGoods.getModel());
+        udplatGoods.setSpec(hospitalGoods.getSpec());
+        udplatGoods.setProdMaterial(hospitalGoods.getProdMaterial());
+        udplatGoods.setRegNum(hospitalGoods.getRegNum());
+        udplatGoods.setRegName(hospitalGoods.getRegName());
+        udplatGoods.setRegValidTo(hospitalGoods.getRegValidTo());
+        udplatGoods.setSalePrice(hospitalGoods.getSalePrice());
+        udplatGoods.setPriceUnitText(hospitalGoods.getPriceUnitText());
+        udplatGoods.setChangedContent(hospitalGoods.getChangedContent());
+        udplatGoods.setChangedTime(hospitalGoods.getChangedTime());
+        udplatGoods.setMedicalCode(hospitalGoods.getMedicalCode());
+    }
+    private UdplatGoods DeliveryGoodsToUdplatGoods(DeliveryGoods deliveryGoods, UdplatGoods udplatGoods){
+        if(udplatGoods == null)
+        {
+            udplatGoods = new UdplatGoods();
+            udplatGoods.setId(0L);
+        }
+        udplatGoods.setDeliveryGoodId(deliveryGoods.getDeliveryGoodId());
+        udplatGoods.setProductName(deliveryGoods.getProductName());
+        udplatGoods.setModel(deliveryGoods.getModel());
+        udplatGoods.setSpec(deliveryGoods.getSpec());
+        udplatGoods.setProdMaterial(deliveryGoods.getProdMaterial());
+        udplatGoods.setPackMaterial(deliveryGoods.getPackMaterial());
+        udplatGoods.setRegNum(deliveryGoods.getRegNum());
+        udplatGoods.setRegName(deliveryGoods.getRegName());
+        udplatGoods.setRegValidTo(deliveryGoods.getRegValidTo());
+        udplatGoods.setStockStatus(deliveryGoods.getStockStatus());
+        udplatGoods.setChangedContent(deliveryGoods.getChangedContent());
+        udplatGoods.setChangedTime(deliveryGoods.getChangedTime());
+        udplatGoods.setMedicalCode(deliveryGoods.getMedicalCode());
+        return udplatGoods;
+    }
+    /*private BaseResponse save(List<UdplatGoods> list){
         if(list == null || list.size()<1)
             return ResultVOUtils.error(-1,"无数据！");
         int count=0;
@@ -94,10 +197,11 @@ public class UdplatGoodsServiceImpl implements UdplatGoodsService {
                BeanUtils.copyProperties(item,goods);
                goods.setUpdateTime(new Date());
                udplatGoodsMapper.update(goods);
-            }else
+            }else{
                 item.setUuid(BeanUtils.getUUId());
                 item.setCreateTime(new Date());
                 udplatGoodsMapper.insert(item);
+            }
             count++;
         }
         UdplatLog udplatLog = new UdplatLog();
@@ -110,5 +214,5 @@ public class UdplatGoodsServiceImpl implements UdplatGoodsService {
         udplatLog.setCreateTime(new Date());
         logService.insert(udplatLog);
         return ResultVOUtils.success(count);
-    }
+    }*/
 }

api-admin/src/main/resources/mybatis/mapper/udi/ProductInfoDao.xml

@@ -443,4 +443,7 @@
         from productinfo
         group by tyshxydm
     </select>
+    <select id="selectByDeviceRecordKey" resultType="com.glxp.udidl.admin.dto.device.ProductDetailModel" parameterType="java.lang.String">
+        select nameCode,cpmctymc,packLevel,bzcj from productinfo where isNewest=1 and deviceRecordKey=#{key}
+    </select>
 </mapper>

api-admin/src/main/resources/mybatis/mapper/udplat/UdplatGoodsMapper.xml

@@ -41,7 +41,7 @@
         where id = #{id,jdbcType=BIGINT}
     </delete>
     <insert id="insert" parameterType="com.glxp.udidl.admin.entity.udplat.UdplatGoods">
-        insert into udplat_goods (id, uuid, deliveryGoodId,
+        insert into udplat_goods ( uuid, deliveryGoodId,
                                   projectGoodsCode, deliveryGoodsCode, manufactureId,
                                   manufactureName, distributorId, distributorName,
                                   productName, compId, model,
@@ -53,7 +53,7 @@
                                   changedTime, proxyName, onlineStatus,
                                   medicalCode, createTime
         )
-        values (#{id,jdbcType=BIGINT}, #{uuid,jdbcType=VARCHAR}, #{deliveryGoodId,jdbcType=VARCHAR},
+        values (#{uuid,jdbcType=VARCHAR}, #{deliveryGoodId,jdbcType=VARCHAR},
                 #{projectGoodsCode,jdbcType=VARCHAR}, #{deliveryGoodsCode,jdbcType=VARCHAR}, #{manufactureId,jdbcType=BIGINT},
                 #{manufactureName,jdbcType=VARCHAR}, #{distributorId,jdbcType=BIGINT}, #{distributorName,jdbcType=VARCHAR},
                 #{productName,jdbcType=VARCHAR}, #{compId,jdbcType=BIGINT}, #{model,jdbcType=VARCHAR},
@@ -68,7 +68,7 @@
     </insert>
     <update id="update" parameterType="com.glxp.udidl.admin.entity.udplat.UdplatGoods">
         update udplat_goods
-        set uuid = #{uuid,jdbcType=VARCHAR},
+        set
             deliveryGoodId = #{deliveryGoodId,jdbcType=VARCHAR},
             projectGoodsCode = #{projectGoodsCode,jdbcType=VARCHAR},
             deliveryGoodsCode = #{deliveryGoodsCode,jdbcType=VARCHAR},
@@ -98,7 +98,6 @@
             proxyName = #{proxyName,jdbcType=VARCHAR},
             onlineStatus = #{onlineStatus,jdbcType=INTEGER},
             medicalCode = #{medicalCode,jdbcType=VARCHAR},
-            createTime = #{createTime,jdbcType=TIMESTAMP},
             updateTime = #{updateTime,jdbcType=TIMESTAMP}
         where id = #{id,jdbcType=BIGINT}
     </update>

api-admin/src/main/resources/mybatis/mapper/udplat/UdplatGoodsMatchMapper.xml

@@ -4,7 +4,7 @@
   <resultMap id="BaseResultMap" type="com.glxp.udidl.admin.entity.udplat.UdplatGoodsMatch">
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="deviceRecordKey" jdbcType="VARCHAR" property="deviceRecordKey" />
-    <result column="deliveryGoodId" jdbcType="INTEGER" property="deliveryGoodId" />
+    <result column="deliveryGoodId" jdbcType="VARCHAR" property="deliveryGoodId" />
     <result column="medicalCode" jdbcType="VARCHAR" property="medicalCode" />
     <result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
     <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
@@ -17,7 +17,7 @@
     insert into udplat_goods_match (id, deviceRecordKey, deliveryGoodId, 
       medicalCode, createTime
       )
-    values (#{id,jdbcType=INTEGER}, #{deviceRecordKey,jdbcType=VARCHAR}, #{deliveryGoodId,jdbcType=INTEGER}, 
+    values (#{id,jdbcType=INTEGER}, #{deviceRecordKey,jdbcType=VARCHAR}, #{deliveryGoodId,jdbcType=VARCHAR},
       #{medicalCode,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}
       )
   </insert>
@@ -25,7 +25,7 @@
     update udplat_goods_match
     set deviceRecordKey = #{deviceRecordKey,jdbcType=VARCHAR},
     <if test="deliveryGoodId != null and deliveryGoodId !='' ">
-        deliveryGoodId = #{deliveryGoodId,jdbcType=INTEGER},
+        deliveryGoodId = #{deliveryGoodId,jdbcType=VARCHAR},
     </if>
     <if test="medicalCode != null and medicalCode !='' ">
         medicalCode = #{medicalCode,jdbcType=VARCHAR},
@@ -47,4 +47,33 @@
     from udplat_goods_match
     where deviceRecordKey = #{id}
   </select>
+  <select id="getList" parameterType="com.glxp.udidl.admin.dto.udplat.UdplatGoodsMatchParam" resultType="com.glxp.udidl.admin.dto.udplat.UdplatGoodsMatchListModel">
+    select p.uuid, p.nameCode,p.ylqxzcrbarmc, p.cpmctymc,p.ggxh,p.cpms,p.deviceRecordKey,m.deliveryGoodId,m.medicalCode from productinfo as p
+        left join udplat_goods_match as m on p.deviceRecordKey = m.deviceRecordKey where p.isNewest =1 and p.diType=1
+        <if test="name != null and name != ''">
+          and p.cpmctymc like concat(#{name},'%')
+        </if>
+        <if test="goodsMatchType == 1">
+          and m.deliveryGoodId is not null and m.deliveryGoodId != ''
+        </if>
+        <if test="goodsMatchType == 2">
+          and (m.deliveryGoodId is null or m.deliveryGoodId = '')
+        </if>
+        <if test="medicalMatchType == 1">
+          and m.medicalCode is not null and m.medicalCode != ''
+        </if>
+        <if test="medicalMatchType == 2">
+          and (m.medicalCode is null or m.medicalCode = '')
+        </if>
+        <if test="startDate != '' and startDate != null">
+          and p.updateTime >= #{startDate}
+        </if>
+        <if test="endDate != '' and endDate != null">
+          and  p.updateTime &lt;= #{endDate}
+        </if>
+  </select>
+    <select id="getMatchList" parameterType="java.lang.String" resultType="com.glxp.udidl.admin.dto.device.ProductGoodsMatchModel">
+        select p.*,m.deliveryGoodId,m.medicalCode from productinfo as p
+        left join udplat_goods_match as m on p.deviceRecordKey = m.deviceRecordKey where p.uuid=#{uuid}
+    </select>
 </mapper>

api-admin/target/classes/mybatis/mapper/udi/ProductInfoDao.xml

@@ -443,4 +443,7 @@
         from productinfo
         group by tyshxydm
     </select>
+    <select id="selectByDeviceRecordKey" resultType="com.glxp.udidl.admin.dto.device.ProductDetailModel" parameterType="java.lang.String">
+        select nameCode,cpmctymc,packLevel,bzcj from productinfo where isNewest=1 and deviceRecordKey=#{key}
+    </select>
 </mapper>