From f5951375ea7b9893091408f672766bf446510201 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Wed, 18 Mar 2026 09:42:58 +0800 Subject: [PATCH] =?UTF-8?q?fix:[=E9=BA=BB=E7=B2=BE=E8=8D=AF=E8=A1=A8?= =?UTF-8?q?=E5=8D=95]bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hxhq/business/domain/StudyFormApply.java | 36 ++++++++ .../business/dto/study/StudyFormApplyListDto.java | 22 +++++ .../form/study/StudyFormApplySearchForm.java | 99 ++++++++++++++++++++++ .../hxhq/business/mapper/StudyFormApplyMapper.java | 2 +- .../service/impl/StudyFormApplyServiceImpl.java | 72 +++++++++++++++- .../mapper/business/StudyFormApplyMapper.xml | 8 +- 6 files changed, 232 insertions(+), 7 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApply.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApply.java index 9fbb130..8cac75f 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApply.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApply.java @@ -39,6 +39,18 @@ public class StudyFormApply extends MpBaseEntity @TableField(updateStrategy = FieldStrategy.IGNORED) private Long sdId; + /** 试验物资名称 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String sywzmc; + + /** 需要浓度 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String xynd; + + /** 需要时间 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String xysj; + /** 表单编号 */ private String bdbh; @@ -130,6 +142,30 @@ public class StudyFormApply extends MpBaseEntity @TableField(exist = false) private String studyMc; + public String getSywzmc() { + return sywzmc; + } + + public void setSywzmc(String sywzmc) { + this.sywzmc = sywzmc; + } + + public String getXynd() { + return xynd; + } + + public void setXynd(String xynd) { + this.xynd = xynd; + } + + public String getXysj() { + return xysj; + } + + public void setXysj(String xysj) { + this.xysj = xysj; + } + public Long getSyId() { return syId; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/study/StudyFormApplyListDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/study/StudyFormApplyListDto.java index 13c5370..f865e62 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/study/StudyFormApplyListDto.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/study/StudyFormApplyListDto.java @@ -1,11 +1,33 @@ package com.hxhq.business.dto.study; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; import com.hxhq.business.domain.StudyFormApply; /** * @author tanfei */ public class StudyFormApplyListDto extends StudyFormApply { + /** 试验编号 */ + private String sySn; + /** 部门名称 */ + private String bmName; + + public String getSySn() { + return sySn; + } + + public void setSySn(String sySn) { + this.sySn = sySn; + } + + public String getBmName() { + return bmName; + } + + public void setBmName(String bmName) { + this.bmName = bmName; + } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormApplySearchForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormApplySearchForm.java index 5ad15cf..140df29 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormApplySearchForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormApplySearchForm.java @@ -10,12 +10,39 @@ public class StudyFormApplySearchForm { /** 所属试验学科id */ private Long studySubjectId; + /** 归属人 */ + private String userMc; + /** 表单编号 */ private String bdbh; /** 表单名称 */ private String bdmc; + /** 试验编号/部门 */ + private String sybhbm; + + /** 试验物质名称 */ + private String sywzmc; + + /** 需要浓度 */ + private String xynd; + + /** 需要时间开始 */ + private String xysjks; + + /** 需要时间结束 */ + private String xysjjs; + + /** 需要时间排序 */ + private Integer xyssort; + + /** 提交时间排序 */ + private Integer tjsjsort; + + /** 表单状态 */ + private Integer bdzt; + /** 表单归属人id */ private Long userId; @@ -37,6 +64,78 @@ public class StudyFormApplySearchForm { /** 创建时间开始 */ private String cjsjjs; + public String getUserMc() { + return userMc; + } + + public void setUserMc(String userMc) { + this.userMc = userMc; + } + + public Integer getBdzt() { + return bdzt; + } + + public void setBdzt(Integer bdzt) { + this.bdzt = bdzt; + } + + public String getSybhbm() { + return sybhbm; + } + + public void setSybhbm(String sybhbm) { + this.sybhbm = sybhbm; + } + + public String getSywzmc() { + return sywzmc; + } + + public void setSywzmc(String sywzmc) { + this.sywzmc = sywzmc; + } + + public String getXynd() { + return xynd; + } + + public void setXynd(String xynd) { + this.xynd = xynd; + } + + public String getXysjks() { + return xysjks; + } + + public void setXysjks(String xysjks) { + this.xysjks = xysjks; + } + + public String getXysjjs() { + return xysjjs; + } + + public void setXysjjs(String xysjjs) { + this.xysjjs = xysjjs; + } + + public Integer getXyssort() { + return xyssort; + } + + public void setXyssort(Integer xyssort) { + this.xyssort = xyssort; + } + + public Integer getTjsjsort() { + return tjsjsort; + } + + public void setTjsjsort(Integer tjsjsort) { + this.tjsjsort = tjsjsort; + } + public Long getStudySubjectId() { return studySubjectId; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormApplyMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormApplyMapper.java index 7731ad9..2eb4da4 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormApplyMapper.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormApplyMapper.java @@ -42,7 +42,7 @@ public interface StudyFormApplyMapper extends BaseMapper * @param bmId * @param sdId */ - void updateBdnrZdxgjl(@Param("id") Long id,@Param("bdnr") String bdnr,@Param("zdxgjl") String zdxgjl,@Param("syId") Long syId,@Param("bmId") Long bmId,@Param("sdId") Long sdId); + void updateBdnrZdxgjl(@Param("id") Long id,@Param("bdnr") String bdnr,@Param("zdxgjl") String zdxgjl,@Param("syId") Long syId,@Param("bmId") Long bmId,@Param("sdId") Long sdId,@Param("sywzmc") String sywzmc,@Param("xynd") String xynd,@Param("xysj") String xysj); /** * 更新表单内容 diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java index 9aedcfc..413bfe3 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java @@ -83,6 +83,24 @@ public class StudyFormApplyServiceImpl extends ServiceImpl p.like("t.`bdbh`", form.getBdbh())); } + if (StringUtils.isNoneBlank(form.getSywzmc())) { + queryWrapper.and(p -> p.like("t.`sywzmc`", form.getSywzmc())); + } + if (StringUtils.isNoneBlank(form.getXynd())) { + queryWrapper.and(p -> p.like("t.`xynd`", form.getXynd())); + } + if (StringUtils.isNoneBlank(form.getSybhbm())) { + queryWrapper.and(p -> p.like("ts.sn", form.getSybhbm()).or().like("sd.dept_name", form.getSybhbm())); + } + if (StringUtils.isNoneBlank(form.getXysjks())) { + queryWrapper.apply("t.xysj>={0}", form.getXysjks()); + } + if (StringUtils.isNoneBlank(form.getXysjjs())) { + queryWrapper.apply("t.xysj<{0}", form.getXysjjs()); + } + if (form.getBdzt() != null && form.getBdzt().intValue() > 0) { + queryWrapper.eq("t.bdzt", form.getBdzt()); + } if (StringUtils.isNoneBlank(form.getBdmc())) { queryWrapper.and(p -> p.like("t.`bdmc`", form.getBdmc())); } @@ -289,6 +307,16 @@ public class StudyFormApplyServiceImpl extends ServiceImpl - update t_study_form_apply set bdnr=#{bdnr},sy_id=#{syId},bm_id=#{bmId},sd_id=#{sdId} where id=#{id}; + update t_study_form_apply set bdnr=#{bdnr},sy_id=#{syId},bm_id=#{bmId},sd_id=#{sdId},sywzmc=#{sywzmc},xynd=#{xynd},xysj=#{xysj} where id=#{id};