|
|
@ -85,8 +85,8 @@ public class StudyFormFillServiceImpl extends ServiceImpl |
|
|
public List<StudyFormFill> queryQxList(StudyFormFill form) { |
|
|
public List<StudyFormFill> queryQxList(StudyFormFill form) { |
|
|
QueryWrapper<StudyFormFill> queryWrapper = new QueryWrapper<>(); |
|
|
QueryWrapper<StudyFormFill> queryWrapper = new QueryWrapper<>(); |
|
|
queryWrapper.eq("study_id",form.getStudyId()); |
|
|
queryWrapper.eq("study_id",form.getStudyId()); |
|
|
queryWrapper.and(q->q.eq("status",StudyFormFillBdztEnum.ywc.getValue()) |
|
|
|
|
|
.or().eq("status",StudyFormFillBdztEnum.ywcfh.getValue())); |
|
|
|
|
|
|
|
|
queryWrapper.and(q->q.eq("bdzt",StudyFormFillBdztEnum.ywc.getValue()) |
|
|
|
|
|
.or().eq("bdzt",StudyFormFillBdztEnum.ywcfh.getValue())); |
|
|
if(StringUtils.isNoneBlank(form.getUserMc())){ |
|
|
if(StringUtils.isNoneBlank(form.getUserMc())){ |
|
|
queryWrapper.like("user_mc",form.getUserMc()); |
|
|
queryWrapper.like("user_mc",form.getUserMc()); |
|
|
} |
|
|
} |
|
|
|