diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Bacteria.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Bacteria.java index 9b24089..d007cf1 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Bacteria.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Bacteria.java @@ -48,6 +48,17 @@ public class Bacteria extends MpBaseEntity @TableField(exist = false) private String studyName; + @TableField(exist = false) + private String studySn; + + public String getStudySn() { + return studySn; + } + + public void setStudySn(String studySn) { + this.studySn = studySn; + } + public String getStudyName() { return studyName; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Cell.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Cell.java index 051206c..3f54697 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Cell.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Cell.java @@ -48,6 +48,17 @@ public class Cell extends MpBaseEntity @TableField(exist = false) private String studyName; + @TableField(exist = false) + private String studySn; + + public String getStudySn() { + return studySn; + } + + public void setStudySn(String studySn) { + this.studySn = studySn; + } + public String getStudyName() { return studyName; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/sj/SjListDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/sj/SjListDto.java index e3b43c8..15665a9 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/sj/SjListDto.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/sj/SjListDto.java @@ -14,12 +14,22 @@ public class SjListDto extends Sj { /** 所属试验名称 */ private String studyName; + private String studySn; + /** 所属表单名称 */ private String formName; /** 表单所属人 */ private String formUserName; + public String getStudySn() { + return studySn; + } + + public void setStudySn(String studySn) { + this.studySn = studySn; + } + public String getDeptName() { return deptName; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/sj/SjSearchListForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/sj/SjSearchListForm.java index 526e49f..bab6152 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/sj/SjSearchListForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/sj/SjSearchListForm.java @@ -35,11 +35,20 @@ public class SjSearchListForm { /** 试验名称 */ private String studyName; + private String studySn; /** 所属部门名称 */ private String deptName; private Integer archive; + public String getStudySn() { + return studySn; + } + + public void setStudySn(String studySn) { + this.studySn = studySn; + } + public String getDeptName() { return deptName; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyCellSearchForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyCellSearchForm.java index 1bce88b..b99bb86 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyCellSearchForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyCellSearchForm.java @@ -18,6 +18,8 @@ public class StudyCellSearchForm { /** 所属试验名称 */ private String studyName; + private String studySn; + /** 有效期开始日期 */ private String startDate; @@ -27,6 +29,14 @@ public class StudyCellSearchForm { /** 试验id */ private Long studyId; + public String getStudySn() { + return studySn; + } + + public void setStudySn(String studySn) { + this.studySn = studySn; + } + public String getMc() { return mc; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/BacteriaMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/BacteriaMapper.java index 3e94606..1046aae 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/BacteriaMapper.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/BacteriaMapper.java @@ -24,6 +24,7 @@ public interface BacteriaMapper extends BaseMapper * @return */ List queryStudyList(@Param("ew") Wrapper queryWrapper); + List queryList(@Param("ew") Wrapper queryWrapper); /** * 批量修改库存 diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/CellMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/CellMapper.java index 698ec83..4a2ff42 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/CellMapper.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/CellMapper.java @@ -24,6 +24,7 @@ public interface CellMapper extends BaseMapper * @return */ List queryStudyList(@Param("ew") Wrapper queryWrapper); + List queryList(@Param("ew") Wrapper queryWrapper); /** * 批量修改库存 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 9866875..219f7bd 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 @@ -58,10 +58,7 @@ public class BacteriaServiceImpl extends ServiceImpl i public List queryStudyList(StudyCellSearchForm form) { QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.eq("b.del_flag", 0); - if(form.getStudyId() != null) { - queryWrapper.eq("b.study_id", form.getStudyId()) - .eq("sb.study_id", form.getStudyId()); - } + if(StringUtils.isNotEmpty(form.getMc())) { queryWrapper.like("b.mc", form.getMc()); } @@ -80,8 +77,18 @@ public class BacteriaServiceImpl extends ServiceImpl i if(StringUtils.isNotEmpty(form.getStudyName())) { queryWrapper.like("s.name", form.getStudyName()); } + if (StringUtils.isNotEmpty(form.getStudySn())) { + queryWrapper.like("s.sn", form.getStudySn()); + } queryWrapper.orderByDesc("b.bh"); - return baseMapper.queryStudyList(queryWrapper); + if(form.getStudyId() != null) { + queryWrapper.eq("b.study_id", form.getStudyId()) + .eq("sb.study_id", form.getStudyId()); + return baseMapper.queryStudyList(queryWrapper); + + } else { + return baseMapper.queryList(queryWrapper); + } } @Override 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 6be687a..9f87b25 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 @@ -58,10 +58,7 @@ public class CellServiceImpl extends ServiceImpl implements IC public List queryStudyList(StudyCellSearchForm form) { QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.eq("c.del_flag", 0); - if (form.getStudyId() != null) { - queryWrapper.eq("c.study_id", form.getStudyId()) - .eq("sc.study_id", form.getStudyId()); - } + if (StringUtils.isNotEmpty(form.getMc())) { queryWrapper.like("c.mc", form.getMc()); } @@ -80,8 +77,17 @@ public class CellServiceImpl extends ServiceImpl implements IC if (StringUtils.isNotEmpty(form.getStudyName())) { queryWrapper.like("s.name", form.getStudyName()); } + if (StringUtils.isNotEmpty(form.getStudySn())) { + queryWrapper.like("s.sn", form.getStudySn()); + } queryWrapper.orderByDesc("c.bh"); - return baseMapper.queryStudyList(queryWrapper); + if (form.getStudyId() != null) { + queryWrapper.eq("c.study_id", form.getStudyId()) + .eq("sc.study_id", form.getStudyId()); + return baseMapper.queryStudyList(queryWrapper); + } else { + return baseMapper.queryList(queryWrapper); + } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java index d60e6d8..8656114 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java @@ -108,6 +108,9 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi if (StringUtils.isNotEmpty(form.getStudyName())) { queryWrapper.like("t.name", form.getStudyName()); } + if (StringUtils.isNotEmpty(form.getStudySn())) { + queryWrapper.like("t.sn", form.getStudySn()); + } if (form.getArchive() != null && form.getArchive() == DaztEnum.ygd.getValue()) { queryWrapper.in("s.zjzt", ZjztEnum.dgd.getValue(), ZjztEnum.gd.getValue(), ZjztEnum.djd.getValue()); } else { @@ -132,6 +135,9 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi if (StringUtils.isNotEmpty(form.getStudyName())) { queryWrapper.like("t.name", form.getStudyName()); } + if (StringUtils.isNotEmpty(form.getStudySn())) { + queryWrapper.like("t.sn", form.getStudySn()); + } queryWrapper.orderByDesc("s.id"); return baseMapper.queryList(queryWrapper); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/SjPdf.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/SjPdf.java index caefb1c..86662cd 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/SjPdf.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/SjPdf.java @@ -71,7 +71,7 @@ public class SjPdf { PdfBaseUtil.addUnderlinedTitle(document, getName("表单信息"), 10, true); Map formData3 = new LinkedHashMap<>(); formData3.put(getName("所属表单"), sj.getFormName()); - formData3.put(getName("表单所属试验"), sj.getStudyName()); + formData3.put(getName("表单所属试验"), sj.getStudySn()); formData3.put(getName("表单所属人"), sj.getFormUserName()); formData3.put(getName("表单所属部门"), sj.getDeptName()); PdfBaseUtil.addFormTableColumns(document, formData3, 2); 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 e54bf72..a3012ae 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 @@ -10,7 +10,7 @@ + UPDATE t_bacteria SET tj = #{kc} WHERE id = #{id} diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/CellMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/CellMapper.xml index dee62ee..6ed6fab 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/CellMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/CellMapper.xml @@ -10,7 +10,7 @@ + UPDATE t_cell SET tj = #{kc} WHERE id = #{id} diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/SjMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/SjMapper.xml index 99a33de..bec55a8 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/SjMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/SjMapper.xml @@ -29,7 +29,7 @@