From a4fda18ab48437af70f2b6f54dc1a5016396cabb Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Sun, 4 Jan 2026 18:24:18 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A[=E8=AF=95=E9=AA=8C=E7=AE=A1?= =?UTF-8?q?=E7=90=86][=E9=A2=84=E5=A1=AB=E8=A1=A8=E5=8D=95]=E5=A4=8D?= =?UTF-8?q?=E5=88=B6=E8=A1=A8=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hxhq/business/controller/PublicController.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java index b81650e..58a3da9 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java @@ -7,6 +7,7 @@ import com.hxhq.business.domain.StudyFormPre; import com.hxhq.business.domain.Template; import com.hxhq.business.dto.study.StudyListDto; 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.service.IStudyFormPreService; import com.hxhq.business.service.IStudyService; @@ -66,13 +67,11 @@ public class PublicController extends BaseController * 查询试验预填表单列表 */ @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不能为空"); } - QueryWrapper queryWrapper = Wrappers.query(); - queryWrapper.eq("study_id", studyFormPre.getStudyId()); - return AjaxResult.success(studyFormPreService.list(queryWrapper)); + return AjaxResult.success(studyFormPreService.queryList(form)); } }