whycrzg
2021-05-26 bf7833def6436a4100f15d179717190d9574666c
src/main/java/com/whyc/service/WindingExperimentService.java
@@ -335,19 +335,18 @@
     * 实验数据 step参数 1 2 对应实验步骤1、2
     *
     *
     *
     * @param experimentId
     * @param rzLink
     * @param step
     * @param pageNum
     * @param pageSize
     * @return
     */
    public Response getExperimentWindingStep1(int rzLink, int step, int pageNum, int pageSize) {
    public Response getExperimentWindingStep1(String experimentId, int rzLink, int step, int pageNum, int pageSize) {
        PageHelper.startPage(pageNum, pageSize);
        QueryWrapper<ExperimentWindingStep1> wrapper = new QueryWrapper<>();
        wrapper.eq("step",step);
        List<ExperimentWindingStep1> list = mapper1.selectlistByCondition(rzLink,step);
//        List<ExperimentWindingStep1> list = mapper1.selectList(wrapper);
        List<ExperimentWindingStep1> list = mapper1.selectlistByCondition(experimentId,rzLink,step);
        PageInfo<ExperimentWindingStep1> pageInfo = new PageInfo<>(list);
        return new Response<PageInfo<ExperimentWindingStep1>>().set(1, pageInfo);
    }