Browse Source

fix:[资源库]发放记录

master
15881625488@163.com 3 months ago
parent
commit
d94d426122
4 changed files with 15 additions and 10 deletions
  1. +6
    -6
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java
  2. +7
    -2
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/JcgjlxEnum.java
  3. +1
    -1
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java
  4. +1
    -1
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java

+ 6
- 6
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java View File

@ -187,10 +187,10 @@ public class GyzjFfjl extends MpBaseEntity
private Long gdsqrId; private Long gdsqrId;
/** 归档申请人名称 */ /** 归档申请人名称 */
private Long gdsqrMc;
private String gdsqrMc;
/** 归档申请人名称-英文 */ /** 归档申请人名称-英文 */
private Long gdsqrMcEn;
private String gdsqrMcEn;
/** 暂存柜id */ /** 暂存柜id */
private Long zcgId; private Long zcgId;
@ -299,19 +299,19 @@ public class GyzjFfjl extends MpBaseEntity
this.jsr2McEn = jsr2McEn; this.jsr2McEn = jsr2McEn;
} }
public Long getGdsqrMc() {
public String getGdsqrMc() {
return gdsqrMc; return gdsqrMc;
} }
public void setGdsqrMc(Long gdsqrMc) {
public void setGdsqrMc(String gdsqrMc) {
this.gdsqrMc = gdsqrMc; this.gdsqrMc = gdsqrMc;
} }
public Long getGdsqrMcEn() {
public String getGdsqrMcEn() {
return gdsqrMcEn; return gdsqrMcEn;
} }
public void setGdsqrMcEn(Long gdsqrMcEn) {
public void setGdsqrMcEn(String gdsqrMcEn) {
this.gdsqrMcEn = gdsqrMcEn; this.gdsqrMcEn = gdsqrMcEn;
} }

+ 7
- 2
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/JcgjlxEnum.java View File

@ -1,7 +1,7 @@
package com.hxhq.business.enums.zykgl; package com.hxhq.business.enums.zykgl;
/** /**
* 稽查轨迹类型:1:流程3编辑5人员7修改
* 稽查轨迹类型:1:流程3编辑5人员7修改9补充说明
* @author tanfei * @author tanfei
*/ */
public enum JcgjlxEnum { public enum JcgjlxEnum {
@ -24,7 +24,12 @@ public enum JcgjlxEnum {
/** /**
* 修改 * 修改
*/ */
xg(7, "修改");
xg(7, "修改"),
/**
* 补充说明
*/
bcsm(9, "补充说明");
private int value; private int value;
private String text; private String text;

+ 1
- 1
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java View File

@ -124,7 +124,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
throw new ServiceException("发放记录【" + gyzjFfjlOld.getMc() + "】不是未锁定状态,不能加签"); throw new ServiceException("发放记录【" + gyzjFfjlOld.getMc() + "】不是未锁定状态,不能加签");
} }
//稽查轨迹 //稽查轨迹
gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "补充说明", JcmcysEnum.orange.getValue(), null,qmr, form.getRemark());
gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.bcsm.getValue(), "补充说明", JcmcysEnum.orange.getValue(), null,qmr, form.getRemark());
} }
/** /**

+ 1
- 1
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java View File

@ -121,7 +121,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
throw new ServiceException("发放记录【" + mjyFfjlOld.getMc() + "】不是未锁定状态,不能加签"); throw new ServiceException("发放记录【" + mjyFfjlOld.getMc() + "】不是未锁定状态,不能加签");
} }
//稽查轨迹 //稽查轨迹
mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "补充说明", JcmcysEnum.orange.getValue(), null, qmr,form.getRemark());
mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.bcsm.getValue(), "补充说明", JcmcysEnum.orange.getValue(), null, qmr,form.getRemark());
} }
/** /**

Loading…
Cancel
Save