From 8dcdb6d4b1f874843191636b4d0290e8de0279f0 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Mon, 10 Apr 2023 11:58:13 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E6=A8=A1=E7=B3=8A=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=202.=E4=BF=AE=E5=A4=8D=E7=89=A9=E8=B5=84=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E5=AF=BC=E5=87=BA=E7=9B=AE=E5=BD=95=E4=B8=8D=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/controller/basic/BasicGenJsonService.java | 10 ++++++++--
 .../mybatis/mapper/inout/IoOrderDetailResultDao.xml    | 10 +++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java b/src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java
index 4e81448c..d9b5cd62 100644
--- a/src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java
+++ b/src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java
@@ -2,11 +2,11 @@ package com.glxp.api.controller.basic;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.file.FileWriter;
 import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
-
 import com.glxp.api.constant.BasicProcessStatus;
 import com.glxp.api.dao.basic.UdiProductDao;
 import com.glxp.api.dao.basic.UdiRelevanceDao;
@@ -14,7 +14,10 @@ import com.glxp.api.dao.thrsys.ThrCorpDao;
 import com.glxp.api.dao.thrsys.ThrProductsDao;
 import com.glxp.api.entity.basic.*;
 import com.glxp.api.entity.thrsys.ThrProductsEntity;
-import com.glxp.api.req.basic.*;
+import com.glxp.api.req.basic.BasicCorpsExportRequest;
+import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest;
+import com.glxp.api.req.basic.FilterUdiRelRequest;
+import com.glxp.api.req.basic.UdiInfoExportRequest;
 import com.glxp.api.req.thrsys.FilterThrCorpRequest;
 import com.glxp.api.req.thrsys.FilterThrProductsRequest;
 import com.glxp.api.res.basic.BasicCorpExportLogResponse;
@@ -159,6 +162,9 @@ public class BasicGenJsonService {
         File file = new File(basicProductsExportLogEntity.getFilePath());
         if (!file.exists()) {
             try {
+                if (!FileUtil.exist(file.getParentFile())) {
+                    FileUtil.mkdir(file.getParentFile());
+                }
                 file.createNewFile();
             } catch (Exception e) {
                 log.error("导出医疗器械信息异常", e);
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
index de295c9b..65122bf5 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
@@ -39,7 +39,7 @@
                 AND a2.nameCode = #{nameCode}
             </if>
             <if test="spec != null and spec != ''">
-                AND a2.spec = #{spec}
+                AND a2.spec like concat('%', #{spec}, '%')
             </if>
             <if test="fromCorp != null and fromCorp != ''">
                 AND a1.fromCorp = #{fromCorp}
@@ -48,19 +48,19 @@
                 AND b1.name = #{fromCorpName}
             </if>
             <if test="manufacturer != null and manufacturer != ''">
-                AND a2.manufacturer = #{manufacturer}
+                AND a2.manufacturer like concat('%', #{manufacturer}, '%')
             </if>
             <if test="zczbhhzbapzbh != null and zczbhhzbapzbh != ''">
-                AND a2.certCode = #{zczbhhzbapzbh}
+                AND a2.certCode like concat('%', #{zczbhhzbapzbh}, '%')
             </if>
             <if test="startAduditTime != null and startAduditTime != '' and endAduditTime != null and endAduditTime != ''">
                 AND date_format(a1.auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and date_format(#{endAduditTime}, '%Y-%m-%d')
             </if>
             <if test="batchNo != null and batchNo != ''">
-                AND a2.batchNo = #{batchNo}
+                AND a2.batchNo like concat('%', #{batchNo}, '%')
             </if>
             <if test="coName != null and coName != ''">
-                AND a2.coName = #{coName}
+                AND a2.coName like concat('%', #{coName}, '%')
             </if>
             <if test="productName != null and productName != ''">
                 AND a2.coName like concat('%', #{productName}, '%')