whycrzg
2021-05-24 c83a32ddf1d9c7dc31c149406d62219fb7b54efa
src/main/java/com/whyc/service/WindingExperimentService.java
@@ -98,7 +98,7 @@
                    windingStep1.setDeviceId(experiment.getDeviceId());//存设备类型
                    windingStep1.setRealName(realName);       //测试人
                    windingStep1.setStatus(1);                //状态:0-未开始,1-进行中,2-已完成
                    windingStep1.setRzLink(experiment.getRz_link());   //各相绕组连接情况 0 引出; 1 内部连接
                    if (mapper1.insert(windingStep1) > 0) {
                        flag = true;
                    } else {
@@ -322,17 +322,20 @@
    /**
     * 实验数据 step参数 1 2 对应实验步骤1、2
     *
     *
     * @param rzLink
     * @param step
     * @param pageNum
     * @param pageSize
     * @return
     */
    public Response getExperimentWindingStep1(int step, int pageNum, int pageSize) {
    public Response getExperimentWindingStep1(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.selectList(wrapper);
        List<ExperimentWindingStep1> list = mapper1.selectlistByCondition(rzLink,step);
//        List<ExperimentWindingStep1> list = mapper1.selectList(wrapper);
        PageInfo<ExperimentWindingStep1> pageInfo = new PageInfo<>(list);
        return new Response<PageInfo<ExperimentWindingStep1>>().set(1, pageInfo);
    }