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 2dfcf45..b0ff569 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 @@ -78,6 +78,8 @@ public class PublicController extends BaseController { public ISystemLogService systemLogService; @Autowired public IJcbService jcbService; + @Autowired + public IStudyFormFillService studyFormFillService; /** @@ -331,4 +333,17 @@ public class PublicController extends BaseController { List list = jcbService.queryList(jcb); return getDataTable(list); } + + /** + * 前序表单列表 + * @param formFill + * @return + */ + @GetMapping("/qxFormFillList") + public TableDataInfo qxFormFillList(StudyFormFill formFill) + { + startPage(); + List list = studyFormFillService.queryQxList(formFill); + return getDataTable(list); + } } \ No newline at end of file diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillService.java index fef1979..f87b040 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillService.java @@ -15,6 +15,13 @@ import com.hxhq.business.form.study.*; public interface IStudyFormFillService extends IService { /** + * 前序表单列表 + * @param form + * @return + */ + public List queryQxList(StudyFormFill form); + + /** * 查询试验-填报单列表 * * @param form 试验-填报单 diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java index 159c641..d9f476b 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java @@ -81,6 +81,22 @@ public class StudyFormFillServiceImpl extends ServiceImpl queryQxList(StudyFormFill form) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("study_id",form.getStudyId()); + queryWrapper.and(q->q.eq("status",StudyFormFillBdztEnum.ywc.getValue()) + .or().eq("status",StudyFormFillBdztEnum.ywcfh.getValue())); + if(StringUtils.isNoneBlank(form.getUserMc())){ + queryWrapper.like("user_mc",form.getUserMc()); + } + if(StringUtils.isNoneBlank(form.getBdmc())){ + queryWrapper.like("bdmc",form.getBdmc()); + } + queryWrapper.select("id,bdmc,user_mc,create_time,bdzt"); + queryWrapper.orderByDesc("id"); + return list(queryWrapper); + } /** * 开始配置