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

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

@@ -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;

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

@@ -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

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

@@ -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";
     }