fix：[资源库管理]列表返回归档申请人

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;
     }

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;
     }

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;
     }

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;
     }

hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjFfjlMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.hxhq.business.mapper.GyzjFfjlMapper">
     <select id="queryList" resultType="com.hxhq.business.dto.gyzj.FfjlListDto">
         select t.id,t.mc,t.bh,t.ffzytj,t.ffrq,t.ghrq,t.ckl,t.ckldw,t.rkl,t.rkldw,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.jsr1_mc,t.jsr2_mc
-        ,t.syl,t.syldw,t.jlzt,t.jyzt,t.md_other,t.jyksrq,t.jyjsrq
+        ,t.syl,t.syldw,t.jlzt,t.jyzt,t.md_other,t.jyksrq,t.jyjsrq,t.gdsqr_id
         ,z.mc as zcgMc,
         (select GROUP_CONCAT(s.name) from t_study s where find_in_set(s.id, t.`md_ids`)) as mdMcs
         FROM `t_gyzj_ffjl` t

hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjMapper.xml

@@ -15,7 +15,7 @@
 
     <select id="queryList" resultType="com.hxhq.business.dto.gyzj.ListDto">
         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

hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyFfjlMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.hxhq.business.mapper.MjyFfjlMapper">
     <select id="queryList" resultType="com.hxhq.business.dto.mjy.FfjlListDto">
         select t.id,t.mc,t.bh,t.ffzytj,t.ffrq,t.ghrq,t.ckl,t.ckldw,t.rkl,t.rkldw,t.ckmz,t.ckmzdw,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.jsr1_mc,t.jsr2_mc,t.rkmz,t.rkmzdw
-        ,t.syl,t.syldw,t.jlzt,t.jyzt,t.md_other,t.jyksrq,t.jyjsrq
+        ,t.syl,t.syldw,t.jlzt,t.jyzt,t.md_other,t.jyksrq,t.jyjsrq,t.gdsqr_id
         ,z.mc as zcgMc,
         (select GROUP_CONCAT(s.name) from t_study s where find_in_set(s.id, t.`md_ids`)) as mdMcs
         FROM `t_mjy_ffjl` t

hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyMapper.xml

@@ -15,7 +15,7 @@
 
     <select id="queryList" resultType="com.hxhq.business.dto.mjy.ListDto">
         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