fix：[非实验表单][麻精药]归还

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

@@ -97,6 +97,10 @@ public class MjyFfjl extends MpBaseEntity
     /** 目的ids */
     private String mdIds;
 
+
+    /** 发放目的其他 */
+    private String mdOther;
+
     /** 入库位置 */
     private String rkwz;
 
@@ -176,6 +180,14 @@ public class MjyFfjl extends MpBaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date jyjsrq;
 
+    public String getMdOther() {
+        return mdOther;
+    }
+
+    public void setMdOther(String mdOther) {
+        this.mdOther = mdOther;
+    }
+
     public String getRkmz() {
         return rkmz;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/FfjlDetailDto.java

@@ -9,4 +9,25 @@ import com.hxhq.business.domain.MjyFfjl;
 public class FfjlDetailDto extends MjyFfjl {
 
 
+    /** 发放目的名称 */
+    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;
+    }
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/FfjlListDto.java

@@ -88,6 +88,29 @@ public class FfjlListDto {
     /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */
     private Long jyzt;
 
+
+    /** 发放目的名称 */
+    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 String getRkmz() {
         return rkmz;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfForm.java

@@ -17,6 +17,13 @@ public class FfForm {
     /** 目的ids */
     private String mdIds;
 
+
+    /** 目的名称 */
+    private String mdMcs;
+
+    /** 目的其他 */
+    private String mdOther;
+
     /** 出库毛重 */
     private String ckmz;
 
@@ -59,6 +66,22 @@ public class FfForm {
     /** 发放人2密码 */
     private String ffr2mm;
 
+    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 String getLqr1Mc() {
         return lqr1Mc;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/PlffForm.java

@@ -8,7 +8,7 @@ import java.util.List;
 public class PlffForm {
 
     /** 麻精药列表 */
-    private List<PlffItem> list;
+    private List<FfForm> list;
 
     /** 麻精药ids */
     private Long[] ids;
@@ -89,11 +89,11 @@ public class PlffForm {
         this.ids = ids;
     }
 
-    public List<PlffItem> getList() {
+    public List<FfForm> getList() {
         return list;
     }
 
-    public void setList(List<PlffItem> list) {
+    public void setList(List<FfForm> list) {
         this.list = list;
     }
 

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

@@ -116,11 +116,7 @@ public interface IMjyFfjlService extends IService {
 
     /**
      * 发放
-     * @param ckmz
-     * @param ckmzdw
-     * @param zytj
-     * @param remark
-     * @param mdIds
+     * @param form
      * @param mjy
      * @param lqr1
      * @param lqr2
@@ -128,6 +124,6 @@ public interface IMjyFfjlService extends IService {
      * @param ffr2
      * @param time
      */
-    public void ff(String ckmz, String ckmzdw, String zytj, String remark, String mdIds, Mjy mjy, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time);
+    public void ff( FfForm form, Mjy mjy, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time);
 
 }

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

@@ -468,10 +468,10 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void ff(String ckmz, String ckmzdw, String zytj, String remark, String mdIds, Mjy mjy, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time) {
+    public void ff(FfForm form,Mjy mjy, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time) {
 
         //region 新增发放记录
-
+//        form.getCkmz(),,,,,
         MjyFfjl mjyFfjl = new MjyFfjl();
         mjyFfjl.setMjyId(mjy.getId());
         mjyFfjl.setMc(mjy.getMc());
@@ -484,8 +484,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         mjyFfjl.setCctj(mjy.getCctj());
         mjyFfjl.setCkl(mjy.getKc());
         mjyFfjl.setCkldw(mjy.getKcdw());
-        mjyFfjl.setCkmz(ckmz);
-        mjyFfjl.setCkmzdw(ckmzdw);
+        mjyFfjl.setCkmz( form.getCkmz());
+        mjyFfjl.setCkmzdw(form.getCkmzdw());
         mjyFfjl.setLqr1Id(lqr1.getUserId());
         mjyFfjl.setLqr2Id(lqr2.getUserId());
         mjyFfjl.setFfr1Id(ffr1.getUserId());
@@ -494,17 +494,18 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         mjyFfjl.setLqr2Mc(lqr2.getNickName());
         mjyFfjl.setFfr1Mc(ffr1.getNickName());
         mjyFfjl.setFfr2Mc(ffr2.getNickName());
-        mjyFfjl.setFfzytj(zytj);
+        mjyFfjl.setFfzytj(form.getZytj());
         mjyFfjl.setFfrq(time);
-        mjyFfjl.setFfbz(remark);
-        mjyFfjl.setMdIds(mdIds);
+        mjyFfjl.setFfbz(form.getRemark());
+        mjyFfjl.setMdIds(form.getMdIds());
+        mjyFfjl.setMdOther(form.getMdOther());
         this.save(mjyFfjl);
         //endregion
 
         //region 新增试验物资
-        if(StringUtils.isNoneBlank(mdIds)){
+        if(StringUtils.isNoneBlank(form.getMdIds())){
             List<StudyMjy> studyMjies=new ArrayList<>();
-            String [] tmp=mdIds.split(",");
+            String [] tmp=form.getMdIds().split(",");
             for(String s :tmp){
                 StudyMjy studyMjy=new StudyMjy();
                 studyMjy.setStudyId(Long.parseLong(s));
@@ -520,10 +521,10 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         //region 稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("出库量", mjy.getKc() + mjy.getKcdw());
-        formData.put("转移条件", zytj);
-        formData.put("出库毛重", ckmz + mjy.getKcdw());
-        formData.put("目的", mdIds);
-        formData.put("备注", remark);
+        formData.put("转移条件", form.getZytj());
+        formData.put("出库毛重", form.getCkmz() + mjy.getKcdw());
+        formData.put("目的", form.getMdMcs());
+        formData.put("备注", form.getRemark());
         mjyFfjlJcgjService.saveJcgj(mjyFfjl.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData),
                 SecurityUtils.getUserId(), SecurityUtils.getNickName());
         //endregion

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

@@ -776,7 +776,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         Date now = new Date();
         
         //region 发放记录，试验物资
-        mjyFfjlService.ff(form.getCkmz(),form.getCkmzdw(),form.getZytj(),form.getRemark(),form.getMdIds(),mjyOld,lqr1,lqr2,ffr1,ffr2,now);
+        mjyFfjlService.ff(form,mjyOld,lqr1,lqr2,ffr1,ffr2,now);
         //endregion
 
         //region 稽查轨迹
@@ -857,11 +857,11 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
             if (kc.compareTo(BigDecimal.ZERO) <= 0) {
                 throw new ServiceException("麻精药【" + mjy.getMc() + "】库存不足，不能发放");
             }
-            List<PlffItem> plffItemFilter = form.getList().stream()
+            List<FfForm> plffItemFilter = form.getList().stream()
                     .filter(p -> p.getId().equals(mjy.getId()))
                     .collect(Collectors.toList());
             if (plffItemFilter.size() > 0) {
-                mjyFfjlService.ff(plffItemFilter.get(0).getCkmz(),plffItemFilter.get(0).getCkmzdw(),plffItemFilter.get(0).getZytj(),plffItemFilter.get(0).getRemark(),plffItemFilter.get(0).getMdIds(),mjy,lqr1,lqr2,ffr1,ffr2,now);
+                mjyFfjlService.ff(plffItemFilter.get(0),mjy,lqr1,lqr2,ffr1,ffr2,now);
                 //region 稽查轨迹
                 MjyJcgj mjyJcgj = new MjyJcgj();
                 mjyJcgj.setMjyId(mjy.getId());

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

@@ -5,7 +5,8 @@
 <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 t.*,s.name as studyMc,sf.bdmc as bdMc,sf.user_mc as bdgsrMc,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_study` s on s.id=t.study_id
         left join  `t_study_form_fill` sf on sf.id=t.bd_id

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

@@ -9,7 +9,7 @@
         ,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
-        join  `t_zcg` z on z.id=t.zcg_id
+        left join  `t_zcg` z on z.id=t.zcg_id
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
             <where>
                 ${ew.sqlSegment}