diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/BacteriaServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/BacteriaServiceImpl.java index 234864e..7954046 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/BacteriaServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/BacteriaServiceImpl.java @@ -42,30 +42,29 @@ public class BacteriaServiceImpl extends ServiceImpl i @Override public List queryStudyList(StudyCellSearchForm form) { QueryWrapper queryWrapper = Wrappers.query(); - queryWrapper.eq("sb.del_flag", 0) - .eq("c.del_flag", 0); + queryWrapper.eq("b.del_flag", 0); if(form.getStudyId() != null) { - queryWrapper.eq("sb.study_id", form.getStudyId()); + queryWrapper.eq("b.study_id", form.getStudyId()); } if(StringUtils.isNotEmpty(form.getMc())) { - queryWrapper.like("c.mc", form.getMc()); + queryWrapper.like("b.mc", form.getMc()); } if(StringUtils.isNotEmpty(form.getBh())) { - queryWrapper.like("c.bh", form.getBh()); + queryWrapper.like("b.bh", form.getBh()); } if(StringUtils.isNotEmpty(form.getLy())) { - queryWrapper.like("c.ly", form.getLy()); + queryWrapper.like("b.ly", form.getLy()); } if(StringUtils.isNotEmpty(form.getStartDate())) { - queryWrapper.ge("c.sxr", form.getStartDate()); + queryWrapper.ge("b.sxr", form.getStartDate()); } if(StringUtils.isNotEmpty(form.getEndDate())) { - queryWrapper.le("c.sxr", form.getEndDate()); + queryWrapper.le("b.sxr", form.getEndDate()); } if(StringUtils.isNotEmpty(form.getStudyName())) { - queryWrapper.like("t.name", form.getStudyName()); + queryWrapper.like("s.name", form.getStudyName()); } - queryWrapper.orderByDesc("c.bh"); + queryWrapper.orderByDesc("b.bh"); return baseMapper.queryStudyList(queryWrapper); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/CellServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/CellServiceImpl.java index 056e22b..6989c84 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/CellServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/CellServiceImpl.java @@ -40,10 +40,9 @@ public class CellServiceImpl extends ServiceImpl implements IC @Override public List queryStudyList(StudyCellSearchForm form) { QueryWrapper queryWrapper = Wrappers.query(); - queryWrapper.eq("sc.del_flag", 0) - .eq("c.del_flag", 0); + queryWrapper.eq("c.del_flag", 0); if(form.getStudyId() != null) { - queryWrapper.eq("sc.study_id", form.getStudyId()); + queryWrapper.eq("c.study_id", form.getStudyId()); } if(StringUtils.isNotEmpty(form.getMc())) { queryWrapper.like("c.mc", form.getMc()); @@ -61,7 +60,7 @@ public class CellServiceImpl extends ServiceImpl implements IC queryWrapper.le("c.sxr", form.getEndDate()); } if(StringUtils.isNotEmpty(form.getStudyName())) { - queryWrapper.like("t.name", form.getStudyName()); + queryWrapper.like("s.name", form.getStudyName()); } queryWrapper.orderByDesc("c.bh"); return baseMapper.queryStudyList(queryWrapper); diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/BacteriaMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/BacteriaMapper.xml index 3bd7910..1ae8c81 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/BacteriaMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/BacteriaMapper.xml @@ -4,10 +4,10 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - select c.*, s.name as studyName - FROM `t_study_cell` sc - join `t_cell` c on c.id=sc.resource_id - LEFT JOIN `t_study` s on s.id = sc.study_id + SELECT c.*, s.name as studyName + FROM `t_cell` c + LEFT JOIN `t_study_cell` sc on c.id=sc.resource_id + LEFT JOIN `t_study` s on s.id = c.study_id ${ew.sqlSegment}