From 986eb2132a6008462762add18686dbcbf9c4ed75 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Wed, 26 Oct 2022 17:57:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96UDI=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/device/ProductInfoController.java  | 15 +++++++++++----
 src/main/resources/application.yml                |  2 +-
 .../mybatis/mapper/udi/ProductInfoMapper.xml      |  3 +++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/glxp/udidl/admin/controller/device/ProductInfoController.java b/src/main/java/com/glxp/udidl/admin/controller/device/ProductInfoController.java
index a00389f..8b84bff 100644
--- a/src/main/java/com/glxp/udidl/admin/controller/device/ProductInfoController.java
+++ b/src/main/java/com/glxp/udidl/admin/controller/device/ProductInfoController.java
@@ -50,13 +50,13 @@ public class ProductInfoController {
     @AuthRuleAnnotation("udidl/device/findBydi")
     @ApiImplicitParams({@ApiImplicitParam(name = "nameCode", value = "UDI码", required = true)})
     @GetMapping("udidl/device/findBydi")
-
     public BaseResponse findProductInfo(String nameCode) {
         ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest();
         String key = nameCode;
         if (key != null) {
             key = FilterUdiUtils.getDiStr(key);
             productInfoFilterRequest.setNameCode(key);
+            productInfoFilterRequest.setIsNewest(1);
         }
         if (StrUtil.isEmpty(productInfoFilterRequest.getNameCode())) {
             return ResultVOUtils.error(500, "UDI码不能为空");
@@ -99,6 +99,7 @@ public class ProductInfoController {
         if (udiEntity == null) {
             return ResultVOUtils.error(500, "UDI码格式错误！");
         }
+        productInfoFilterRequest.setIsNewest(1);
         productInfoFilterRequest.setNameCode(udiEntity.getUdi());
         List<ProductInfoEntity> productInfoEntityList = productInfoService.findAll(productInfoFilterRequest);
         ProductInfoResponse productInfoResponse = new ProductInfoResponse();
@@ -192,6 +193,10 @@ public class ProductInfoController {
             }
         }
         productInfoFilterRequest.setIsNewest(1);
+
+        if (StrUtil.isEmpty(productInfoFilterRequest.getNameCode())) {
+            productInfoFilterRequest.setDiType("1");
+        }
         List<ProductInfoEntity> productInfoEntityList = productInfoService.filterUdi(productInfoFilterRequest);
         PageInfo<ProductInfoEntity> pageInfo;
         pageInfo = new PageInfo<>(productInfoEntityList);
@@ -228,7 +233,6 @@ public class ProductInfoController {
             return ResultVOUtils.error(500, "请输入完整的医疗器械注册备案人名称！");
         }
 
-
         if ((productInfoFilterRequest.getYlqxzcrbarmc() == null || productInfoFilterRequest.getYlqxzcrbarmc().equals(""))
                 && (productInfoFilterRequest.getNameCode() == null || productInfoFilterRequest.getNameCode().equals(""))
                 && (productInfoFilterRequest.getCpmctymc() == null || productInfoFilterRequest.getCpmctymc().equals(""))
@@ -247,6 +251,7 @@ public class ProductInfoController {
         }
         productInfoFilterRequest.setIsNewest(1);
 
+
         String keyCache = productInfoFilterRequest.toCacheKey();
         if (StrUtil.isEmpty(keyCache)) {
             return ResultVOUtils.error(500, "查询条件不能为空！");
@@ -259,7 +264,9 @@ public class ProductInfoController {
         } else {
             total = Long.parseLong(totalStr);
         }
-
+        if (StrUtil.isEmpty(productInfoFilterRequest.getNameCode())) {
+            productInfoFilterRequest.setDiType("1");
+        }
         List<ProductInfoEntity> productInfoEntityList = productInfoService.filterUdiNoPage(productInfoFilterRequest);
         PageSimpleResponse<ProductInfoEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(total);
@@ -411,7 +418,7 @@ public class ProductInfoController {
                     if (checkSuccess) {
                         return ResultVOUtils.success(productInfoEntity);
                     } else {
-                        return ResultVOUtils.error(500, "UDI码格式错误,缺少"+lostMsg.substring(1));
+                        return ResultVOUtils.error(500, "UDI码格式错误,缺少" + lostMsg.substring(1));
                     }
                 }
             } else {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 44d07c6..122d21b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -2,7 +2,7 @@ server:
   port: 9994
 spring:
   profiles:
-    active: pro
+    active: dev
   jmx:
     enabled: false
 
diff --git a/src/main/resources/mybatis/mapper/udi/ProductInfoMapper.xml b/src/main/resources/mybatis/mapper/udi/ProductInfoMapper.xml
index efa4700..9852130 100644
--- a/src/main/resources/mybatis/mapper/udi/ProductInfoMapper.xml
+++ b/src/main/resources/mybatis/mapper/udi/ProductInfoMapper.xml
@@ -19,6 +19,9 @@
             <if test="uuid != '' and uuid != null">
                 AND uuid = #{uuid}
             </if>
+            <if test="isNewest != null">
+                AND isNewest = #{isNewest}
+            </if>
             <if test="deviceRecordKey != '' and deviceRecordKey != null">
                 AND deviceRecordKey = #{deviceRecordKey}
             </if>