diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentSampleInfoController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentSampleInfoController.java index 7cdcc65..a23006a 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentSampleInfoController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentSampleInfoController.java @@ -58,6 +58,27 @@ public class ExperimentSampleInfoController extends JeecgController> listSampleModel(HttpServletRequest req) { + List pageList = experimentSampleInfoService.listSampleModel(); + return Result.OK(pageList); + } + + @Operation(summary = "试验样品信息-列表查询样品批次") + @GetMapping(value = "/listSampleBatch") + public Result> listSampleBatch(HttpServletRequest req) { + List pageList = experimentSampleInfoService.listSampleBatch(); + return Result.OK(pageList); + } + + @Operation(summary = "试验样品信息-分页列表名称型号") + @GetMapping(value = "/listSampleName") + public Result> listSampleName(HttpServletRequest req) { + List pageList = experimentSampleInfoService.listSampleName(); + return Result.OK(pageList); + } + @Operation(summary = "试验样品信息-列表查询") @GetMapping(value = "/search") public Result> search(ExperimentSampleInfo experimentSampleInfo, HttpServletRequest req) { diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentSampleInfoMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentSampleInfoMapper.java index 57114a7..eb7fcda 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentSampleInfoMapper.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentSampleInfoMapper.java @@ -1,8 +1,11 @@ package org.jeecg.modules.database.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Select; import org.jeecg.modules.database.entity.ExperimentSampleInfo; +import java.util.List; + /** * @Description: 试验样品信息 * @Author: jeecg-boot @@ -11,4 +14,13 @@ import org.jeecg.modules.database.entity.ExperimentSampleInfo; */ public interface ExperimentSampleInfoMapper extends BaseMapper { + @Select("SELECT distinct sample_model FROM experiment_sample_info") + List listSampleModel(); + + @Select("SELECT distinct sample_batch FROM experiment_sample_info") + List listSampleBatch(); + + @Select("SELECT distinct sample_name,sample_type FROM experiment_sample_info") + List listSampleName(); + } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentSampleInfoService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentSampleInfoService.java index fe34466..46be13d 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentSampleInfoService.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentSampleInfoService.java @@ -14,4 +14,10 @@ import java.util.List; public interface IExperimentSampleInfoService extends IService { List getByExperimentId(String experimentId); + + List listSampleModel(); + + List listSampleBatch(); + + List listSampleName(); } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentSampleInfoServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentSampleInfoServiceImpl.java index 829ddf3..bbf8f6a 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentSampleInfoServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentSampleInfoServiceImpl.java @@ -23,4 +23,19 @@ public class ExperimentSampleInfoServiceImpl extends ServiceImpl getByExperimentId(String experimentId) { return list(new LambdaQueryWrapper().eq(ExperimentSampleInfo::getExperimentId, experimentId)); } + + @Override + public List listSampleModel() { + return baseMapper.listSampleModel(); + } + + @Override + public List listSampleBatch() { + return baseMapper.listSampleBatch(); + } + + @Override + public List listSampleName() { + return baseMapper.listSampleName(); + } } diff --git a/scripts/pyproject.toml b/scripts/pyproject.toml index fb8c98e..89948bc 100644 --- a/scripts/pyproject.toml +++ b/scripts/pyproject.toml @@ -14,6 +14,8 @@ flask = "^3.1.0" minio = "^7.2.12" mysql-connector-python = "^9.1.0" urllib3 = "^2.2.3" +pandas = "^2.2.3" +openpyxl = "^3.1.5" [build-system]