feat：[试验管理][物资管理]

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

@@ -98,6 +98,9 @@ public class GyzjFfjl extends MpBaseEntity
     /** 目的ids */
     private String mdIds;
 
+    /** 发放目的其他 */
+    private String mdOther;
+
     /** 入库位置 */
     private String rkwz;
 
@@ -178,6 +181,14 @@ public class GyzjFfjl 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/domain/GyzjFfjlJcgj.java

@@ -5,12 +5,12 @@ import com.hxhq.common.core.domain.MpBaseEntity;
 
 
 /**
- * 麻精药发放记录-稽查轨迹对象 t_mjy_ffjl_jcgj
+ * 发放记录-稽查轨迹对象 t_gyzj_ffjl_jcgj
  *
  * @author hxhq
  * @date 2025-12-25
  */
-@TableName("t_mjy_ffjl_jcgj")
+@TableName("t_gyzj_ffjl_jcgj")
 public class GyzjFfjlJcgj extends MpBaseEntity
 {
     private static final long serialVersionUID = 1L;

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

@@ -36,9 +36,6 @@ public class StudyJcgj extends MpBaseEntity
     /** 签名人名称 */
     private String qmrMc;
 
-    /** 签名人用户名 */
-    private String qmrUserName;
-
 
     public void setStudyId(Long studyId)
     {
@@ -106,11 +103,4 @@ public class StudyJcgj extends MpBaseEntity
         return qmrMc;
     }
 
-    public String getQmrUserName() {
-        return qmrUserName;
-    }
-
-    public void setQmrUserName(String qmrUserName) {
-        this.qmrUserName = qmrUserName;
-    }
 }

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

@@ -7,5 +7,15 @@ import com.hxhq.business.domain.GyzjFfjl;
  */
 public class FfjlDetailDto extends GyzjFfjl {
 
+    /** 发放目的名称 */
+    private String mdMcs;
+
+    public String getMdMcs() {
+        return mdMcs;
+    }
+
+    public void setMdMcs(String mdMcs) {
+        this.mdMcs = mdMcs;
+    }
 
 }

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

@@ -88,6 +88,28 @@ public class FfjlListDto {
     /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */
     private Long jyzt;
 
+    /** 发放目的名称 */
+    private String mdMcs;
+
+    /** 发放目的其他 */
+    private String mdOther;
+
+    public String getMdOther() {
+        return mdOther;
+    }
+
+    public void setMdOther(String mdOther) {
+        this.mdOther = mdOther;
+    }
+
+    public String getMdMcs() {
+        return mdMcs;
+    }
+
+    public void setMdMcs(String mdMcs) {
+        this.mdMcs = mdMcs;
+    }
+
     public String getRkmz() {
         return rkmz;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/common/SignForm.java

@@ -22,10 +22,6 @@ public class SignForm {
      */
     private String qmrMc;
     /**
-     * 签名人用户名
-     */
-    private String qmrUserName;
-    /**
      * 签名密码
      */
     private String qmrmm;
@@ -72,14 +68,6 @@ public class SignForm {
         this.qmrMc = qmrMc;
     }
 
-    public String getQmrUserName() {
-        return qmrUserName;
-    }
-
-    public void setQmrUserName(String qmrUserName) {
-        this.qmrUserName = qmrUserName;
-    }
-
     public String getQmrmm() {
         return qmrmm;
     }

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

@@ -21,7 +21,7 @@ public class FfForm {
     private String mdMcs;
 
     /** 目的其他 */
-    private String mdOthers;
+    private String mdOther;
 
     /** 出库毛重 */
     private String ckmz;
@@ -61,12 +61,12 @@ public class FfForm {
         this.mdMcs = mdMcs;
     }
 
-    public String getMdOthers() {
-        return mdOthers;
+    public String getMdOther() {
+        return mdOther;
     }
 
-    public void setMdOthers(String mdOthers) {
-        this.mdOthers = mdOthers;
+    public void setMdOther(String mdOther) {
+        this.mdOther = mdOther;
     }
 
     public String getCkmzdw() {

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlffItem.java

@@ -21,7 +21,7 @@ public class PlffItem {
     private String mdMcs;
 
     /** 目的其他 */
-    private String mdOthers;
+    private String mdOther;
 
     /** 出库毛重 */
     private String ckmz;
@@ -37,12 +37,12 @@ public class PlffItem {
         this.mdMcs = mdMcs;
     }
 
-    public String getMdOthers() {
-        return mdOthers;
+    public String getMdOther() {
+        return mdOther;
     }
 
-    public void setMdOthers(String mdOthers) {
-        this.mdOthers = mdOthers;
+    public void setMdOther(String mdOther) {
+        this.mdOther = mdOther;
     }
 
     public String getCkmzdw() {

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

@@ -116,13 +116,11 @@ public interface IGyzjFfjlService extends IService {
 
     /**
      * 发放
-     * @param ckmz
-     * @param ckmzdw
      * @param zytj
      * @param remark
      * @param mdIds
      * @param mdMcs
-     * @param mdOthers
+     * @param mdOther
      * @param gyzj
      * @param lqr1
      * @param lqr2
@@ -130,6 +128,6 @@ public interface IGyzjFfjlService extends IService {
      * @param ffr2
      * @param time
      */
-    public void ff(String ckmz, String ckmzdw, String zytj, String remark, String mdIds,String mdMcs,String mdOthers, Gyzj gyzj, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time);
+    public void ff( String zytj, String remark, String mdIds,String mdMcs, String mdOther,Gyzj gyzj, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time);
 
 }

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

@@ -31,9 +31,8 @@ public interface IStudyJcgjService extends IService
      * @param jcnr
      * @param qmrId
      * @param qmrMc
-     * @param qmrUserName
      * @param remark
      */
-    void saveInfo(Long studyId, JcgjlxEnum jcgjlx, JcmcysEnum jcmcys,String jcmc,String jcnr,Long qmrId,String qmrMc,String qmrUserName,String remark);
+    void saveInfo(Long studyId, JcgjlxEnum jcgjlx, JcmcysEnum jcmcys,String jcmc,String jcnr,Long qmrId,String qmrMc,String remark);
 
 }

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

@@ -461,7 +461,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void ff(String ckmz, String ckmzdw, String zytj, String remark, String mdIds,String mdMcs,String mdOthers, Gyzj gyzj, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time) {
+    public void ff( String zytj, String remark, String mdIds,String mdMcs,String mdOther, Gyzj gyzj, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time) {
 
         GyzjFfjl gyzjFfjl = new GyzjFfjl();
         gyzjFfjl.setGyzjId(gyzj.getId());
@@ -475,8 +475,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         gyzjFfjl.setCctj(gyzj.getCctj());
         gyzjFfjl.setCkl(gyzj.getKc());
         gyzjFfjl.setCkldw(gyzj.getKcdw());
-        gyzjFfjl.setCkmz(ckmz);
-        gyzjFfjl.setCkmzdw(ckmzdw);
+        gyzjFfjl.setCkmz(gyzj.getCkl());
+        gyzjFfjl.setCkmzdw(gyzj.getKcdw());
         gyzjFfjl.setLqr1Id(lqr1.getUserId());
         gyzjFfjl.setLqr2Id(lqr2.getUserId());
         gyzjFfjl.setFfr1Id(ffr1.getUserId());
@@ -489,6 +489,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         gyzjFfjl.setFfrq(time);
         gyzjFfjl.setFfbz(remark);
         gyzjFfjl.setMdIds(mdIds);
+        gyzjFfjl.setMdOther(mdOther);
         this.save(gyzjFfjl);
         //新增试验物资
         if(StringUtils.isNoneBlank(mdIds)){
@@ -504,8 +505,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("出库量", gyzj.getKc() + gyzj.getKcdw());
         formData.put("转移条件", zytj);
-        formData.put("出库净重", ckmz + gyzj.getKcdw());
-        formData.put("目的", mdMcs+mdOthers);
+        formData.put("出库净重", gyzj.getKc() + gyzj.getKcdw());
+        formData.put("目的", mdMcs);
         formData.put("备注", remark);
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjl.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData),
                 SecurityUtils.getUserId(), SecurityUtils.getNickName());

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

@@ -14,7 +14,7 @@ import com.hxhq.business.service.IGyzjJcgjService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
- * 麻精药-稽查轨迹Service业务层处理
+ * -稽查轨迹Service业务层处理
  *
  * @author hxhq
  * @date 2025-12-18
@@ -32,7 +32,7 @@ public class GyzjJcgjServiceImpl extends ServiceImpl i
     public List<GyzjJcgj> queryList(GyzjJcgj gyzjJcgj){
         QueryWrapper<GyzjJcgj> queryWrapper = Wrappers.query();
         if(gyzjJcgj.getGyzjId()==null||gyzjJcgj.getGyzjId().longValue()<0){
-            throw new ServiceException("麻精药id不能为空");
+            throw new ServiceException("id不能为空");
         }
         queryWrapper.eq("gyzj_id",gyzjJcgj.getGyzjId());
         if(gyzjJcgj.getJcgjlx()!=null&&gyzjJcgj.getJcgjlx().intValue()>0){
@@ -48,7 +48,7 @@ public class GyzjJcgjServiceImpl extends ServiceImpl i
 
     /**
      * 新增稽查轨迹
-     * @param gyzjId 麻精药id
+     * @param gyzjId id
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色

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

@@ -765,22 +765,28 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
             throw new ServiceException("给药制剂【" + gyzjOld.getMc() + "】不是入库状态，不能发放");
         }
         Date now = new Date();
-        gyzjFfjlService.ff(form.getCkmz(), form.getCkmzdw(), form.getZytj(), form.getRemark(), form.getMdIds(),form.getMdMcs(),form.getMdOthers(),  gyzjOld, lqr1, lqr2, ffr1, ffr2, now);
+
+        //region 发放记录，试验物资
+        gyzjFfjlService.ff( form.getZytj(), form.getRemark(), form.getMdIds(),form.getMdMcs(),form.getMdOther(),gyzjOld, lqr1, lqr2, ffr1, ffr2, now);
+        //endregion
+
         //region 稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("出库量", gyzjOld.getKc() + gyzjOld.getKcdw());
         formData.put("转移条件", form.getZytj());
-        formData.put("出库净重", form.getCkmz() + gyzjOld.getKcdw());
-        formData.put("目的", form.getMdIds());
+        formData.put("出库净重", gyzjOld.getKc() + gyzjOld.getKcdw());
+        formData.put("目的", form.getMdMcs());
         formData.put("备注", form.getRemark());
         gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData),
                 SecurityUtils.getUserId(), SecurityUtils.getNickName());
         //endregion
+
         //region 台账
         gyzjTzService.saveTz(gyzjOld.getId(), lqr1.getNickName() + "," + lqr2.getNickName(), "",
                 ffr1.getNickName() + "," + ffr2.getNickName(), "", null, "",
                 "领取发放", gyzjOld.getKc(), gyzjOld.getKcdw(), form.getRemark());
         //endregion
+
         //region 更新发放信息
         gyzjOld.setCkl(gyzjOld.getKc());
         gyzjOld.setCkldw(gyzjOld.getKcdw());
@@ -799,7 +805,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         gyzjOld.setFfrq(now);
         gyzjOld.setFfbz(form.getRemark());
         gyzjOld.setMdIds(form.getMdIds());
-        gyzjOld.setMdOther(form.getMdOthers());
+        gyzjOld.setMdOther(form.getMdOther());
         gyzjOld.setZjzt(ZjztEnum.yff.getValue());
         //endregion
 
@@ -847,7 +853,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                     .filter(p -> p.getId().equals(gyzj.getId()))
                     .collect(Collectors.toList());
             if (plffItemFilter.size() > 0) {
-                gyzjFfjlService.ff(plffItemFilter.get(0).getCkmz(), plffItemFilter.get(0).getCkmzdw(), plffItemFilter.get(0).getZytj(), plffItemFilter.get(0).getRemark(), plffItemFilter.get(0).getMdIds(),plffItemFilter.get(0).getMdMcs(),plffItemFilter.get(0).getMdOthers(), gyzj, lqr1, lqr2, ffr1, ffr2, now);
+                gyzjFfjlService.ff( plffItemFilter.get(0).getZytj(), plffItemFilter.get(0).getRemark(), plffItemFilter.get(0).getMdIds(),plffItemFilter.get(0).getMdMcs(),plffItemFilter.get(0).getMdOther(), gyzj, lqr1, lqr2, ffr1, ffr2, now);
                 //region 稽查轨迹
                 GyzjJcgj gyzjJcgj = new GyzjJcgj();
                 gyzjJcgj.setGyzjId(gyzj.getId());
@@ -894,7 +900,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                 gyzj.setFfrq(now);
                 gyzj.setFfbz(plffItemFilter.get(0).getRemark());
                 gyzj.setMdIds(plffItemFilter.get(0).getMdIds());
-                gyzj.setMdOther(plffItemFilter.get(0).getMdOthers());
+                gyzj.setMdOther(plffItemFilter.get(0).getMdOther());
                 gyzj.setZjzt(ZjztEnum.yff.getValue());
                 //endregion
             } else {

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

@@ -50,7 +50,7 @@ public class StudyJcgjServiceImpl extends ServiceImpl
     }
 
     @Override
-    public void saveInfo(Long studyId, JcgjlxEnum jcgjlx, JcmcysEnum jcmcys, String jcmc, String jcnr, Long qmrId, String qmrMc,String qmrUserName,String remark) {
+    public void saveInfo(Long studyId, JcgjlxEnum jcgjlx, JcmcysEnum jcmcys, String jcmc, String jcnr, Long qmrId, String qmrMc,String remark) {
         StudyJcgj info = new StudyJcgj();
         info.setStudyId(studyId);
         info.setJcgjlx(jcgjlx.getValue());
@@ -59,7 +59,6 @@ public class StudyJcgjServiceImpl extends ServiceImpl
         info.setJcnr(jcnr);
         info.setQmrId(qmrId);
         info.setQmrMc(qmrMc);
-        info.setQmrUserName(qmrUserName);
         info.setRemark(remark);
 
         save(info);

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

@@ -189,11 +189,11 @@ public class StudyServiceImpl extends ServiceImpl implements
             if(study.getStatus().equals(StudyStatusEnum.cg.getValue())){
                 Map<String, String> formData = new LinkedHashMap<>();
                 formData.put("暂存人", SecurityUtils.getNickName());
-                studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"暂存实验", JctUtil.formatStr(formData),null,null,null,null);
+                studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"暂存实验", JctUtil.formatStr(formData),null,null,null);
             }else{
                 checkPassword(sign);
 
-                studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"创建实验", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),sign.getRemark());
+                studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"创建实验", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),sign.getRemark());
             }
         }else{
             //修改
@@ -220,7 +220,6 @@ public class StudyServiceImpl extends ServiceImpl implements
                     if(study.getStatus().equals(StudyStatusEnum.syz.getValue())){
                         jcgj.setQmrId(SecurityUtils.getUserId());
                         jcgj.setQmrMc(SecurityUtils.getNickName());
-                        jcgj.setQmrUserName(SecurityUtils.getUsername());
                         jcgj.setRemark(sign.getRemark());
                     }
                     jcgjList.add(jcgj);
@@ -234,21 +233,21 @@ public class StudyServiceImpl extends ServiceImpl implements
                 formData.put("新增人员", study.getLeaderName());
                 formData.put("删除人员", old.getLeaderName());
                 if(study.getStatus().equals(StudyStatusEnum.cg.getValue())){
-                    studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.ry, JcmcysEnum.blue,"人员变更", JctUtil.formatStr(formData), null,null,null,null);
+                    studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.ry, JcmcysEnum.blue,"人员变更", JctUtil.formatStr(formData), null,null,null);
                 }else{
-                    studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.ry, JcmcysEnum.blue,"人员变更", JctUtil.formatStr(formData), SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),sign.getRemark());
+                    studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.ry, JcmcysEnum.blue,"人员变更", JctUtil.formatStr(formData), SecurityUtils.getUserId(),SecurityUtils.getNickName(),sign.getRemark());
                 }
             }
 
             if(study.getStatus().equals(StudyStatusEnum.cg.getValue())){
                 Map<String, String> formData = new LinkedHashMap<>();
                 formData.put("暂存人", SecurityUtils.getNickName());
-                studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"暂存实验", JctUtil.formatStr(formData),null,null,null,null);
+                studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"暂存实验", JctUtil.formatStr(formData),null,null,null);
             }else {
                 checkPassword(sign);
 
                 if(old.getStatus().equals(StudyStatusEnum.cg.getValue())){
-                    studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"创建实验", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),sign.getRemark());
+                    studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"创建实验", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),sign.getRemark());
                 }
             }
             updateById(study);
@@ -270,7 +269,7 @@ public class StudyServiceImpl extends ServiceImpl implements
         }
         checkPermit(info);
         checkPassword(sign);
-        studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.red,"删除实验", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),sign.getRemark());
+        studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.red,"删除实验", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),sign.getRemark());
         removeById(study.getId());
     }
 
@@ -298,7 +297,7 @@ public class StudyServiceImpl extends ServiceImpl implements
         checkPassword(sign);
         info.setStatus(StudyStatusEnum.ysd.getValue());
         updateById(info);
-        studyJcgjService.saveInfo(info.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"锁定实验", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),sign.getRemark());
+        studyJcgjService.saveInfo(info.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"锁定实验", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),sign.getRemark());
     }
 
     @Override
@@ -318,7 +317,7 @@ public class StudyServiceImpl extends ServiceImpl implements
         checkPassword(sign);
         info.setStatus(StudyStatusEnum.syz.getValue());
         updateById(info);
-        studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"解锁实验", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),sign.getRemark());
+        studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"解锁实验", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),sign.getRemark());
     }
 
     @Override
@@ -338,7 +337,7 @@ public class StudyServiceImpl extends ServiceImpl implements
         checkPassword(sign);
         info.setStatus(StudyStatusEnum.dgd.getValue());
         updateById(info);
-        studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"申请归档", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),sign.getRemark());
+        studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"申请归档", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),sign.getRemark());
     }
 
     @Override
@@ -358,7 +357,7 @@ public class StudyServiceImpl extends ServiceImpl implements
         checkPassword(sign);
         info.setStatus(StudyStatusEnum.djd.getValue());
         updateById(info);
-        studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"申请解档", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),sign.getRemark());
+        studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"申请解档", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),sign.getRemark());
     }
 
     @Override
@@ -380,7 +379,7 @@ public class StudyServiceImpl extends ServiceImpl implements
         info.setBorrowStartDate(sign.getStartDate());
         info.setBorrowEndDate(sign.getEndDate());
         updateById(info);
-        studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"申请借阅", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),sign.getRemark());
+        studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,"申请借阅", null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),sign.getRemark());
     }
 
     @Override

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

@@ -179,7 +179,7 @@ public class StudySubjectServiceImpl extends ServiceImpl
             if(deleteNameList.size()>0){
                 formData.put("删除人员", String.join("，",deleteNameList));
             }
-            studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.ry, JcmcysEnum.blue,"人员变更", JctUtil.formatStr(formData), SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),form.getSign().getRemark());
+            studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.ry, JcmcysEnum.blue,"人员变更", JctUtil.formatStr(formData), SecurityUtils.getUserId(),SecurityUtils.getNickName(),form.getSign().getRemark());
         }
     }
 

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

@@ -112,7 +112,7 @@ public class StudySubjectUserServiceImpl extends ServiceImpl
             if(deleteNameList.size()>0){
                 formData.put("删除人员", String.join("，",deleteNameList));
             }
-            studyJcgjService.saveInfo(studySubject.getStudyId(), JcgjlxEnum.ry, JcmcysEnum.blue,"人员变更", JctUtil.formatStr(formData), SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),form.getSign().getRemark());
+            studyJcgjService.saveInfo(studySubject.getStudyId(), JcgjlxEnum.ry, JcmcysEnum.blue,"人员变更", JctUtil.formatStr(formData), SecurityUtils.getUserId(),SecurityUtils.getNickName(),form.getSign().getRemark());
         }
     }
 
@@ -126,7 +126,7 @@ public class StudySubjectUserServiceImpl extends ServiceImpl
             if(deleteNameList.size()>0){
                 Map<String, String> formData = new LinkedHashMap<>();
                 formData.put("删除人员", String.join("，",deleteNameList));
-                studyJcgjService.saveInfo(studyId, JcgjlxEnum.ry, JcmcysEnum.blue,"人员变更", JctUtil.formatStr(formData), SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),signRemark);
+                studyJcgjService.saveInfo(studyId, JcgjlxEnum.ry, JcmcysEnum.blue,"人员变更", JctUtil.formatStr(formData), SecurityUtils.getUserId(),SecurityUtils.getNickName(),signRemark);
             }
         }
         remove(queryWrapper);

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

@@ -5,11 +5,11 @@
 <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.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,s.name as mdMc
-        ,z.mc as zcgMc
+        ,t.syl,t.syldw,t.jlzt,t.jyzt,t.md_other
+        ,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
-        join  `t_study` s on s.id=t.md_id
-        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}
@@ -18,7 +18,8 @@
     </select>
 
     <select id="queryInfo" resultType="com.hxhq.business.dto.gyzj.FfjlDetailDto">
-        select t.*
+        select t.*,
+        (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
         where t.id=#{id}
     </select>

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

@@ -5,7 +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 bdssrMc,
+        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
         FROM `t_gyzj` t
         left join  `t_study` s on s.id=t.study_id