yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加作废人及作废时间字段

This commit is contained in:
yangjun 2025-11-27 10:23:58 +08:00
parent f555b7d15b
commit e4e3efd509
3 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java
View File

@ -105,6 +105,15 @@ public class CgdMainEntity implements Serializable {
@ApiModelProperty(value = "审核时间")
private Date wjTime;
/**作废人*/
private String zfBy;
/**作废时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "审核时间")
private Date zfTime;
private String nuId;
private String sysOrgCode;
private String izNew;

12
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdMain.java
View File

@ -215,6 +215,18 @@ public class NuInvoicingCgdMain implements Serializable {
*/
private String izFkd;
/**
* 作废人
*/
private String zfBy;
/**
* 作废时间
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "审核时间")
private Date zfTime;
@TableField(exist = false)
private String qgdId;//临时变量，用于清空购物车id

3
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java
View File

@ -570,10 +570,13 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
//不是待入库状态，不可进行作废操作，请刷新页面
return "2";
}
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
NuInvoicingCgdMain cgdMain = new NuInvoicingCgdMain();
BeanUtils.copyProperties(cgdMainEntity,cgdMain);
// cgdMain.setStatus("3");
cgdMain.setCgdType("9");
cgdMain.setZfBy(loginUser.getRealname());
cgdMain.setZfTime(new Date());
baseMapper.updateById(cgdMain);
return "1";
}