api添加路径

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<OcrBasicTestMapper, OcrBasi
             Date endTime = searchDTO.getEndTime();
             query.le(OcrBasicTest::getCreateTime, endTime);
         }
-        //关键字比较，多个列or
+        Object patientId = searchDTO.getParams("patientId");
-        //if (!StringUtils.isEmpty(searchDTO.getKeyword())) {
+        Object inpatientNo = searchDTO.getParams("inpatientNo");
-        //单个列用like
+        Object name = searchDTO.getParams("name");
-        //query. like(OcrBasicTest::getxxx, searchDTO.getKeyword());
+        Object ocrStatue = searchDTO.getParams("ocrStatue");
-        //多个列用like
+
-        //query. and(sub -> sub.like(OcrBasicTest::getxx1, searchDTO.getKeyword())
+        if (Func.isNotEmpty(patientId)) {
-        // оr(). like(OcrBasicTest::getXX2, searchDTO.getKeyword()))
+            query.like(OcrBasicTest::getPatientId,String.format("%s%s%s","%", patientId,"%"));
-        //);
+        }
-        //}
+        if (Func.isNotEmpty(inpatientNo)) {
-        //默认createTime倒序排序
+            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<OcrBasicTest> list = super.find(query);
         return new PageResult<>(list);

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<OcrRuleMapper, OcrRule> implemen
         //分页
         PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize());
         LambdaQueryWrapper<OcrRule> query = Wrappers.lambdaQuery();
-        //时间范围，默认按createTime
+
-        if (searchDTO.getBeginTime() != null) {
+        Object assortId = searchDTO.getParams("assortId");
-            query.ge(OcrRule::getCreateTime, searchDTO.getBeginTime());
+        query.eq(OcrRule::getAssortId,assortId);
-        }
+
-        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()))
-        //);
-        //}
         //默认createTime倒序排序
         query.orderByDesc(OcrRule::getCreateTime);
         List<OcrRule> list = super.find(query);

docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrRuleTestDaoImpl.java

@@ -78,24 +78,10 @@ public class OcrRuleTestDaoImpl extends BaseDaoImpl<OcrRuleTestMapper, OcrRuleTe
         //分页
         PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize());
         LambdaQueryWrapper<OcrRuleTest> query = Wrappers.lambdaQuery();
-        //时间范围，默认按createTime
+
-//        if (searchDTO.getBeginTime() != null) {
+        Object assortId = searchDTO.getParams("assortId");
-//            query.ge(OcrRuleTest::getCreateTime, searchDTO.getBeginTime());
+        query.eq(OcrRuleTest::getAssortId,assortId);
-//        }
+
-//        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倒序排序
         query.orderByDesc(OcrRuleTest::getCreateTime);
         List<OcrRuleTest> list = super.find(query);
         return new PageResult<>(list);