fix：[资源库管理]去掉多余字段

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

@@ -146,10 +146,6 @@ public class Gyzj extends MpBaseEntity
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String bjrMc;
 
-    /** 编辑人名称-英文 */
-    @TableField(updateStrategy = FieldStrategy.IGNORED)
-    private String bjrMcEn;
-
     /** 库存编辑人id */
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Long kcbjrId;
@@ -158,10 +154,6 @@ public class Gyzj extends MpBaseEntity
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String kcbjrMc;
 
-    /** 库存编辑人名称-英文 */
-    @TableField(updateStrategy = FieldStrategy.IGNORED)
-    private String kcbjrMcEn;
-
     /** 出库量 */
     private String ckl;
 
@@ -243,14 +235,6 @@ public class Gyzj extends MpBaseEntity
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String qmr2Mc;
 
-    /** 签名人1名称-英文 */
-    @TableField(updateStrategy = FieldStrategy.IGNORED)
-    private String qmr1McEn;
-
-    /** 签名人2名称-英文 */
-    @TableField(updateStrategy = FieldStrategy.IGNORED)
-    private String qmr2McEn;
-
     public Integer getDazt() {
         return dazt;
     }
@@ -323,38 +307,6 @@ public class Gyzj extends MpBaseEntity
         this.qmr2Mc = qmr2Mc;
     }
 
-    public String getQmr1McEn() {
-        return qmr1McEn;
-    }
-
-    public void setQmr1McEn(String qmr1McEn) {
-        this.qmr1McEn = qmr1McEn;
-    }
-
-    public String getQmr2McEn() {
-        return qmr2McEn;
-    }
-
-    public void setQmr2McEn(String qmr2McEn) {
-        this.qmr2McEn = qmr2McEn;
-    }
-
-    public String getBjrMcEn() {
-        return bjrMcEn;
-    }
-
-    public void setBjrMcEn(String bjrMcEn) {
-        this.bjrMcEn = bjrMcEn;
-    }
-
-    public String getKcbjrMcEn() {
-        return kcbjrMcEn;
-    }
-
-    public void setKcbjrMcEn(String kcbjrMcEn) {
-        this.kcbjrMcEn = kcbjrMcEn;
-    }
-
     public String getCkmz() {
         return ckmz;
     }

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

@@ -91,18 +91,6 @@ public class GyzjFfjl extends MpBaseEntity
     /** 发放人2名称 */
     private String ffr2Mc;
 
-    /** 领取人1名称-英文 */
-    private String lqr1McEn;
-
-    /** 领取人2名称-英文 */
-    private String lqr2McEn;
-
-    /** 发放人1名称-英文 */
-    private String ffr1McEn;
-
-    /** 发放人2名称-英文 */
-    private String ffr2McEn;
-
     /** 发放日期 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date ffrq;
@@ -167,18 +155,6 @@ public class GyzjFfjl extends MpBaseEntity
     /** 接收人2名称 */
     private String jsr2Mc;
 
-    /** 归还人1名称-英文 */
-    private String ghr1McEn;
-
-    /** 归还人2名称-英文 */
-    private String ghr2McEn;
-
-    /** 接收人1名称-英文 */
-    private String jsr1McEn;
-
-    /** 接收人2名称-英文 */
-    private String jsr2McEn;
-
     /** 归还日期 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date ghrq;
@@ -192,9 +168,6 @@ public class GyzjFfjl extends MpBaseEntity
     /** 归档申请人名称 */
     private String gdsqrMc;
 
-    /** 归档申请人名称-英文 */
-    private String gdsqrMcEn;
-
     /** 暂存柜id */
     private Long zcgId;
 
@@ -230,37 +203,6 @@ public class GyzjFfjl extends MpBaseEntity
         this.ckmzdw = ckmzdw;
     }
 
-    public String getLqr1McEn() {
-        return lqr1McEn;
-    }
-
-    public void setLqr1McEn(String lqr1McEn) {
-        this.lqr1McEn = lqr1McEn;
-    }
-
-    public String getLqr2McEn() {
-        return lqr2McEn;
-    }
-
-    public void setLqr2McEn(String lqr2McEn) {
-        this.lqr2McEn = lqr2McEn;
-    }
-
-    public String getFfr1McEn() {
-        return ffr1McEn;
-    }
-
-    public void setFfr1McEn(String ffr1McEn) {
-        this.ffr1McEn = ffr1McEn;
-    }
-
-    public String getFfr2McEn() {
-        return ffr2McEn;
-    }
-
-    public void setFfr2McEn(String ffr2McEn) {
-        this.ffr2McEn = ffr2McEn;
-    }
 
     public String getRkmz() {
         return rkmz;
@@ -278,38 +220,6 @@ public class GyzjFfjl extends MpBaseEntity
         this.rkmzdw = rkmzdw;
     }
 
-    public String getGhr1McEn() {
-        return ghr1McEn;
-    }
-
-    public void setGhr1McEn(String ghr1McEn) {
-        this.ghr1McEn = ghr1McEn;
-    }
-
-    public String getGhr2McEn() {
-        return ghr2McEn;
-    }
-
-    public void setGhr2McEn(String ghr2McEn) {
-        this.ghr2McEn = ghr2McEn;
-    }
-
-    public String getJsr1McEn() {
-        return jsr1McEn;
-    }
-
-    public void setJsr1McEn(String jsr1McEn) {
-        this.jsr1McEn = jsr1McEn;
-    }
-
-    public String getJsr2McEn() {
-        return jsr2McEn;
-    }
-
-    public void setJsr2McEn(String jsr2McEn) {
-        this.jsr2McEn = jsr2McEn;
-    }
-
     public String getGdsqrMc() {
         return gdsqrMc;
     }
@@ -318,14 +228,6 @@ public class GyzjFfjl extends MpBaseEntity
         this.gdsqrMc = gdsqrMc;
     }
 
-    public String getGdsqrMcEn() {
-        return gdsqrMcEn;
-    }
-
-    public void setGdsqrMcEn(String gdsqrMcEn) {
-        this.gdsqrMcEn = gdsqrMcEn;
-    }
-
     public String getMdOther() {
         return mdOther;
     }

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

@@ -141,10 +141,6 @@ public class Mjy extends MpBaseEntity
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String bjrMc;
 
-    /** 编辑人名称-英文 */
-    @TableField(updateStrategy = FieldStrategy.IGNORED)
-    private String bjrMcEn;
-
     /** 库存编辑人id */
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Long kcbjrId;
@@ -153,10 +149,6 @@ public class Mjy extends MpBaseEntity
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String kcbjrMc;
 
-    /** 库存编辑人名称-英文 */
-    @TableField(updateStrategy = FieldStrategy.IGNORED)
-    private String kcbjrMcEn;
-
     /** 出库量 */
     private String ckl;
 
@@ -206,7 +198,6 @@ public class Mjy extends MpBaseEntity
     /** 发放目的ids */
     private String mdIds;
 
-
     /** 借阅开始日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date jyksrq;
@@ -215,7 +206,6 @@ public class Mjy extends MpBaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date jyjsrq;
 
-
     /** 发放目的其他 */
     private String mdOther;
 
@@ -235,22 +225,6 @@ public class Mjy extends MpBaseEntity
         this.cczt = cczt;
     }
 
-    public String getBjrMcEn() {
-        return bjrMcEn;
-    }
-
-    public void setBjrMcEn(String bjrMcEn) {
-        this.bjrMcEn = bjrMcEn;
-    }
-
-    public String getKcbjrMcEn() {
-        return kcbjrMcEn;
-    }
-
-    public void setKcbjrMcEn(String kcbjrMcEn) {
-        this.kcbjrMcEn = kcbjrMcEn;
-    }
-
     public String getMdOther() {
         return mdOther;
     }

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

@@ -90,18 +90,6 @@ public class MjyFfjl extends MpBaseEntity
     /** 发放人2名称 */
     private String ffr2Mc;
 
-    /** 领取人1名称-英文 */
-    private String lqr1McEn;
-
-    /** 领取人2名称-英文 */
-    private String lqr2McEn;
-
-    /** 发放人1名称-英文 */
-    private String ffr1McEn;
-
-    /** 发放人2名称-英文 */
-    private String ffr2McEn;
-
     /** 发放日期 */
      @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date ffrq;
@@ -172,18 +160,6 @@ public class MjyFfjl extends MpBaseEntity
     /** 接收人2名称 */
     private String jsr2Mc;
 
-    /** 归还人1名称-英文 */
-    private String ghr1McEn;
-
-    /** 归还人2名称 -英文*/
-    private String ghr2McEn;
-
-    /** 接收人1名称-英文 */
-    private String jsr1McEn;
-
-    /** 接收人2名称-英文 */
-    private String jsr2McEn;
-
     /** 归还日期 */
             @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date ghrq;
@@ -197,9 +173,6 @@ public class MjyFfjl extends MpBaseEntity
     /** 归档申请人名称 */
     private String gdsqrMc;
 
-    /** 归档申请人名称-英文 */
-    private String gdsqrMcEn;
-
     /** 暂存柜id */
     private Long zcgId;
 
@@ -219,38 +192,6 @@ public class MjyFfjl extends MpBaseEntity
         this.dazt = dazt;
     }
 
-    public String getLqr1McEn() {
-        return lqr1McEn;
-    }
-
-    public void setLqr1McEn(String lqr1McEn) {
-        this.lqr1McEn = lqr1McEn;
-    }
-
-    public String getLqr2McEn() {
-        return lqr2McEn;
-    }
-
-    public void setLqr2McEn(String lqr2McEn) {
-        this.lqr2McEn = lqr2McEn;
-    }
-
-    public String getFfr1McEn() {
-        return ffr1McEn;
-    }
-
-    public void setFfr1McEn(String ffr1McEn) {
-        this.ffr1McEn = ffr1McEn;
-    }
-
-    public String getFfr2McEn() {
-        return ffr2McEn;
-    }
-
-    public void setFfr2McEn(String ffr2McEn) {
-        this.ffr2McEn = ffr2McEn;
-    }
-
     public String getMdOther() {
         return mdOther;
     }
@@ -259,38 +200,6 @@ public class MjyFfjl extends MpBaseEntity
         this.mdOther = mdOther;
     }
 
-    public String getGhr1McEn() {
-        return ghr1McEn;
-    }
-
-    public void setGhr1McEn(String ghr1McEn) {
-        this.ghr1McEn = ghr1McEn;
-    }
-
-    public String getGhr2McEn() {
-        return ghr2McEn;
-    }
-
-    public void setGhr2McEn(String ghr2McEn) {
-        this.ghr2McEn = ghr2McEn;
-    }
-
-    public String getJsr1McEn() {
-        return jsr1McEn;
-    }
-
-    public void setJsr1McEn(String jsr1McEn) {
-        this.jsr1McEn = jsr1McEn;
-    }
-
-    public String getJsr2McEn() {
-        return jsr2McEn;
-    }
-
-    public void setJsr2McEn(String jsr2McEn) {
-        this.jsr2McEn = jsr2McEn;
-    }
-
     public String getGdsqrMc() {
         return gdsqrMc;
     }
@@ -299,14 +208,6 @@ public class MjyFfjl extends MpBaseEntity
         this.gdsqrMc = gdsqrMc;
     }
 
-    public String getGdsqrMcEn() {
-        return gdsqrMcEn;
-    }
-
-    public void setGdsqrMcEn(String gdsqrMcEn) {
-        this.gdsqrMcEn = gdsqrMcEn;
-    }
-
     public String getRkmz() {
         return rkmz;
     }

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

@@ -401,17 +401,13 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         gyzjFfjl.setSyldw(gyzj.getKcdw());
         gyzjFfjl.setGhr1Id(ghr1.getUserId());
         gyzjFfjl.setGhr1Mc(ghr1.getNickName());
-        gyzjFfjl.setGhr1McEn(ghr1.getNickName());
         gyzjFfjl.setGhrq(new Date());
         gyzjFfjl.setGhr2Id(ghr2.getUserId());
         gyzjFfjl.setGhr2Mc(ghr2.getNickName());
-        gyzjFfjl.setGhr2McEn(ghr2.getNickName());
         gyzjFfjl.setJsr1Id(jsr1.getUserId());
         gyzjFfjl.setJsr1Mc(jsr1.getNickName());
-        gyzjFfjl.setJsr1McEn(jsr1.getNickName());
         gyzjFfjl.setJsr2Id(jsr2.getUserId());
         gyzjFfjl.setJsr2Mc(jsr2.getNickName());
-        gyzjFfjl.setJsr2McEn(jsr2.getNickName());
         gyzjFfjl.setGhbz(form.getRemark());
         this.updateById(gyzjFfjl);
 
@@ -462,10 +458,6 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         gyzjFfjl.setLqr2Mc(lqr2.getNickName());
         gyzjFfjl.setFfr1Mc(ffr1.getNickName());
         gyzjFfjl.setFfr2Mc(ffr2.getNickName());
-        gyzjFfjl.setLqr1McEn(lqr1.getUserName());
-        gyzjFfjl.setLqr2McEn(lqr2.getUserName());
-        gyzjFfjl.setFfr1McEn(ffr1.getUserName());
-        gyzjFfjl.setFfr2McEn(ffr2.getUserName());
         gyzjFfjl.setFfzytj(form.getZytj());
         gyzjFfjl.setFfrq(time);
         gyzjFfjl.setFfbz(form.getRemark());

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

@@ -832,7 +832,6 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         gyzjOld.setBjbz(form.getBjbz());
         gyzjOld.setBjrId(SecurityUtils.getUserId());
         gyzjOld.setBjrMc(SecurityUtils.getNickName());
-        gyzjOld.setBjrMcEn(SecurityUtils.getLoginUser().getUsername());
         gyzjOld.setBjzt(BjEnum.shz.getValue());
         this.updateById(gyzjOld);
         gyzjJcgjService.saveBatch(gyzjJcgjList);
@@ -1146,10 +1145,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         gyzjOld.setRktj(form.getRktj());
         gyzjOld.setQmr1Id(qmr1.getUserId());
         gyzjOld.setQmr1Mc(qmr1.getNickName());
-        gyzjOld.setQmr1McEn(qmr1.getUserName());
         gyzjOld.setQmr2Id(qmr2.getUserId());
         gyzjOld.setQmr2Mc(qmr2.getNickName());
-        gyzjOld.setQmr2McEn(qmr2.getUserName());
         gyzjOld.setRksqzt(RksqztEnum.sqrk.getValue());
         this.updateById(gyzjOld);
     }
@@ -1203,10 +1200,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         gyzjOld.setRktj(null);
         gyzjOld.setQmr1Id(null);
         gyzjOld.setQmr1Mc(null);
-        gyzjOld.setQmr1McEn(null);
         gyzjOld.setQmr2Id(null);
         gyzjOld.setQmr2Mc(null);
-        gyzjOld.setQmr2McEn(null);
         gyzjOld.setRksqzt(RksqztEnum.wsq.getValue());
         this.updateById(gyzjOld);
     }

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

@@ -397,17 +397,13 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         mjyFfjl.setSyldw(mjy.getKcdw());
         mjyFfjl.setGhr1Id(ghr1.getUserId());
         mjyFfjl.setGhr1Mc(ghr1.getNickName());
-        mjyFfjl.setGhr1McEn(ghr1.getUserName());
         mjyFfjl.setGhrq(new Date());
         mjyFfjl.setGhr2Id(ghr2.getUserId());
         mjyFfjl.setGhr2Mc(ghr2.getNickName());
-        mjyFfjl.setGhr2McEn(ghr2.getUserName());
         mjyFfjl.setJsr1Id(jsr1.getUserId());
         mjyFfjl.setJsr1Mc(jsr1.getNickName());
-        mjyFfjl.setJsr1McEn(jsr1.getUserName());
         mjyFfjl.setJsr2Id(jsr2.getUserId());
         mjyFfjl.setJsr2Mc(jsr2.getNickName());
-        mjyFfjl.setJsr2McEn(jsr2.getUserName());
         mjyFfjl.setGhbz(form.getRemark());
         this.updateById(mjyFfjl);
         //endregion
@@ -458,10 +454,6 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         mjyFfjl.setLqr2Mc(lqr2.getNickName());
         mjyFfjl.setFfr1Mc(ffr1.getNickName());
         mjyFfjl.setFfr2Mc(ffr2.getNickName());
-        mjyFfjl.setLqr1McEn(lqr1.getUserName());
-        mjyFfjl.setLqr2McEn(lqr2.getUserName());
-        mjyFfjl.setFfr1McEn(ffr1.getUserName());
-        mjyFfjl.setFfr2McEn(ffr2.getUserName());
         mjyFfjl.setFfzytj(form.getZytj());
         mjyFfjl.setFfrq(time);
         mjyFfjl.setFfbz(form.getRemark());

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

@@ -853,7 +853,6 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         mjyOld.setBjbz(form.getBjbz());
         mjyOld.setBjrId(SecurityUtils.getUserId());
         mjyOld.setBjrMc(SecurityUtils.getNickName());
-        mjyOld.setBjrMcEn(SecurityUtils.getLoginUser().getUsername());
         mjyOld.setBjzt(BjEnum.shz.getValue());
         this.updateById(mjyOld);
         mjyJcgjService.saveBatch(mjyJcgjList);
@@ -952,7 +951,6 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         mjyOld.setKcbj(form.getKc());
         mjyOld.setKcbjrId(SecurityUtils.getUserId());
         mjyOld.setKcbjrMc(SecurityUtils.getNickName());
-        mjyOld.setKcbjrMcEn(SecurityUtils.getLoginUser().getUsername());
         mjyOld.setKcbjzt(KcbjEnum.shz.getValue());
         mjyOld.setKcbjbz(form.getKcbjbz());
         this.updateById(mjyOld);