fix：样式优化

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

@@ -201,6 +201,50 @@ public class Gyzj extends MpBaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date jyjsrq;
 
+    /** 归还人1id */
+    private Long ghr1Id;
+
+    /** 归还人2id */
+    private Long ghr2Id;
+
+    /** 归还人1名称 */
+    private String ghr1Mc;
+
+    /** 归还人2名称 */
+    private String ghr2Mc;
+
+    public String getGhr1Mc() {
+        return ghr1Mc;
+    }
+
+    public void setGhr1Mc(String ghr1Mc) {
+        this.ghr1Mc = ghr1Mc;
+    }
+
+    public String getGhr2Mc() {
+        return ghr2Mc;
+    }
+
+    public void setGhr2Mc(String ghr2Mc) {
+        this.ghr2Mc = ghr2Mc;
+    }
+
+    public Long getGhr1Id() {
+        return ghr1Id;
+    }
+
+    public void setGhr1Id(Long ghr1Id) {
+        this.ghr1Id = ghr1Id;
+    }
+
+    public Long getGhr2Id() {
+        return ghr2Id;
+    }
+
+    public void setGhr2Id(Long ghr2Id) {
+        this.ghr2Id = ghr2Id;
+    }
+
     public Integer getGhzt() {
         return ghzt;
     }

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

@@ -40,6 +40,12 @@ public class FfjlListDto {
     /** 入库单位 */
     private String rkldw;
 
+    /** 入库毛重 */
+    private String rkmz;
+
+    /** 入库毛重单位 */
+    private String rkmzdw;
+
     /** 出库毛重 */
     private String ckmz;
 
@@ -70,12 +76,50 @@ public class FfjlListDto {
     /** 目的名称 */
     private String mdMc;
 
+    /** 接收人1名称 */
+    private String jsr1Mc;
+
+    /** 接收人2名称 */
+    private String jsr2Mc;
+
     /** 记录状态 1:未锁定 3:已锁定 5:待归档 7:归档 9:待解档 */
     private Long jlzt;
 
     /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */
     private Long jyzt;
 
+    public String getRkmz() {
+        return rkmz;
+    }
+
+    public void setRkmz(String rkmz) {
+        this.rkmz = rkmz;
+    }
+
+    public String getRkmzdw() {
+        return rkmzdw;
+    }
+
+    public void setRkmzdw(String rkmzdw) {
+        this.rkmzdw = rkmzdw;
+    }
+
+    public String getJsr1Mc() {
+        return jsr1Mc;
+    }
+
+    public void setJsr1Mc(String jsr1Mc) {
+        this.jsr1Mc = jsr1Mc;
+    }
+
+    public String getJsr2Mc() {
+        return jsr2Mc;
+    }
+
+    public void setJsr2Mc(String jsr2Mc) {
+        this.jsr2Mc = jsr2Mc;
+    }
+
     public String getMdMc() {
         return mdMc;
     }

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

@@ -18,8 +18,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @author hxhq
  * @date 2025-12-21
  */
-public interface IGyzjFfjlService extends IService<GyzjFfjl>
-{
+public interface IGyzjFfjlService extends IService<GyzjFfjl> {
     /**
      * 详情
      *
@@ -49,21 +48,21 @@ public interface IGyzjFfjlService extends IService
      *
      * @param form
      */
-    public void  jd(@RequestBody FfjlJdForm form);
+    public void jd(FfjlJdForm form);
 
     /**
      * 批量归档
      *
      * @param form
      */
-    public void plgd(@RequestBody FfjlGdForm form);
+    public void plgd(FfjlGdForm form);
 
     /**
      * 归档
      *
      * @param form
      */
-    public void gd(@RequestBody FfjlGdForm form);
+    public void gd(FfjlGdForm form);
 
 
     /**
@@ -71,21 +70,21 @@ public interface IGyzjFfjlService extends IService
      *
      * @param form
      */
-    public void plsd(@RequestBody FfjlSdForm form);
+    public void plsd(FfjlSdForm form);
 
     /**
      * 锁定
      *
      * @param form
      */
-    public void sd(@RequestBody FfjlSdForm form);
+    public void sd(FfjlSdForm form);
 
     /**
      * 解锁
      *
      * @param form
      */
-    public void js(@RequestBody FfjlJsForm form);
+    public void js(FfjlJsForm form);
 
 
     /**
@@ -93,7 +92,7 @@ public interface IGyzjFfjlService extends IService
      *
      * @param form
      */
-    public void jy(@RequestBody FfjlJyForm form);
+    public void jy(FfjlJyForm form);
 
 
     /**
@@ -101,7 +100,7 @@ public interface IGyzjFfjlService extends IService
      *
      * @param form
      */
-    public void jq(@RequestBody FfjlJqForm form);
+    public void jq(FfjlJqForm form);
 
 
     /**
@@ -109,12 +108,11 @@ public interface IGyzjFfjlService extends IService
      *
      * @param form
      */
-    public void gh(@RequestBody GhForm form, Gyzj gyzj, SysUser ghr1, SysUser ghr2, SysUser jsr1, SysUser jsr2);
+    public void gh( GhForm form, Gyzj gyzj, SysUser ghr1, SysUser ghr2, SysUser jsr1, SysUser jsr2);
 
     /**
      * 发放
-     *
      */
-    public void ff(String ckmz,String ckmzdw,String zytj,String remark,String mdIds, Gyzj gyzj, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time);
+    public void ff(String ckmz, String ckmzdw, String zytj, String remark, String mdIds, Gyzj gyzj, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time);
 
 }

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

@@ -18,8 +18,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @author hxhq
  * @date 2025-12-21
  */
-public interface IMjyFfjlService extends IService<MjyFfjl>
-{
+public interface IMjyFfjlService extends IService<MjyFfjl> {
     /**
      * 详情
      *
@@ -49,21 +48,21 @@ public interface IMjyFfjlService extends IService
      *
      * @param form
      */
-    public void  jd(@RequestBody FfjlJdForm form);
+    public void jd(FfjlJdForm form);
 
     /**
      * 批量归档
      *
      * @param form
      */
-    public void plgd(@RequestBody FfjlGdForm form);
+    public void plgd(FfjlGdForm form);
 
     /**
      * 归档
      *
      * @param form
      */
-    public void gd(@RequestBody FfjlGdForm form);
+    public void gd(FfjlGdForm form);
 
 
     /**
@@ -71,21 +70,21 @@ public interface IMjyFfjlService extends IService
      *
      * @param form
      */
-    public void plsd(@RequestBody FfjlSdForm form);
+    public void plsd(FfjlSdForm form);
 
     /**
      * 锁定
      *
      * @param form
      */
-    public void sd(@RequestBody FfjlSdForm form);
+    public void sd(FfjlSdForm form);
 
     /**
      * 解锁
      *
      * @param form
      */
-    public void js(@RequestBody FfjlJsForm form);
+    public void js(FfjlJsForm form);
 
 
     /**
@@ -93,7 +92,7 @@ public interface IMjyFfjlService extends IService
      *
      * @param form
      */
-    public void jy(@RequestBody FfjlJyForm form);
+    public void jy(FfjlJyForm form);
 
 
     /**
@@ -101,7 +100,7 @@ public interface IMjyFfjlService extends IService
      *
      * @param form
      */
-    public void jq(@RequestBody FfjlJqForm form);
+    public void jq(FfjlJqForm form);
 
 
     /**
@@ -109,12 +108,11 @@ public interface IMjyFfjlService extends IService
      *
      * @param form
      */
-    public void gh(@RequestBody GhForm form, Mjy mjy, SysUser ghr1, SysUser ghr2, SysUser jsr1, SysUser jsr2);
+    public void gh(GhForm form, Mjy mjy, SysUser ghr1, SysUser ghr2, SysUser jsr1, SysUser jsr2);
 
     /**
      * 发放
-     *
      */
-    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(String ckmz, String ckmzdw, String zytj, String remark, String mdIds, Mjy mjy, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time);
 
-    }
+}

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

@@ -16,8 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @author hxhq
  * @date 2025-12-18
  */
-public interface IMjyService extends IService<Mjy>
-{
+public interface IMjyService extends IService<Mjy> {
     /**
      * 查询麻精药列表
      *
@@ -39,21 +38,21 @@ public interface IMjyService extends IService
      *
      * @param form
      */
-    public void  jd(@RequestBody JdForm form);
+    public void jd(JdForm form);
 
     /**
      * 批量归档
      *
      * @param form
      */
-    public void plgd(@RequestBody GdForm form);
+    public void plgd(GdForm form);
 
     /**
      * 归档
      *
      * @param form
      */
-    public void gd(@RequestBody GdForm form);
+    public void gd(GdForm form);
 
 
     /**
@@ -61,49 +60,49 @@ public interface IMjyService extends IService
      *
      * @param form
      */
-    public void plsd(@RequestBody SdForm form);
+    public void plsd(SdForm form);
 
     /**
      * 锁定
      *
      * @param form
      */
-    public void sd(@RequestBody SdForm form);
+    public void sd(SdForm form);
 
     /**
      * 解锁
      *
      * @param form
      */
-    public void js(@RequestBody JsForm form);
+    public void js(JsForm form);
 
     /**
      * 批量处置药剂
      *
      * @param form
      */
-    public void plczyj(@RequestBody PlczyjForm form);
+    public void plczyj(PlczyjForm form);
 
     /**
      * 处置药剂
      *
      * @param form
      */
-    public void czyj(@RequestBody CzyjForm form);
+    public void czyj(CzyjForm form);
 
     /**
      * 批量处置容器
      *
      * @param form
      */
-    public void plczrq(@RequestBody PlczrqForm form);
+    public void plczrq(PlczrqForm form);
 
     /**
      * 处置容器
      *
      * @param form
      */
-    public void czrq(@RequestBody CzrqForm form);
+    public void czrq(CzrqForm form);
 
 
     /**
@@ -111,7 +110,7 @@ public interface IMjyService extends IService
      *
      * @param form
      */
-    public void ysff(@RequestBody YsffForm form);
+    public void ysff(YsffForm form);
 
 
     /**
@@ -119,7 +118,7 @@ public interface IMjyService extends IService
      *
      * @param form
      */
-    public void ff(@RequestBody FfForm form);
+    public void ff(FfForm form);
 
 
     /**
@@ -127,35 +126,35 @@ public interface IMjyService extends IService
      *
      * @param form
      */
-    public void plff(@RequestBody PlffForm form);
+    public void plff(PlffForm form);
 
     /**
      * 编辑
      *
      * @param form
      */
-    public void bj(@RequestBody BjForm form);
+    public void bj(BjForm form);
 
     /**
      * 审核编辑
      *
      * @param form
      */
-    public void shbj(@RequestBody ShbjForm form);
+    public void shbj(ShbjForm form);
 
     /**
      * 修改库存
      *
      * @param form
      */
-    public void xgkc(@RequestBody XgkcForm form);
+    public void xgkc(XgkcForm form);
 
     /**
      * 审核修改库存
      *
      * @param form
      */
-    public void shxgkc(@RequestBody ShxgkcForm form);
+    public void shxgkc(ShxgkcForm form);
 
 
     /**
@@ -163,12 +162,12 @@ public interface IMjyService extends IService
      *
      * @param form
      */
-    public void jy(@RequestBody JyForm form);
+    public void jy(JyForm form);
 
     /**
      * 归还
      *
      * @param form
      */
-    public void gh(@RequestBody GhForm form);
+    public void gh(GhForm form);
 }

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

@@ -34,8 +34,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @date 2025-12-21
  */
 @Service
-public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> implements IGyzjFfjlService
-{
+public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> implements IGyzjFfjlService {
     @Autowired
     private ISysUserService sysUserService;
     @Autowired
@@ -48,11 +47,11 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
      * @return
      */
     @Override
-    public GyzjFfjl queryLastInfoByGyzjId(Long gyzjId){
+    public GyzjFfjl queryLastInfoByGyzjId(Long gyzjId) {
         QueryWrapper<GyzjFfjl> queryWrapper = Wrappers.query();
-        queryWrapper.eq("gyzj_id",gyzjId);
+        queryWrapper.eq("gyzj_id", gyzjId);
         queryWrapper.orderByDesc("id");
-        return this.getOne(queryWrapper,false);
+        return this.getOne(queryWrapper, false);
     }
 
     /**
@@ -62,8 +61,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
      * @return 发放记录发放记录
      */
     @Override
-    public List<FfjlListDto> queryList(FfjlSearchForm form)
-    {
+    public List<FfjlListDto> queryList(FfjlSearchForm form) {
         QueryWrapper<GyzjFfjl> queryWrapper = Wrappers.query();
         queryWrapper.eq("t.del_flag", "0");
         if (form.getJyzt() != null && form.getJyzt().intValue() > 0) {
@@ -79,19 +77,19 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
             queryWrapper.and(p -> p.like("t.`bh`", form.getBh()));
         }
         if (StringUtils.isNoneBlank(form.getStartDateCk())) {
-            queryWrapper.and(p->p.apply("t.ffrq>={0}", form.getStartDateCk()));
+            queryWrapper.and(p -> p.apply("t.ffrq>={0}", form.getStartDateCk()));
         }
         if (StringUtils.isNoneBlank(form.getEndDateCk())) {
             queryWrapper.apply("t.ffrq>={0}", form.getStartDateCk());
         }
         if (StringUtils.isNoneBlank(form.getStartDateRk())) {
-            queryWrapper.and(p->p.apply("t.rkrq>={0}", form.getStartDateRk()));
+            queryWrapper.and(p -> p.apply("t.rkrq>={0}", form.getStartDateRk()));
         }
         if (StringUtils.isNoneBlank(form.getEndDateRk())) {
             queryWrapper.apply("t.rkrq>={0}", form.getEndDateRk());
         }
         if (form.getMdId() != null && form.getMdId().intValue() > 0) {
-            queryWrapper.and(p->p.apply("find_in_set({0}, t.`md_ids`) or t.md_ids={0}", form.getMdId()));
+            queryWrapper.and(p -> p.apply("find_in_set({0}, t.`md_ids`) or t.md_ids={0}", form.getMdId()));
         }
         queryWrapper.orderByDesc("t.id");
         return baseMapper.queryList(queryWrapper);
@@ -104,7 +102,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void jq(@RequestBody FfjlJqForm form) {
+    public void jq(FfjlJqForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -121,7 +119,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "补充说明");
-        formData.put("签名人",  qmr.getNickName());
+        formData.put("签名人", qmr.getNickName());
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "补充说明", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
     }
 
@@ -132,7 +130,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void jy(@RequestBody FfjlJyForm form) {
+    public void jy(FfjlJyForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -159,7 +157,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate()));
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "申请借阅");
-        formData.put("签名人",  qmr.getNickName());
+        formData.put("签名人", qmr.getNickName());
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
     }
 
@@ -184,7 +182,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void jd(@RequestBody FfjlJdForm form) {
+    public void jd(FfjlJdForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -204,7 +202,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "申请解档");
-        formData.put("签名人",  qmr.getNickName());
+        formData.put("签名人", qmr.getNickName());
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
 
     }
@@ -216,7 +214,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void plgd(@RequestBody FfjlGdForm form) {
+    public void plgd(FfjlGdForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getIds().length < 0) {
@@ -245,7 +243,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
                 Map<String, String> formData = new LinkedHashMap<>();
                 formData.put("备注", form.getRemark());
                 formData.put("签名意义", "申请归档");
-                formData.put("签名人",  qmr.getNickName());
+                formData.put("签名人", qmr.getNickName());
                 gyzjFfjlJcgj.setJcnr(JctUtil.formatStr(formData));
                 gyzjFfjlJcgj.setQmrId(SecurityUtils.getUserId());
                 gyzjFfjlJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
@@ -265,7 +263,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void gd(@RequestBody FfjlGdForm form) {
+    public void gd(FfjlGdForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -285,7 +283,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "申请归档");
-        formData.put("签名人",  qmr.getNickName());
+        formData.put("签名人", qmr.getNickName());
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
 
     }
@@ -298,7 +296,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void plsd(@RequestBody FfjlSdForm form) {
+    public void plsd(FfjlSdForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getIds().length < 0) {
@@ -325,7 +323,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
             Map<String, String> formData = new LinkedHashMap<>();
             formData.put("备注", form.getRemark());
             formData.put("签名意义", "锁定发放记录");
-            formData.put("签名人",  qmr.getNickName());
+            formData.put("签名人", qmr.getNickName());
 
             gyzjFfjlJcgj.setJcnr(JctUtil.formatStr(formData));
             gyzjFfjlJcgj.setQmrId(SecurityUtils.getUserId());
@@ -346,7 +344,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void sd(@RequestBody FfjlSdForm form) {
+    public void sd(FfjlSdForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -365,7 +363,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "锁定发放记录");
-        formData.put("签名人",  qmr.getNickName());
+        formData.put("签名人", qmr.getNickName());
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
 
     }
@@ -378,7 +376,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void js(@RequestBody FfjlJsForm form) {
+    public void js(FfjlJsForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -398,19 +396,18 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "解锁发放记录");
-        formData.put("签名人",  qmr.getNickName());
+        formData.put("签名人", qmr.getNickName());
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "解锁发放记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
 
     }
 
     /**
      * 归还
-     *
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void gh(@RequestBody GhForm form, Gyzj gyzj,SysUser ghr1,SysUser ghr2,SysUser jsr1,SysUser jsr2){
-        GyzjFfjl  gyzjFfjl=this.queryLastInfoByGyzjId(gyzj.getId());
+    public void gh( GhForm form, Gyzj gyzj, SysUser ghr1, SysUser ghr2, SysUser jsr1, SysUser jsr2) {
+        GyzjFfjl gyzjFfjl = this.queryLastInfoByGyzjId(form.getId());
         if (gyzjFfjl == null) {
             throw new SecurityException("发放记录不存在或已删除");
         }
@@ -441,28 +438,25 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         formData.put("入库位置", form.getRkwz());
         formData.put("入库条件", form.getRktj());
         formData.put("转移条件", form.getGhzytj());
-        formData.put("入库毛重", form.getRkmz()+gyzj.getKcdw());
-        formData.put("减少量", form.getJsl()+gyzj.getKcdw());
-        formData.put("使用量", form.getSyl()+gyzj.getKcdw());
+        formData.put("入库净重", form.getRkmz() + gyzj.getKcdw());
+        formData.put("使用量", form.getSyl() + gyzj.getKcdw());
         formData.put("归还人1", ghr1.getNickName());
         formData.put("归还人2", ghr2.getNickName());
         formData.put("库管员1", jsr1.getNickName());
         formData.put("库管员2", jsr2.getNickName());
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "归还");
-        gyzjFfjlJcgjService.saveJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        gyzjFfjlJcgjService.saveJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
         //endregion
     }
 
 
-
     /**
      * 发放
-     *
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void ff(String ckmz,String ckmzdw,String zytj,String remark,String mdIds, Gyzj gyzj, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time){
+    public void ff(String ckmz, String ckmzdw, String zytj, String remark, String mdIds, Gyzj gyzj, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time) {
 
         GyzjFfjl gyzjFfjl = new GyzjFfjl();
         gyzjFfjl.setGyzjId(gyzj.getId());
@@ -494,9 +488,9 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
 
         //region 稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
-        formData.put("出库量", gyzj.getKc()+ gyzj.getKcdw());
+        formData.put("出库量", gyzj.getKc() + gyzj.getKcdw());
         formData.put("转移条件", zytj);
-        formData.put("出库毛重", ckmz + gyzj.getKcdw());
+        formData.put("出库净重", ckmz + gyzj.getKcdw());
         formData.put("目的", mdIds);
         formData.put("备注", remark);
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjl.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData),

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

@@ -104,7 +104,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void jd(@RequestBody JdForm form) {
+    public void jd(JdForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -135,7 +135,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void jy(@RequestBody JyForm form) {
+    public void jy(JyForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -173,7 +173,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void plgd(@RequestBody GdForm form) {
+    public void plgd(GdForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getIds().length < 0) {
@@ -221,7 +221,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void gd(@RequestBody GdForm form) {
+    public void gd(GdForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -253,7 +253,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void plsd(@RequestBody SdForm form) {
+    public void plsd(SdForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getIds().length < 0) {
@@ -301,7 +301,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void sd(@RequestBody SdForm form) {
+    public void sd(SdForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -332,7 +332,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void js(@RequestBody JsForm form) {
+    public void js(JsForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -363,7 +363,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void plczyj(@RequestBody PlczyjForm form) {
+    public void plczyj(PlczyjForm form) {
         SysUser clr = sysUserService.selectUserById(form.getClrId());
 //        SysUser fhr = sysUserService.selectUserById(form.getFhrId());
 //        SysUser jdr = sysUserService.selectUserById(form.getJdrId());
@@ -445,7 +445,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void czyj(@RequestBody CzyjForm form) {
+    public void czyj(CzyjForm form) {
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new SecurityException("参数id不正确");
         }
@@ -508,7 +508,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void plczrq(@RequestBody PlczrqForm form) {
+    public void plczrq(PlczrqForm form) {
         SysUser clr = sysUserService.selectUserById(form.getClrId());
         if (clr == null) {
             throw new SecurityException("处理人不存在");
@@ -590,7 +590,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void czrq(@RequestBody CzrqForm form) {
+    public void czrq(CzrqForm form) {
         SysUser clr = sysUserService.selectUserById(form.getClrId());
         if (clr == null) {
             throw new SecurityException("处理人不存在");
@@ -645,7 +645,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void ysff(@RequestBody YsffForm form) {
+    public void ysff(YsffForm form) {
         SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id());
         SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id());
         SysUser ffr1 = sysUserService.selectUserById(form.getFfrId());
@@ -712,7 +712,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void ff(@RequestBody FfForm form) {
+    public void ff(FfForm form) {
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new SecurityException("参数id不正确");
         }
@@ -729,12 +729,12 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id());
         //验证领取人1、领取人2、发放人1、发放人2密码 todo
         Date now = new Date();
-        gyzjFfjlService.ff(form.getCkmz(),form.getCkmzdw(),form.getZytj(),form.getRemark(),form.getMdIds(),gyzjOld,lqr1,lqr2,ffr1,ffr2,now);
+        gyzjFfjlService.ff(form.getCkmz(), form.getCkmzdw(), form.getZytj(), form.getRemark(), form.getMdIds(), gyzjOld, lqr1, lqr2, ffr1, ffr2, now);
         //region 稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
-        formData.put("出库量", gyzjOld.getKc()+ gyzjOld.getKcdw());
+        formData.put("出库量", gyzjOld.getKc() + gyzjOld.getKcdw());
         formData.put("转移条件", form.getZytj());
-        formData.put("出库毛重", form.getCkmz() + gyzjOld.getKcdw());
+        formData.put("出库净重", form.getCkmz() + gyzjOld.getKcdw());
         formData.put("目的", form.getMdIds());
         formData.put("备注", form.getRemark());
         gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData),
@@ -776,7 +776,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void plff(@RequestBody PlffForm form) {
+    public void plff(PlffForm form) {
         SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id());
         SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id());
         SysUser ffr1 = sysUserService.selectUserById(form.getFfr1Id());
@@ -802,7 +802,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(),gyzj,lqr1,lqr2,ffr1,ffr2,now);
+                gyzjFfjlService.ff(plffItemFilter.get(0).getCkmz(), plffItemFilter.get(0).getCkmzdw(), plffItemFilter.get(0).getZytj(), plffItemFilter.get(0).getRemark(), plffItemFilter.get(0).getMdIds(), gyzj, lqr1, lqr2, ffr1, ffr2, now);
                 //region 稽查轨迹
                 GyzjJcgj gyzjJcgj = new GyzjJcgj();
                 gyzjJcgj.setGyzjId(gyzj.getId());
@@ -810,9 +810,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                 gyzjJcgj.setJcmc("领取发放");
                 gyzjJcgj.setJcmcys(JcmcysEnum.green.getValue());
                 Map<String, String> formData = new LinkedHashMap<>();
-                formData.put("出库量", gyzj.getKc()+ gyzj.getKcdw());
+                formData.put("出库量", gyzj.getKc() + gyzj.getKcdw());
                 formData.put("转移条件", plffItemFilter.get(0).getZytj());
-                formData.put("出库毛重", plffItemFilter.get(0).getCkmz() + gyzj.getKcdw());
+                formData.put("出库净重", plffItemFilter.get(0).getCkmz() + gyzj.getKcdw());
                 formData.put("目的", plffItemFilter.get(0).getMdIds());
                 formData.put("备注", plffItemFilter.get(0).getRemark());
                 gyzjJcgj.setJcnr(JctUtil.formatStr(formData));
@@ -867,7 +867,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void bj(@RequestBody BjForm form) {
+    public void bj(BjForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -922,7 +922,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void shbj(@RequestBody ShbjForm form) {
+    public void shbj(ShbjForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -990,7 +990,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void xgkc(@RequestBody XgkcForm form) {
+    public void xgkc(XgkcForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -1044,7 +1044,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void shxgkc(@RequestBody ShxgkcForm form) {
+    public void shxgkc(ShxgkcForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -1064,7 +1064,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         GyzjJcgj gyzjJcgj = new GyzjJcgj();
         gyzjJcgj.setGyzjId(gyzjOld.getId());
         gyzjJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
-        gyzjJcgj.setJcmc( ShXgkcEnum.getEnumByValue(form.getQmyy()).getText());
+        gyzjJcgj.setJcmc(ShXgkcEnum.getEnumByValue(form.getQmyy()).getText());
         if (form.getQmyy().equals(ShXgkcEnum.ty.getValue())) {
             gyzjJcgj.setJcmcys(JcmcysEnum.green.getValue());
         } else {
@@ -1108,7 +1108,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void gh(@RequestBody GhForm form) {
+    public void gh(GhForm form) {
         SysUser ghr1 = sysUserService.selectUserById(form.getGhr1Id());
         SysUser ghr2 = sysUserService.selectUserById(form.getGhr2Id());
         SysUser jsr1 = sysUserService.selectUserById(form.getJsr1Id());
@@ -1125,33 +1125,35 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         if (!gyzjOld.getZjzt().equals(ZjztEnum.yff.getValue())) {
             throw new SecurityException("给药制剂【" + gyzjOld.getMc() + "】不是已发放状态，不能归还");
         }
+        if (!gyzjOld.getGhzt().equals(GhztEnum.sqgh.getValue())) {
+            throw new SecurityException("给药制剂【" + gyzjOld.getMc() + "】不是申请归还状态，不能归还");
+        }
         BigDecimal kc = new BigDecimal(gyzjOld.getKc());
         BigDecimal syl = new BigDecimal(form.getSyl());
         if (syl.compareTo(kc) > 0) {
             throw new SecurityException("使用量不能大于出库量");
         }
         BigDecimal leftKc = new BigDecimal(gyzjOld.getKc()).subtract(new BigDecimal(form.getSyl()));
-        gyzjFfjlService.gh(form,gyzjOld,ghr1,ghr2,jsr1,jsr2);
+        gyzjFfjlService.gh(form, gyzjOld, ghr1, ghr2, jsr1, jsr2);
         //region 台账
         gyzjTzService.saveTz(gyzjOld.getId(), "", ghr1.getNickName() + "," + ghr2.getNickName(),
                 "", jsr1.getNickName() + "," + jsr2.getNickName(), null, null,
-                "归还", form.getRkmz(), gyzjOld.getKcdw(), form.getRemark());
+                "确认归还", form.getRkmz(), gyzjOld.getKcdw(), form.getRemark());
         //endregion
         //region 稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("入库位置", form.getRkwz());
         formData.put("入库条件", form.getRktj());
         formData.put("转移条件", form.getGhzytj());
-        formData.put("入库毛重", form.getRkmz()+gyzjOld.getKcdw());
-        formData.put("减少量", form.getJsl()+gyzjOld.getKcdw());
-        formData.put("使用量", form.getSyl()+gyzjOld.getKcdw());
+        formData.put("入库净重", form.getRkmz() + gyzjOld.getKcdw());
+        formData.put("使用量", form.getSyl() + gyzjOld.getKcdw());
         formData.put("归还人1", ghr1.getNickName());
         formData.put("归还人2", ghr2.getNickName());
         formData.put("库管员1", jsr1.getNickName());
         formData.put("库管员2", jsr2.getNickName());
         formData.put("备注", form.getRemark());
-        formData.put("签名意义", "归还");
-        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        formData.put("签名意义", "确认归还");
+        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
         //endregion
         gyzjOld.setKc(leftKc.toString());
         gyzjOld.setZjzt(ZjztEnum.rk.getValue());

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

@@ -34,8 +34,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @date 2025-12-21
  */
 @Service
-public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> implements IMjyFfjlService
-{
+public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> implements IMjyFfjlService {
     @Autowired
     private ISysUserService sysUserService;
     @Autowired
@@ -48,11 +47,11 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
      * @return
      */
     @Override
-    public MjyFfjl queryLastInfoByMjyId(Long mjyId){
+    public MjyFfjl queryLastInfoByMjyId(Long mjyId) {
         QueryWrapper<MjyFfjl> queryWrapper = Wrappers.query();
-        queryWrapper.eq("mjy_id",mjyId);
+        queryWrapper.eq("mjy_id", mjyId);
         queryWrapper.orderByDesc("id");
-        return this.getOne(queryWrapper,false);
+        return this.getOne(queryWrapper, false);
     }
 
     /**
@@ -62,8 +61,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
      * @return 发放记录发放记录
      */
     @Override
-    public List<FfjlListDto> queryList(FfjlSearchForm form)
-    {
+    public List<FfjlListDto> queryList(FfjlSearchForm form) {
         QueryWrapper<MjyFfjl> queryWrapper = Wrappers.query();
         queryWrapper.eq("t.del_flag", "0");
         if (form.getJyzt() != null && form.getJyzt().intValue() > 0) {
@@ -79,19 +77,19 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
             queryWrapper.and(p -> p.like("t.`bh`", form.getBh()));
         }
         if (StringUtils.isNoneBlank(form.getStartDateCk())) {
-            queryWrapper.and(p->p.apply("t.ffrq>={0}", form.getStartDateCk()));
+            queryWrapper.and(p -> p.apply("t.ffrq>={0}", form.getStartDateCk()));
         }
         if (StringUtils.isNoneBlank(form.getEndDateCk())) {
             queryWrapper.apply("t.ffrq>={0}", form.getStartDateCk());
         }
         if (StringUtils.isNoneBlank(form.getStartDateRk())) {
-            queryWrapper.and(p->p.apply("t.rkrq>={0}", form.getStartDateRk()));
+            queryWrapper.and(p -> p.apply("t.rkrq>={0}", form.getStartDateRk()));
         }
         if (StringUtils.isNoneBlank(form.getEndDateRk())) {
             queryWrapper.apply("t.rkrq>={0}", form.getEndDateRk());
         }
         if (form.getMdId() != null && form.getMdId().intValue() > 0) {
-            queryWrapper.and(p->p.apply("find_in_set({0}, t.`md_ids`) or t.md_ids={0}", form.getMdId()));
+            queryWrapper.and(p -> p.apply("find_in_set({0}, t.`md_ids`) or t.md_ids={0}", form.getMdId()));
         }
         queryWrapper.orderByDesc("t.id");
         return baseMapper.queryList(queryWrapper);
@@ -104,7 +102,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void jq(@RequestBody FfjlJqForm form) {
+    public void jq(FfjlJqForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -121,7 +119,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "补充说明");
-        formData.put("签名人",  qmr.getNickName());
+        formData.put("签名人", qmr.getNickName());
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "补充说明", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
     }
 
@@ -132,7 +130,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void jy(@RequestBody FfjlJyForm form) {
+    public void jy(FfjlJyForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -159,7 +157,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate()));
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "申请借阅");
-        formData.put("签名人",  qmr.getNickName());
+        formData.put("签名人", qmr.getNickName());
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
     }
 
@@ -184,7 +182,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void jd(@RequestBody FfjlJdForm form) {
+    public void jd(FfjlJdForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -204,7 +202,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "申请解档");
-        formData.put("签名人",  qmr.getNickName());
+        formData.put("签名人", qmr.getNickName());
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
 
     }
@@ -216,7 +214,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void plgd(@RequestBody FfjlGdForm form) {
+    public void plgd(FfjlGdForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getIds().length < 0) {
@@ -245,7 +243,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
                 Map<String, String> formData = new LinkedHashMap<>();
                 formData.put("备注", form.getRemark());
                 formData.put("签名意义", "申请归档");
-                formData.put("签名人",  qmr.getNickName());
+                formData.put("签名人", qmr.getNickName());
                 mjyFfjlJcgj.setJcnr(JctUtil.formatStr(formData));
                 mjyFfjlJcgj.setQmrId(SecurityUtils.getUserId());
                 mjyFfjlJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
@@ -265,7 +263,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void gd(@RequestBody FfjlGdForm form) {
+    public void gd(FfjlGdForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -285,7 +283,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "申请归档");
-        formData.put("签名人",  qmr.getNickName());
+        formData.put("签名人", qmr.getNickName());
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
 
     }
@@ -298,7 +296,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void plsd(@RequestBody FfjlSdForm form) {
+    public void plsd(FfjlSdForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getIds().length < 0) {
@@ -325,7 +323,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
             Map<String, String> formData = new LinkedHashMap<>();
             formData.put("备注", form.getRemark());
             formData.put("签名意义", "锁定发放记录");
-            formData.put("签名人",  qmr.getNickName());
+            formData.put("签名人", qmr.getNickName());
 
             mjyFfjlJcgj.setJcnr(JctUtil.formatStr(formData));
             mjyFfjlJcgj.setQmrId(SecurityUtils.getUserId());
@@ -346,7 +344,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void sd(@RequestBody FfjlSdForm form) {
+    public void sd(FfjlSdForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -365,7 +363,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "锁定发放记录");
-        formData.put("签名人",  qmr.getNickName());
+        formData.put("签名人", qmr.getNickName());
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
 
     }
@@ -378,7 +376,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void js(@RequestBody FfjlJsForm form) {
+    public void js(FfjlJsForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -398,19 +396,18 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "解锁发放记录");
-        formData.put("签名人",  qmr.getNickName());
+        formData.put("签名人", qmr.getNickName());
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "解锁发放记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
 
     }
 
     /**
      * 归还
-     *
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void gh(@RequestBody GhForm form, Mjy mjy,SysUser ghr1,SysUser ghr2,SysUser jsr1,SysUser jsr2){
-        MjyFfjl  mjyFfjl=this.queryLastInfoByMjyId(mjy.getId());
+    public void gh(GhForm form, Mjy mjy, SysUser ghr1, SysUser ghr2, SysUser jsr1, SysUser jsr2) {
+        MjyFfjl mjyFfjl = this.queryLastInfoByMjyId(mjy.getId());
         if (mjyFfjl == null) {
             throw new SecurityException("发放记录不存在或已删除");
         }
@@ -441,9 +438,9 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         formData.put("入库位置", form.getRkwz());
         formData.put("入库条件", form.getRktj());
         formData.put("转移条件", form.getGhzytj());
-        formData.put("入库毛重", form.getRkmz()+mjy.getKcdw());
-        formData.put("减少量", form.getJsl()+mjy.getKcdw());
-        formData.put("使用量", form.getSyl()+mjy.getKcdw());
+        formData.put("入库毛重", form.getRkmz() + mjy.getKcdw());
+        formData.put("减少量", form.getJsl() + mjy.getKcdw());
+        formData.put("使用量", form.getSyl() + mjy.getKcdw());
         formData.put("归还人1", ghr1.getNickName());
         formData.put("归还人2", ghr2.getNickName());
         formData.put("库管员1", jsr1.getNickName());
@@ -455,14 +452,12 @@ 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(String ckmz, String ckmzdw, String zytj, String remark, String mdIds, Mjy mjy, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time) {
 
         MjyFfjl mjyFfjl = new MjyFfjl();
         mjyFfjl.setMjyId(mjy.getId());
@@ -494,7 +489,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
 
         //region 稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
-        formData.put("出库量", mjy.getKc()+ mjy.getKcdw());
+        formData.put("出库量", mjy.getKc() + mjy.getKcdw());
         formData.put("转移条件", zytj);
         formData.put("出库毛重", ckmz + mjy.getKcdw());
         formData.put("目的", mdIds);

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

@@ -104,7 +104,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void jd(@RequestBody JdForm form) {
+    public void jd( JdForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -135,7 +135,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void jy(@RequestBody JyForm form) {
+    public void jy( JyForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -173,7 +173,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void plgd(@RequestBody GdForm form) {
+    public void plgd( GdForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getIds().length < 0) {
@@ -221,7 +221,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void gd(@RequestBody GdForm form) {
+    public void gd( GdForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -253,7 +253,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void plsd(@RequestBody SdForm form) {
+    public void plsd( SdForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getIds().length < 0) {
@@ -301,7 +301,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void sd(@RequestBody SdForm form) {
+    public void sd( SdForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -332,7 +332,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void js(@RequestBody JsForm form) {
+    public void js( JsForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -363,7 +363,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void plczyj(@RequestBody PlczyjForm form) {
+    public void plczyj( PlczyjForm form) {
         SysUser clr = sysUserService.selectUserById(form.getClrId());
         SysUser fhr = sysUserService.selectUserById(form.getFhrId());
         SysUser jdr = sysUserService.selectUserById(form.getJdrId());
@@ -448,7 +448,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void czyj(@RequestBody CzyjForm form) {
+    public void czyj( CzyjForm form) {
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new SecurityException("参数id不正确");
         }
@@ -524,7 +524,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void plczrq(@RequestBody PlczrqForm form) {
+    public void plczrq( PlczrqForm form) {
         SysUser clr = sysUserService.selectUserById(form.getClrId());
         if (clr == null) {
             throw new SecurityException("处理人不存在");
@@ -606,7 +606,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void czrq(@RequestBody CzrqForm form) {
+    public void czrq( CzrqForm form) {
         SysUser clr = sysUserService.selectUserById(form.getClrId());
         if (clr == null) {
             throw new SecurityException("处理人不存在");
@@ -661,7 +661,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void ysff(@RequestBody YsffForm form) {
+    public void ysff( YsffForm form) {
         SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id());
         SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id());
         SysUser ffr1 = sysUserService.selectUserById(form.getFfrId());
@@ -728,7 +728,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void ff(@RequestBody FfForm form) {
+    public void ff( FfForm form) {
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new SecurityException("参数id不正确");
         }
@@ -792,7 +792,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void plff(@RequestBody PlffForm form) {
+    public void plff( PlffForm form) {
         SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id());
         SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id());
         SysUser ffr1 = sysUserService.selectUserById(form.getFfr1Id());
@@ -883,7 +883,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void bj(@RequestBody BjForm form) {
+    public void bj( BjForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -938,7 +938,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void shbj(@RequestBody ShbjForm form) {
+    public void shbj( ShbjForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -1006,7 +1006,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void xgkc(@RequestBody XgkcForm form) {
+    public void xgkc( XgkcForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -1060,7 +1060,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void shxgkc(@RequestBody ShxgkcForm form) {
+    public void shxgkc( ShxgkcForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -1124,7 +1124,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void gh(@RequestBody GhForm form) {
+    public void gh( GhForm form) {
         SysUser ghr1 = sysUserService.selectUserById(form.getGhr1Id());
         SysUser ghr2 = sysUserService.selectUserById(form.getGhr2Id());
         SysUser jsr1 = sysUserService.selectUserById(form.getJsr1Id());

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

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <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
+        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, 'todo' as mdMc
         ,z.mc as zcgMc
         FROM `t_gyzj_ffjl` t