From 21a72e9d74fa89d5a4ec30352658c16077fab948 Mon Sep 17 00:00:00 2001
From: yitonglei <ytl653@163.com>
Date: Mon, 26 Sep 2022 19:21:44 +0800
Subject: [PATCH] 1

---
 .../DetermineFormulaController.java           | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/DetermineFormulaController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/DetermineFormulaController.java
index d7a77f1..0804bc9 100644
--- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/DetermineFormulaController.java
+++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/DetermineFormulaController.java
@@ -48,23 +48,24 @@ public class DetermineFormulaController extends BladeController {
     public R<IPage<DetermineFormula>> list(DetermineFormula entry, Query query) {
         LambdaQueryWrapper<DetermineFormula> wrapper = new LambdaQueryWrapper<>();
         if (entry.getFormula() != null) {
+            wrapper.eq(DetermineFormula::getType, entry.getType());
             wrapper.like(DetermineFormula::getFormula, entry.getFormula()).or();
-            wrapper.like(DetermineFormula::getStructure, entry.getFormula()).or();
-            wrapper.like(DetermineFormula::getForExamine, entry.getFormula());
+            wrapper.like(DetermineFormula::getStructure, entry.getStructure()).or();
+            wrapper.like(DetermineFormula::getDescription, entry.getDescription());
         }
         wrapper.orderByDesc(DetermineFormula::getCreateTime);
         IPage<DetermineFormula> page = service.page(Condition.getPage(query), wrapper);
         return R.data(page);
     }
 
-    /**
-     *
-     */
-    @PostMapping("/update")
-    @ApiOperation(value = "更改", notes = "更改")
-    public R update(@RequestBody DetermineFormula entry) {
-        return R.data(service.updateById(entry));
-    }
+//    /**
+//     *
+//     */
+//    @PostMapping("/update")
+//    @ApiOperation(value = "更改", notes = "更改")
+//    public R update(@RequestBody DetermineFormula entry) {
+//        return R.data(service.updateById(entry));
+//    }
 
     /**
      *
@@ -83,14 +84,14 @@ public class DetermineFormulaController extends BladeController {
         return R.data(service.save(entry));
     }
 
-    /**
-     * 删除
-     */
-    @PostMapping("/deleteByIds")
-    @ApiOperation(value = "逻辑删除", notes = "传入ids")
-    public R deleteByIds(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-        return R.status(service.deleteLogic(Func.toLongList(ids)));
-    }
+//    /**
+//     * 删除
+//     */
+//    @PostMapping("/deleteByIds")
+//    @ApiOperation(value = "逻辑删除", notes = "传入ids")
+//    public R deleteByIds(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+//        return R.status(service.deleteLogic(Func.toLongList(ids)));
+//    }
 
     /**
      * 根据公式的字符串识别公式中参数