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

监护人增加身份证正面内容存储，调整相应接口代码

This commit is contained in:
1378012178@qq.com 2025-10-29 16:27:04 +08:00
parent b51674581a
commit d222704c97
4 changed files with 55 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java
View File

@ -140,7 +140,23 @@ public class ElderInfoMQDto implements Serializable {
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy年MM月dd日")
@DateTimeFormat(pattern = "yyyy年MM月dd日")
private Date guardianDateOfBirth;
private java.util.Date guardianBirthDate;
/**
* 监护人性别
*/
private String guardianSex;
/**
* 监护人民族
*/
private String guardianNational;
/**
* 监护人身份证住址
*/
private String guardianCardHome;
/**
* 监护人身份证正面
*/
private String guardianIdCardPositive;
/**
* 监护人家庭住址
*/

18
nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java
View File

@ -140,7 +140,23 @@ public class ElderInfoEntity implements Serializable {
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy年MM月dd日")
@DateTimeFormat(pattern = "yyyy年MM月dd日")
private java.util.Date guardianDateOfBirth;
private java.util.Date guardianBirthDate;
/**
* 监护人性别
*/
private String guardianSex;
/**
* 监护人民族
*/
private String guardianNational;
/**
* 监护人身份证住址
*/
private String guardianCardHome;
/**
* 监护人身份证正面
*/
private String guardianIdCardPositive;
/**
* 监护人家庭住址
*/

24
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java
View File

@ -205,11 +205,25 @@ public class ElderInfo implements Serializable {
/**
* 监护人出生日期
*/
@Excel(name = "监护人出生日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "出生日期")
private java.util.Date guardianDateOfBirth;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy年MM月dd日")
@DateTimeFormat(pattern = "yyyy年MM月dd日")
private java.util.Date guardianBirthDate;
/**
* 监护人性别
*/
private String guardianSex;
/**
* 监护人民族
*/
private String guardianNational;
/**
* 监护人身份证住址
*/
private String guardianCardHome;
/**
* 监护人身份证正面
*/
private String guardianIdCardPositive;
/**
* 监护人家庭住址
*/

4
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java
View File

@ -117,9 +117,9 @@ public class ElderInfoServiceImpl extends ServiceImpl<ElderInfoMapper, ElderInfo
Objects.equals(dbRecord.getRelationship(), inputRecord.getRelationship()) &&
Objects.equals(dbRecord.getGuardianIdCard(), inputRecord.getGuardianIdCard()) &&
Objects.equals(dbRecord.getGuardianPhone(), inputRecord.getGuardianPhone()) &&
Objects.equals(dbRecord.getGuardianDateOfBirth(), inputRecord.getGuardianDateOfBirth()) &&
Objects.equals(dbRecord.getGuardianHomeAddress(), inputRecord.getGuardianHomeAddress()) &&
Objects.equals(dbRecord.getGuardianWorkUnit(), inputRecord.getGuardianWorkUnit())
Objects.equals(dbRecord.getGuardianWorkUnit(), inputRecord.getGuardianWorkUnit()) &&
Objects.equals(dbRecord.getGuardianIdCardPositive(), inputRecord.getGuardianIdCardPositive())
);
}
// if("jhr".equals(elderInfoEntity.getModifyType())){