fix：[试验管理][计划表单]

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java

@@ -145,6 +145,44 @@ public class Gyzj extends MpBaseEntity
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String kcbjrMc;
 
+
+    /** 出库量 */
+    private String ckl;
+
+    /** 出库单位 */
+    private String ckldw;
+
+    /** 领取人1id */
+    private Long lqr1Id;
+
+    /** 领取人2id */
+    private Long lqr2Id;
+
+    /** 发放人1id */
+    private Long ffr1Id;
+
+    /** 发放人2id */
+    private Long ffr2Id;
+
+    /** 领取人1名称 */
+    private String lqr1Mc;
+
+    /** 领取人2名称 */
+    private String lqr2Mc;
+
+    /** 发放人1名称 */
+    private String ffr1Mc;
+
+    /** 发放人2名称 */
+    private String ffr2Mc;
+
+    /** 发放日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date ffrq;
+
+    /** 发放备注 */
+    private String ffbz;
+
     /** 发放目的ids */
     private String mdIds;
 
@@ -184,6 +222,102 @@ public class Gyzj extends MpBaseEntity
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String ghzytj;
 
+    public String getCkl() {
+        return ckl;
+    }
+
+    public void setCkl(String ckl) {
+        this.ckl = ckl;
+    }
+
+    public String getCkldw() {
+        return ckldw;
+    }
+
+    public void setCkldw(String ckldw) {
+        this.ckldw = ckldw;
+    }
+
+    public Long getLqr1Id() {
+        return lqr1Id;
+    }
+
+    public void setLqr1Id(Long lqr1Id) {
+        this.lqr1Id = lqr1Id;
+    }
+
+    public Long getLqr2Id() {
+        return lqr2Id;
+    }
+
+    public void setLqr2Id(Long lqr2Id) {
+        this.lqr2Id = lqr2Id;
+    }
+
+    public Long getFfr1Id() {
+        return ffr1Id;
+    }
+
+    public void setFfr1Id(Long ffr1Id) {
+        this.ffr1Id = ffr1Id;
+    }
+
+    public Long getFfr2Id() {
+        return ffr2Id;
+    }
+
+    public void setFfr2Id(Long ffr2Id) {
+        this.ffr2Id = ffr2Id;
+    }
+
+    public String getLqr1Mc() {
+        return lqr1Mc;
+    }
+
+    public void setLqr1Mc(String lqr1Mc) {
+        this.lqr1Mc = lqr1Mc;
+    }
+
+    public String getLqr2Mc() {
+        return lqr2Mc;
+    }
+
+    public void setLqr2Mc(String lqr2Mc) {
+        this.lqr2Mc = lqr2Mc;
+    }
+
+    public String getFfr1Mc() {
+        return ffr1Mc;
+    }
+
+    public void setFfr1Mc(String ffr1Mc) {
+        this.ffr1Mc = ffr1Mc;
+    }
+
+    public String getFfr2Mc() {
+        return ffr2Mc;
+    }
+
+    public void setFfr2Mc(String ffr2Mc) {
+        this.ffr2Mc = ffr2Mc;
+    }
+
+    public Date getFfrq() {
+        return ffrq;
+    }
+
+    public void setFfrq(Date ffrq) {
+        this.ffrq = ffrq;
+    }
+
+    public String getFfbz() {
+        return ffbz;
+    }
+
+    public void setFfbz(String ffbz) {
+        this.ffbz = ffbz;
+    }
+
     public String getGhzytj() {
         return ghzytj;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java

@@ -97,6 +97,28 @@ public class ListDto {
     /** 试验归还状态：1：未归还；10：已归还*/
     private Integer syghzt;
 
+    /** 发放目的名称 */
+    private String mdMcs;
+
+    /** 发放目的其他 */
+    private String mdOther;
+
+    public String getMdMcs() {
+        return mdMcs;
+    }
+
+    public void setMdMcs(String mdMcs) {
+        this.mdMcs = mdMcs;
+    }
+
+    public String getMdOther() {
+        return mdOther;
+    }
+
+    public void setMdOther(String mdOther) {
+        this.mdOther = mdOther;
+    }
+
     public Integer getSyghzt() {
         return syghzt;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java

@@ -787,6 +787,19 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         //endregion
 
         //region 更新发放信息
+        gyzjOld.setCkl(gyzjOld.getKc());
+        gyzjOld.setCkldw(gyzjOld.getKcdw());
+        gyzjOld.setLqr1Id(lqr1.getUserId());
+        gyzjOld.setLqr2Id(lqr2.getUserId());
+        gyzjOld.setFfr1Id(ffr1.getUserId());
+        gyzjOld.setFfr2Id(ffr2.getUserId());
+        gyzjOld.setLqr1Mc(lqr1.getNickName());
+        gyzjOld.setLqr2Mc(lqr2.getNickName());
+        gyzjOld.setFfr1Mc(ffr1.getNickName());
+        gyzjOld.setFfr2Mc(ffr2.getNickName());
+        gyzjOld.setFfr2Mc(ffr2.getNickName());
+        gyzjOld.setFfrq(now);
+        gyzjOld.setFfbz(form.getRemark());
         gyzjOld.setMdIds(form.getMdIds());
         gyzjOld.setMdOther(form.getMdOther());
         gyzjOld.setZjzt(ZjztEnum.yff.getValue());
@@ -868,11 +881,24 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                 //endregion
 
                 //region 更新发放信息
+                gyzj.setCkl(gyzj.getKc());
+                gyzj.setCkldw(gyzj.getKcdw());
+                gyzj.setLqr1Id(lqr1.getUserId());
+                gyzj.setLqr2Id(lqr2.getUserId());
+                gyzj.setFfr1Id(ffr1.getUserId());
+                gyzj.setFfr2Id(ffr2.getUserId());
+                gyzj.setLqr1Mc(lqr1.getNickName());
+                gyzj.setLqr2Mc(lqr2.getNickName());
+                gyzj.setFfr1Mc(ffr1.getNickName());
+                gyzj.setFfr2Mc(ffr2.getNickName());
+                gyzj.setFfr2Mc(ffr2.getNickName());
+                gyzj.setFfrq(now);
+                gyzj.setFfbz(plffItemFilter.get(0).getRemark());
                 gyzj.setMdIds(plffItemFilter.get(0).getMdIds());
                 gyzj.setMdOther(plffItemFilter.get(0).getMdOther());
                 gyzj.setZjzt(ZjztEnum.yff.getValue());
                 //endregion
-                
+
             } else {
                 throw new ServiceException("给药制剂【" + gyzj.getMc() + "】不存在或已删除");
             }

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

@@ -5,8 +5,7 @@
 <mapper namespace="com.hxhq.business.mapper.GyzjMapper">
 
     <select id="queryInfo" resultType="com.hxhq.business.dto.gyzj.DetailDto">
-        select t.*,s.name as studyMc,sf.bdmc as bdMc,sf.user_mc as bdgsrMc,
-               (select GROUP_CONCAT(s.name) from t_study s where find_in_set(s.id, t.`md_ids`)) as mdMcs
+        select t.*,s.name as studyMc,sf.bdmc as bdMc,sf.user_mc as bdgsrMc
         FROM `t_gyzj` t
         left join  `t_study` s on s.id=t.study_id
         left join  `t_study_form_fill` sf on sf.id=t.bd_id
@@ -16,7 +15,8 @@
     <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.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.ffbz
-        ,z.mc as zcgMc
+        ,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
         left join  `t_zcg` z on z.id=t.zcg_id
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">