update

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java

@@ -1,9 +1,7 @@
 package org.jeecg.modules.database.controller;
 
 import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -15,8 +13,6 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.query.QueryRuleEnum;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.modules.database.constant.ExperimentStatus;
 import org.jeecg.modules.database.entity.*;
@@ -85,17 +81,17 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
     public Result<IPage<Experiment>> queryPageList(Experiment experiment, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                    HttpServletRequest req) {
-        Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
+        //Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
         // 自定义duoXuan字段的查询规则为：LIKE_WITH_OR
-        customeRuleMap.put("startDate", QueryRuleEnum.RIGHT_LIKE);
+        //customeRuleMap.put("startDate", QueryRuleEnum.RIGHT_LIKE);
-
+        //
-        Map<String, String[]> parameterMap = req.getParameterMap();
+        //Map<String, String[]> parameterMap = req.getParameterMap();
-        QueryWrapper<Experiment> queryWrapper = QueryGenerator.initQueryWrapper(experiment, parameterMap, customeRuleMap);
+        //QueryWrapper<Experiment> queryWrapper = QueryGenerator.initQueryWrapper(experiment, parameterMap, customeRuleMap);
         Page<Experiment> page = new Page<>(pageNo, pageSize);
-        if (!parameterMap.containsKey("column") || StringUtils.isBlank(parameterMap.get("column")[0])) {
+        //if (!parameterMap.containsKey("column") || StringUtils.isBlank(parameterMap.get("column")[0])) {
-            page.addOrder(OrderItem.asc("index_no"));
+        //    page.addOrder(OrderItem.asc("index_no"));
-        }
+        //}
-        IPage<Experiment> pageList = experimentService.page(page, queryWrapper);
+        IPage<Experiment> pageList = experimentService.join(page, experiment, null);
         pageList.getRecords().forEach(v -> experimentService.fetchExperimentDetail(v));
         return Result.OK(pageList);
     }

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java

@@ -195,7 +195,7 @@ public class Experiment implements Serializable {
     @TableField(exist = false)
     private String sampleName;
     @TableField(exist = false)
-    private String equipmentMode;
+    private String equipmentModel;
     private String sampleModel;
 
     //@TableField(exist = false)

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentMapper.java

@@ -1,6 +1,8 @@
 package org.jeecg.modules.database.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.database.entity.Experiment;
 
 /**
@@ -11,4 +13,5 @@ import org.jeecg.modules.database.entity.Experiment;
  */
 public interface ExperimentMapper extends BaseMapper<Experiment> {
 
+    IPage<Experiment> join(Page<Experiment> page, Experiment experiment);
 }

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentMapper.xml

@@ -2,4 +2,29 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.database.mapper.ExperimentMapper">
 
+
+    <select id="join" resultType="org.jeecg.modules.database.entity.Experiment">
+        select *
+        from experiment e
+        LEFT JOIN experiment_sample_info s ON s.experiment_id = e.id
+        left join experiment_deviation_equipment d on d.experiment_id = e.id
+        <where>
+            <if test="experiment.sampleType != null and experiment.sampleType != ''">
+                and s.sample_type like concat('%', #{experiment.sampleType}, '%')
+            </if>
+
+            <if test="experiment.sampleModel != null and experiment.sampleModel != ''">
+                and s.sample_model like concat('%', #{experiment.sampleModel}, '%')
+            </if>
+
+            <if test="experiment.sampleName != null and experiment.sampleName != ''">
+                and s.sample_name like concat('%', #{experiment.sampleName}, '%')
+            </if>
+
+            <if test="experiment.equipmentModel != null and experiment.equipmentModel != ''">
+                and d.equipment_model like concat('%', #{experiment.equipmentModel}, '%')
+            </if>
+        </where>
+
+    </select>
 </mapper>

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentService.java

@@ -1,5 +1,8 @@
 package org.jeecg.modules.database.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.database.entity.Experiment;
 
@@ -21,4 +24,5 @@ public interface IExperimentService extends IService<Experiment> {
 
     Integer getLastIndex();
 
+    IPage<Experiment> join(Page<Experiment> page, Experiment experiment, QueryWrapper<Experiment> queryWrapper);
 }

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java

@@ -4,6 +4,9 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.modules.database.constant.ExperimentStatus;
@@ -270,4 +273,9 @@ public class ExperimentServiceImpl extends ServiceImpl<ExperimentMapper, Experim
 
         return one.getIndexNo();
     }
+
+    @Override
+    public IPage<Experiment> join(Page<Experiment> page, Experiment experiment, QueryWrapper<Experiment> queryWrapper) {
+        return baseMapper.join(page, experiment);
+    }
 }