fix：编码规范

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

@@ -17,21 +17,54 @@ public class CzrqForm {
     /** 处置人id */
     private Long clrId;
 
+    /** 处置人名称 */
+    private String clrMc;
+
     /** 处置人密码 */
     private String clrmm;
 
     /** 复核人id */
     private Long fhrId;
 
+    /** 复核人名称 */
+    private String fhrMc;
+
     /** 复核人密码 */
     private String fhrmm;
 
     /** 监督人id */
     private Long jdrId;
 
+    /** 监督人名称 */
+    private String jdrMc;
+
     /** 监督人密码 */
     private String jdrmm;
 
+    public String getClrMc() {
+        return clrMc;
+    }
+
+    public void setClrMc(String clrMc) {
+        this.clrMc = clrMc;
+    }
+
+    public String getFhrMc() {
+        return fhrMc;
+    }
+
+    public void setFhrMc(String fhrMc) {
+        this.fhrMc = fhrMc;
+    }
+
+    public String getJdrMc() {
+        return jdrMc;
+    }
+
+    public void setJdrMc(String jdrMc) {
+        this.jdrMc = jdrMc;
+    }
+
     public Long getId() {
         return id;
     }

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

@@ -20,21 +20,54 @@ public class CzyjForm {
     /** 处置人id */
     private Long clrId;
 
+    /** 处置人名称 */
+    private String clrMc;
+
     /** 处置人密码 */
     private String clrmm;
 
     /** 复核人id */
     private Long fhrId;
 
+    /** 复核人名称 */
+    private String fhrMc;
+
     /** 复核人密码 */
     private String fhrmm;
 
     /** 监督人id */
     private Long jdrId;
 
+    /** 监督人名称 */
+    private String jdrMc;
+
     /** 监督人密码 */
     private String jdrmm;
 
+    public String getClrMc() {
+        return clrMc;
+    }
+
+    public void setClrMc(String clrMc) {
+        this.clrMc = clrMc;
+    }
+
+    public String getFhrMc() {
+        return fhrMc;
+    }
+
+    public void setFhrMc(String fhrMc) {
+        this.fhrMc = fhrMc;
+    }
+
+    public String getJdrMc() {
+        return jdrMc;
+    }
+
+    public void setJdrMc(String jdrMc) {
+        this.jdrMc = jdrMc;
+    }
+
     public String getCzl() {
         return czl;
     }

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

@@ -26,9 +26,15 @@ public class FfForm {
     /** 领取人1Id  */
     private Long lqr1Id;
 
+    /** 领取人1名称  */
+    private String lqr1Mc;
+
     /** 领取人2Id */
     private Long lqr2Id;
 
+    /** 领取人2名称 */
+    private String lqr2Mc;
+
     /** 领取人1密码 */
     private String lqr1mm;
 
@@ -38,15 +44,53 @@ public class FfForm {
     /** 发放人1Id */
     private Long ffr1Id;
 
+    /** 发放人1名称 */
+    private String ffr1Mc;
+
     /** 发放人1密码 */
     private String ffr1mm;
 
     /** 发放人2Id */
     private Long ffr2Id;
 
+    /** 发放人2名称 */
+    private String ffr2Mc;
+
     /** 发放人2密码 */
     private String ffr2mm;
 
+    public String getLqr1Mc() {
+        return lqr1Mc;
+    }
+
+    public void setLqr1Mc(String lqr1Mc) {
+        this.lqr1Mc = lqr1Mc;
+    }
+
+    public String getLqr2Mc() {
+        return lqr2Mc;
+    }
+
+    public void setLqr2Mc(String lqr2Mc) {
+        this.lqr2Mc = lqr2Mc;
+    }
+
+    public String getFfr1Mc() {
+        return ffr1Mc;
+    }
+
+    public void setFfr1Mc(String ffr1Mc) {
+        this.ffr1Mc = ffr1Mc;
+    }
+
+    public String getFfr2Mc() {
+        return ffr2Mc;
+    }
+
+    public void setFfr2Mc(String ffr2Mc) {
+        this.ffr2Mc = ffr2Mc;
+    }
+
     public String getCkmzdw() {
         return ckmzdw;
     }

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

@@ -8,7 +8,6 @@ public class FfjlJdForm {
     /** 发放记录id */
     private Long id;
 
-
     /** 备注 */
     private String remark;
 

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

@@ -17,7 +17,6 @@ public class GhForm {
     /** 归还转移条件 */
     private String ghzytj;
 
-
     /** 入库毛重 */
     private String rkmz;
 

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

@@ -16,21 +16,54 @@ public class PlczrqForm {
     /** 处置人id */
     private Long clrId;
 
+    /** 处置人名称 */
+    private String clrMc;
+
     /** 处置人密码 */
     private String clrmm;
 
     /** 复核人id */
     private Long fhrId;
 
+    /** 复核人名称 */
+    private String fhrMc;
+
     /** 复核人密码 */
     private String fhrmm;
 
     /** 监督人id */
     private Long jdrId;
 
+    /** 监督人名称 */
+    private String jdrMc;
+
     /** 监督人密码 */
     private String jdrmm;
 
+    public String getClrMc() {
+        return clrMc;
+    }
+
+    public void setClrMc(String clrMc) {
+        this.clrMc = clrMc;
+    }
+
+    public String getFhrMc() {
+        return fhrMc;
+    }
+
+    public void setFhrMc(String fhrMc) {
+        this.fhrMc = fhrMc;
+    }
+
+    public String getJdrMc() {
+        return jdrMc;
+    }
+
+    public void setJdrMc(String jdrMc) {
+        this.jdrMc = jdrMc;
+    }
+
     public List<PlczrqItem> getList() {
         return list;
     }

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

@@ -16,21 +16,54 @@ public class PlczyjForm {
     /** 处置人id */
     private Long clrId;
 
+    /** 处置人名称 */
+    private String clrMc;
+
     /** 处置人密码 */
     private String clrmm;
 
     /** 复核人id */
     private Long fhrId;
 
+    /** 复核人名称 */
+    private String fhrMc;
+
     /** 复核人密码 */
     private String fhrmm;
 
     /** 监督人id */
     private Long jdrId;
 
+    /** 监督人名称 */
+    private String jdrMc;
+
     /** 监督人密码 */
     private String jdrmm;
 
+    public String getClrMc() {
+        return clrMc;
+    }
+
+    public void setClrMc(String clrMc) {
+        this.clrMc = clrMc;
+    }
+
+    public String getFhrMc() {
+        return fhrMc;
+    }
+
+    public void setFhrMc(String fhrMc) {
+        this.fhrMc = fhrMc;
+    }
+
+    public String getJdrMc() {
+        return jdrMc;
+    }
+
+    public void setJdrMc(String jdrMc) {
+        this.jdrMc = jdrMc;
+    }
+
     public Long[] getIds() {
         return ids;
     }

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

@@ -16,27 +16,71 @@ public class PlffForm {
     /** 领取人1Id  */
     private Long lqr1Id;
 
+    /** 领取人1名称  */
+    private String lqr1Mc;
+
     /** 领取人2密码 */
     private String lqr2mm;
 
     /** 领取人2Id */
     private Long lqr2Id;
 
+    /** 领取人2名称 */
+    private String lqr2Mc;
+
     /** 领取人1密码 */
     private String lqr1mm;
 
     /** 发放人1Id */
     private Long ffr1Id;
 
+    /** 发放人1名称 */
+    private String ffr1Mc;
+
     /** 发放人1密码 */
     private String ffr1mm;
 
     /** 发放人2Id */
     private Long ffr2Id;
 
+    /** 发放人2名称 */
+    private String ffr2Mc;
+
     /** 发放人2密码 */
     private String ffr2mm;
 
+    public String getLqr1Mc() {
+        return lqr1Mc;
+    }
+
+    public void setLqr1Mc(String lqr1Mc) {
+        this.lqr1Mc = lqr1Mc;
+    }
+
+    public String getLqr2Mc() {
+        return lqr2Mc;
+    }
+
+    public void setLqr2Mc(String lqr2Mc) {
+        this.lqr2Mc = lqr2Mc;
+    }
+
+    public String getFfr1Mc() {
+        return ffr1Mc;
+    }
+
+    public void setFfr1Mc(String ffr1Mc) {
+        this.ffr1Mc = ffr1Mc;
+    }
+
+    public String getFfr2Mc() {
+        return ffr2Mc;
+    }
+
+    public void setFfr2Mc(String ffr2Mc) {
+        this.ffr2Mc = ffr2Mc;
+    }
+
     public Long[] getIds() {
         return ids;
     }

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

@@ -20,9 +20,15 @@ public class YsffForm {
     /** 钥匙1领取人ID */
     private Long lqr1Id;
 
+    /** 钥匙1领取人名称 */
+    private String lqr1Mc;
+
     /** 钥匙2领取人ID */
     private Long lqr2Id;
 
+    /** 钥匙2领取人名称 */
+    private String lqr2Mc;
+
     /** 钥匙1领取人密码 */
     private String lqr1mm;
 
@@ -32,9 +38,36 @@ public class YsffForm {
     /** 发放人 */
     private Long ffrId;
 
+    /** 发放人 */
+    private String ffrMc;
+
     /** 发放人密码 */
     private String ffrmm;
 
+    public String getLqr1Mc() {
+        return lqr1Mc;
+    }
+
+    public void setLqr1Mc(String lqr1Mc) {
+        this.lqr1Mc = lqr1Mc;
+    }
+
+    public String getLqr2Mc() {
+        return lqr2Mc;
+    }
+
+    public void setLqr2Mc(String lqr2Mc) {
+        this.lqr2Mc = lqr2Mc;
+    }
+
+    public String getFfrMc() {
+        return ffrMc;
+    }
+
+    public void setFfrMc(String ffrMc) {
+        this.ffrMc = ffrMc;
+    }
+
     public Long getId() {
         return id;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/sj/CzSjForm.java

@@ -4,7 +4,7 @@ import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
 /**
- * 处置试剂
+ * @author 15881
  */
 public class CzSjForm {
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/sj/PlczSjForm.java

@@ -6,6 +6,7 @@ import java.util.List;
 
 /**
  * 批量处置试剂
+ * @author 15881
  */
 public class PlczSjForm {
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/sj/PlczSjItemForm.java

@@ -5,6 +5,7 @@ import javax.validation.constraints.NotNull;
 
 /**
  * 批量处置试剂-对象
+ * @author 15881
  */
 public class PlczSjItemForm {
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/sj/SjXgkcForm.java

@@ -9,6 +9,7 @@ import javax.validation.constraints.NotNull;
 
 /**
  * 试剂修改库存
+ * @author 15881
  */
 public class SjXgkcForm {
 

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

@@ -105,13 +105,28 @@ public interface IGyzjFfjlService extends IService {
 
     /**
      * 归还
-     *
      * @param form
+     * @param gyzj
+     * @param ghr1
+     * @param ghr2
+     * @param jsr1
+     * @param jsr2
      */
     public void gh( GhForm form, Gyzj gyzj, SysUser ghr1, SysUser ghr2, SysUser jsr1, SysUser jsr2);
 
     /**
      * 发放
+     * @param ckmz
+     * @param ckmzdw
+     * @param zytj
+     * @param remark
+     * @param mdIds
+     * @param gyzj
+     * @param lqr1
+     * @param lqr2
+     * @param ffr1
+     * @param ffr2
+     * @param 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

@@ -105,13 +105,28 @@ public interface IMjyFfjlService extends IService {
 
     /**
      * 归还
-     *
      * @param form
+     * @param mjy
+     * @param ghr1
+     * @param ghr2
+     * @param jsr1
+     * @param jsr2
      */
     public void gh(GhForm form, Mjy mjy, SysUser ghr1, SysUser ghr2, SysUser jsr1, SysUser jsr2);
 
     /**
      * 发放
+     * @param ckmz
+     * @param ckmzdw
+     * @param zytj
+     * @param remark
+     * @param mdIds
+     * @param mjy
+     * @param lqr1
+     * @param lqr2
+     * @param ffr1
+     * @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);
 

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

@@ -365,8 +365,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
     @Transactional(rollbackFor = Exception.class)
     public void plczyj(PlczyjForm form) {
         SysUser clr = sysUserService.selectUserById(form.getClrId());
-//        SysUser fhr = sysUserService.selectUserById(form.getFhrId());
-//        SysUser jdr = sysUserService.selectUserById(form.getJdrId());
+        SysUser fhr = sysUserService.selectUserById(form.getFhrId());
+        SysUser jdr = sysUserService.selectUserById(form.getJdrId());
         QueryWrapper<Gyzj> queryWrapper = Wrappers.query();
         queryWrapper.in("id", form.getIds());
         queryWrapper.eq("zjzt", ZjztEnum.rk.getValue());