From 123ba8afe4fd476e77a76e8fa6e160e302d32253 Mon Sep 17 00:00:00 2001 From: zhanglb Date: Wed, 30 Aug 2023 15:07:17 +0800 Subject: [PATCH] =?UTF-8?q?api=E6=B7=BB=E5=8A=A0=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/impl/OcrBasicTestDaoImpl.java | 30 ++++++++++++------- .../dao/impl/OcrRuleDaoImpl.java | 22 ++++---------- .../dao/impl/OcrRuleTestDaoImpl.java | 22 +++----------- 3 files changed, 29 insertions(+), 45 deletions(-) diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrBasicTestDaoImpl.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrBasicTestDaoImpl.java index 8af64fd..fbe07ca 100644 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrBasicTestDaoImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrBasicTestDaoImpl.java @@ -2,6 +2,7 @@ package com.docus.server.infrastructure.dao.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.docus.core.util.Func; import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; @@ -86,16 +87,25 @@ public class OcrBasicTestDaoImpl extends BaseDaoImpl sub.like(OcrBasicTest::getxx1, searchDTO.getKeyword()) - // оr(). like(OcrBasicTest::getXX2, searchDTO.getKeyword())) - //); - //} - //默认createTime倒序排序 + Object patientId = searchDTO.getParams("patientId"); + Object inpatientNo = searchDTO.getParams("inpatientNo"); + Object name = searchDTO.getParams("name"); + Object ocrStatue = searchDTO.getParams("ocrStatue"); + + if (Func.isNotEmpty(patientId)) { + query.like(OcrBasicTest::getPatientId,String.format("%s%s%s","%", patientId,"%")); + } + if (Func.isNotEmpty(inpatientNo)) { + query.like(OcrBasicTest::getInpatientNo, String.format("%s%s%s","%", inpatientNo,"%")); + } + if (Func.isNotEmpty(name)) { + query.like(OcrBasicTest::getName, String.format("%s%s%s","%", name,"%")); + } + if (Func.isNotEmpty(ocrStatue)) { + query.eq(OcrBasicTest::getOcrStatue, ocrStatue); + } + + query.orderByDesc(OcrBasicTest::getCreateTime); List list = super.find(query); return new PageResult<>(list); diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrRuleDaoImpl.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrRuleDaoImpl.java index eb41a8f..770966a 100644 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrRuleDaoImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrRuleDaoImpl.java @@ -6,6 +6,7 @@ import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; import com.docus.server.entity.segmentation.OcrRule; +import com.docus.server.entity.segmentation.OcrRuleTest; import com.docus.server.infrastructure.dao.IOcrRuleDao; import com.docus.server.infrastructure.mapper.OcrRuleMapper; import com.github.pagehelper.PageHelper; @@ -78,23 +79,10 @@ public class OcrRuleDaoImpl extends BaseDaoImpl implemen //分页 PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize()); LambdaQueryWrapper query = Wrappers.lambdaQuery(); - //时间范围，默认按createTime - if (searchDTO.getBeginTime() != null) { - query.ge(OcrRule::getCreateTime, searchDTO.getBeginTime()); - } - if (searchDTO.getEndTime() != null) { - Date endTime = searchDTO.getEndTime(); - query.le(OcrRule::getCreateTime, endTime); - } - //关键字比较，多个列or - //if (!StringUtils.isEmpty(searchDTO.getKeyword())) { - //单个列用like - //query. like(OcrRule::getxxx, searchDTO.getKeyword()); - //多个列用like - //query. and(sub -> sub.like(OcrRule::getxx1, searchDTO.getKeyword()) - // оr(). like(OcrRule::getXX2, searchDTO.getKeyword())) - //); - //} + + Object assortId = searchDTO.getParams("assortId"); + query.eq(OcrRule::getAssortId,assortId); + //默认createTime倒序排序 query.orderByDesc(OcrRule::getCreateTime); List list = super.find(query); diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrRuleTestDaoImpl.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrRuleTestDaoImpl.java index 6031695..de34115 100644 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrRuleTestDaoImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrRuleTestDaoImpl.java @@ -78,24 +78,10 @@ public class OcrRuleTestDaoImpl extends BaseDaoImpl query = Wrappers.lambdaQuery(); - //时间范围，默认按createTime -// if (searchDTO.getBeginTime() != null) { -// query.ge(OcrRuleTest::getCreateTime, searchDTO.getBeginTime()); -// } -// if (searchDTO.getEndTime() != null) { -// Date endTime = searchDTO.getEndTime(); -// query.le(OcrRuleTest::getCreateTime, endTime); -// } - //关键字比较，多个列or - //if (!StringUtils.isEmpty(searchDTO.getKeyword())) { - //单个列用like - //query. like(OcrRuleTest::getxxx, searchDTO.getKeyword()); - //多个列用like - //query. and(sub -> sub.like(OcrRuleTest::getxx1, searchDTO.getKeyword()) - // оr(). like(OcrRuleTest::getXX2, searchDTO.getKeyword())) - //); - //} - //默认createTime倒序排序 + + Object assortId = searchDTO.getParams("assortId"); + query.eq(OcrRuleTest::getAssortId,assortId); + query.orderByDesc(OcrRuleTest::getCreateTime); List list = super.find(query); return new PageResult<>(list);