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

修改bug

This commit is contained in:
yangjun 2025-07-28 15:22:26 +08:00
parent 3c467a9401
commit ee9edabe63
5 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgInfo/entity/OrgInfoEntity.java
View File

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

7
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/entity/OrgAllInfo.java
View File

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

7
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/entity/OrgInfo.java
View File

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

5
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/mapper/xml/OrgInfoMapper.xml
View File

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

3
nursing-unit-common/src/main/java/com/nu/dto/OrgApplyInfoMQDto.java
View File

@ -212,4 +212,7 @@ public class OrgApplyInfoMQDto implements Serializable {
private String operateTelephone;
//加盟上传合同操作人邮箱
private String operateEmail;
private String auditBy;
private String auditStatus;
}