From b18ee20d91fe5be09a1d07e9c668235fd94dcdee Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Mon, 26 Jan 2026 17:18:56 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E8=B5=84=E6=BA=90=E5=BA=93?= =?UTF-8?q?=E7=AE=A1=E7=90=86]=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=BD=92=E6=A1=A3=E7=94=B3=E8=AF=B7=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/hxhq/business/dto/gyzj/FfjlListDto.java | 10 ++++++++++ .../src/main/java/com/hxhq/business/dto/gyzj/ListDto.java | 11 +++++++++++ .../src/main/java/com/hxhq/business/dto/mjy/FfjlListDto.java | 10 ++++++++++ .../src/main/java/com/hxhq/business/dto/mjy/ListDto.java | 10 ++++++++++ .../src/main/resources/mapper/business/GyzjFfjlMapper.xml | 2 +- .../src/main/resources/mapper/business/GyzjMapper.xml | 2 +- .../src/main/resources/mapper/business/MjyFfjlMapper.xml | 2 +- .../src/main/resources/mapper/business/MjyMapper.xml | 2 +- 8 files changed, 45 insertions(+), 4 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/FfjlListDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/FfjlListDto.java index 7164cb2..29a032f 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/FfjlListDto.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/FfjlListDto.java @@ -91,6 +91,16 @@ public class FfjlListDto { @JsonFormat(pattern = "yyyy-MM-dd") private Date jyjsrq; + /** 归档申请人id */ + private Long gdsqrId; + + public Long getGdsqrId() { + return gdsqrId; + } + + public void setGdsqrId(Long gdsqrId) { + this.gdsqrId = gdsqrId; + } public Date getJyksrq() { return jyksrq; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java index d0b9121..a30a714 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java @@ -111,6 +111,17 @@ public class ListDto { /** 所属试验 */ private String studyMc; + /** 归档申请人id */ + private Long gdsqrId; + + public Long getGdsqrId() { + return gdsqrId; + } + + public void setGdsqrId(Long gdsqrId) { + this.gdsqrId = gdsqrId; + } + public String getStudyMc() { return studyMc; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/FfjlListDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/FfjlListDto.java index bd51eab..0fa1cb9 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/FfjlListDto.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/FfjlListDto.java @@ -103,6 +103,16 @@ public class FfjlListDto { @JsonFormat(pattern = "yyyy-MM-dd") private Date jyjsrq; + /** 归档申请人id */ + private Long gdsqrId; + + public Long getGdsqrId() { + return gdsqrId; + } + + public void setGdsqrId(Long gdsqrId) { + this.gdsqrId = gdsqrId; + } public Date getJyksrq() { return jyksrq; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/ListDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/ListDto.java index f81f22d..7363e12 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/ListDto.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/ListDto.java @@ -106,6 +106,16 @@ public class ListDto { /** 试验归还状态：1：未归还；10：已归还*/ private Integer syghzt; + /** 归档申请人id */ + private Long gdsqrId; + + public Long getGdsqrId() { + return gdsqrId; + } + + public void setGdsqrId(Long gdsqrId) { + this.gdsqrId = gdsqrId; + } public Integer getCczt() { return cczt; } diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjFfjlMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjFfjlMapper.xml index 4d9cdc3..0e1ce19 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjFfjlMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjFfjlMapper.xml @@ -5,7 +5,7 @@ select t.id,t.mc,t.bh,t.nd,t.nddw,t.kc,t.kcdw,t.sxrq,t.zjzt,t.jyzt,t.cctj,t.ccwz,t.create_time,t.bjzt,t.kcbjzt,t.rqzt,t.ghzt - ,t.ckl,t.ckldw,t.ffzytj,t.ffbz,t.rksqzt,t.jyksrq,t.jyjsrq + ,t.ckl,t.ckldw,t.ffzytj,t.ffbz,t.rksqzt,t.jyksrq,t.jyjsrq,t.gdsqr_id ,z.mc as zcgMc,t.md_other, (select GROUP_CONCAT(s.name) from t_study s where find_in_set(s.id, t.`md_ids`)) as mdMcs FROM `t_gyzj` t diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyFfjlMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyFfjlMapper.xml index 741928e..7b2289f 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyFfjlMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyFfjlMapper.xml @@ -5,7 +5,7 @@ select t.id,t.mc,t.bh,t.nd,t.nddw,t.kc,t.kcdw,t.sxrq,t.zjzt,t.jyzt,t.cctj,t.ccwz,t.create_time,t.bjzt,t.kcbjzt,t.rqzt,t.ghzt - ,t.ckl,t.ckldw,t.ffzytj,t.ckmz,t.ckmzdw,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.ffbz + ,t.ckl,t.ckldw,t.ffzytj,t.ckmz,t.ckmzdw,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.ffbz,t.gdsqr_id ,z.mc as zcgMc FROM `t_mjy` t left join `t_zcg` z on z.id=t.zcg_id