1.添加模糊查询

2.修复物资字典导出目录不存在报错的问题
master
x_z 2 years ago
parent 6c15a88ca8
commit 8dcdb6d4b1

@ -2,11 +2,11 @@ package com.glxp.api.controller.basic;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.file.FileWriter; import cn.hutool.core.io.file.FileWriter;
import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.ReflectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.BasicProcessStatus;
import com.glxp.api.dao.basic.UdiProductDao; import com.glxp.api.dao.basic.UdiProductDao;
import com.glxp.api.dao.basic.UdiRelevanceDao; 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.dao.thrsys.ThrProductsDao;
import com.glxp.api.entity.basic.*; import com.glxp.api.entity.basic.*;
import com.glxp.api.entity.thrsys.ThrProductsEntity; 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.FilterThrCorpRequest;
import com.glxp.api.req.thrsys.FilterThrProductsRequest; import com.glxp.api.req.thrsys.FilterThrProductsRequest;
import com.glxp.api.res.basic.BasicCorpExportLogResponse; import com.glxp.api.res.basic.BasicCorpExportLogResponse;
@ -159,6 +162,9 @@ public class BasicGenJsonService {
File file = new File(basicProductsExportLogEntity.getFilePath()); File file = new File(basicProductsExportLogEntity.getFilePath());
if (!file.exists()) { if (!file.exists()) {
try { try {
if (!FileUtil.exist(file.getParentFile())) {
FileUtil.mkdir(file.getParentFile());
}
file.createNewFile(); file.createNewFile();
} catch (Exception e) { } catch (Exception e) {
log.error("导出医疗器械信息异常", e); log.error("导出医疗器械信息异常", e);

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

Loading…
Cancel
Save