diff --git a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgInfo/entity/OrgInfoEntity.java b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgInfo/entity/OrgInfoEntity.java index 69f9105..b2bb9c5 100644 --- a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgInfo/entity/OrgInfoEntity.java +++ b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgInfo/entity/OrgInfoEntity.java @@ -1,6 +1,8 @@ package com.nu.modules.orgInfo.entity; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.math.BigDecimal; @@ -152,4 +154,9 @@ public class OrgInfoEntity implements Serializable { private String contract; /**合同备注*/ private String contractNote; + private String auditBy; + private String auditStatus; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private java.util.Date auditTime; } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/entity/OrgAllInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/entity/OrgAllInfo.java index c643af1..d852c06 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/entity/OrgAllInfo.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/entity/OrgAllInfo.java @@ -1,6 +1,8 @@ package com.nu.modules.orginfo.entity; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.math.BigDecimal; @@ -154,4 +156,9 @@ public class OrgAllInfo implements Serializable { private String contractNote; /** 加盟时间*/ private java.util.Date franchiseTime; + private String auditBy; + private String auditStatus; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private java.util.Date auditTime; } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/entity/OrgInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/entity/OrgInfo.java index c049965..56f57e4 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/entity/OrgInfo.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/entity/OrgInfo.java @@ -252,4 +252,11 @@ public class OrgInfo implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "加盟时间") private java.util.Date franchiseTime; + + + private String auditBy; + private String auditStatus; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private java.util.Date auditTime; } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/mapper/xml/OrgInfoMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/mapper/xml/OrgInfoMapper.xml index 449c39d..e8534f3 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/mapper/xml/OrgInfoMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/mapper/xml/OrgInfoMapper.xml @@ -39,7 +39,10 @@ o.org_district, o.contract, o.contract_note, - o.franchise_Time + o.franchise_Time, + o.audit_by, + o.audit_status, + o.audit_time from sys_depart d left join nu_org_info o on d.id = o.pk_id diff --git a/nursing-unit-common/src/main/java/com/nu/dto/OrgApplyInfoMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/OrgApplyInfoMQDto.java index b012eca..aa5f170 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/OrgApplyInfoMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/OrgApplyInfoMQDto.java @@ -212,4 +212,7 @@ public class OrgApplyInfoMQDto implements Serializable { private String operateTelephone; //加盟上传合同操作人邮箱 private String operateEmail; + + private String auditBy; + private String auditStatus; }