|
|
@ -7,6 +7,7 @@ import com.hxhq.business.domain.StudyFormPre; |
|
|
import com.hxhq.business.domain.Template; |
|
|
import com.hxhq.business.domain.Template; |
|
|
import com.hxhq.business.dto.study.StudyListDto; |
|
|
import com.hxhq.business.dto.study.StudyListDto; |
|
|
import com.hxhq.business.enums.study.StudyStatusEnum; |
|
|
import com.hxhq.business.enums.study.StudyStatusEnum; |
|
|
|
|
|
import com.hxhq.business.form.study.StudyFormPreSearchForm; |
|
|
import com.hxhq.business.form.study.StudySearchForm; |
|
|
import com.hxhq.business.form.study.StudySearchForm; |
|
|
import com.hxhq.business.service.IStudyFormPreService; |
|
|
import com.hxhq.business.service.IStudyFormPreService; |
|
|
import com.hxhq.business.service.IStudyService; |
|
|
import com.hxhq.business.service.IStudyService; |
|
|
@ -66,13 +67,11 @@ public class PublicController extends BaseController |
|
|
* 查询试验预填表单列表 |
|
|
* 查询试验预填表单列表 |
|
|
*/ |
|
|
*/ |
|
|
@GetMapping("/studyFormPreList") |
|
|
@GetMapping("/studyFormPreList") |
|
|
public AjaxResult studyFormPreList(StudyFormPre studyFormPre) |
|
|
|
|
|
|
|
|
public AjaxResult studyFormPreList(StudyFormPreSearchForm form) |
|
|
{ |
|
|
{ |
|
|
if(studyFormPre.getStudyId()==null||studyFormPre.getStudyId().longValue()<0){ |
|
|
|
|
|
|
|
|
if(form.getStudyId()==null||form.getStudyId().longValue()<0){ |
|
|
throw new ServiceException("试验id不能为空"); |
|
|
throw new ServiceException("试验id不能为空"); |
|
|
} |
|
|
} |
|
|
QueryWrapper<StudyFormPre> queryWrapper = Wrappers.query(); |
|
|
|
|
|
queryWrapper.eq("study_id", studyFormPre.getStudyId()); |
|
|
|
|
|
return AjaxResult.success(studyFormPreService.list(queryWrapper)); |
|
|
|
|
|
|
|
|
return AjaxResult.success(studyFormPreService.queryList(form)); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |