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}
- AND a2.spec = #{spec}
+ AND a2.spec like concat('%', #{spec}, '%')
AND a1.fromCorp = #{fromCorp}
@@ -48,19 +48,19 @@
AND b1.name = #{fromCorpName}
- AND a2.manufacturer = #{manufacturer}
+ AND a2.manufacturer like concat('%', #{manufacturer}, '%')
- AND a2.certCode = #{zczbhhzbapzbh}
+ AND a2.certCode like concat('%', #{zczbhhzbapzbh}, '%')
AND date_format(a1.auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and date_format(#{endAduditTime}, '%Y-%m-%d')
- AND a2.batchNo = #{batchNo}
+ AND a2.batchNo like concat('%', #{batchNo}, '%')
- AND a2.coName = #{coName}
+ AND a2.coName like concat('%', #{coName}, '%')
AND a2.coName like concat('%', #{productName}, '%')