|
@@ -112,7 +112,7 @@ public class ModelSynthesizerDomain {
|
|
|
if (contractOrderEntity.getJointFlag() == 1) {
|
|
if (contractOrderEntity.getJointFlag() == 1) {
|
|
|
map.put("$MateName$", contractOrderEntity.getJointName());
|
|
map.put("$MateName$", contractOrderEntity.getJointName());
|
|
|
map.put("$MateSex$", StatusEnum.SexStatusEnum.getValue(contractOrderEntity.getJointSex()));
|
|
map.put("$MateSex$", StatusEnum.SexStatusEnum.getValue(contractOrderEntity.getJointSex()));
|
|
|
- map.put("$MateBirthday$", DateUtil.formatDateWithChineseSeparatorAndNoZeroFilled(contractOrderEntity.getIdCard().substring(6, 14), "yyyyMMdd"));
|
|
|
|
|
|
|
+ map.put("$MateBirthday$", DateUtil.formatDateWithChineseSeparatorAndNoZeroFilled(contractOrderEntity.getJointIdCard().substring(6, 14), "yyyyMMdd"));
|
|
|
map.put("$MateAddr$", contractOrderEntity.getJointResidence());
|
|
map.put("$MateAddr$", contractOrderEntity.getJointResidence());
|
|
|
map.put("$MatePhone$", contractOrderEntity.getJointPhone());
|
|
map.put("$MatePhone$", contractOrderEntity.getJointPhone());
|
|
|
map.put("$MateIDNo$", contractOrderEntity.getJointIdCard());
|
|
map.put("$MateIDNo$", contractOrderEntity.getJointIdCard());
|
|
@@ -310,7 +310,7 @@ public class ModelSynthesizerDomain {
|
|
|
if (contractOrderEntity.getJointFlag() == 1) {
|
|
if (contractOrderEntity.getJointFlag() == 1) {
|
|
|
noteValue.put("$MateName$", contractOrderEntity.getJointName());
|
|
noteValue.put("$MateName$", contractOrderEntity.getJointName());
|
|
|
noteValue.put("$MateSex$", StatusEnum.SexStatusEnum.getValue(contractOrderEntity.getJointSex()));
|
|
noteValue.put("$MateSex$", StatusEnum.SexStatusEnum.getValue(contractOrderEntity.getJointSex()));
|
|
|
- noteValue.put("$MateBirthday$", DateUtil.formatDateWithChineseSeparatorAndNoZeroFilled(contractOrderEntity.getIdCard().substring(6, 14), "yyyyMMdd"));
|
|
|
|
|
|
|
+ noteValue.put("$MateBirthday$", DateUtil.formatDateWithChineseSeparatorAndNoZeroFilled(contractOrderEntity.getJointIdCard().substring(6, 14), "yyyyMMdd"));
|
|
|
noteValue.put("$MateAddr$", contractOrderEntity.getJointResidence());
|
|
noteValue.put("$MateAddr$", contractOrderEntity.getJointResidence());
|
|
|
noteValue.put("$MatePhone$", contractOrderEntity.getJointPhone());
|
|
noteValue.put("$MatePhone$", contractOrderEntity.getJointPhone());
|
|
|
noteValue.put("$MateIDNo$", contractOrderEntity.getJointIdCard());
|
|
noteValue.put("$MateIDNo$", contractOrderEntity.getJointIdCard());
|
|
@@ -412,7 +412,7 @@ public class ModelSynthesizerDomain {
|
|
|
if (contractOrderEntity.getJointFlag() == 1) {
|
|
if (contractOrderEntity.getJointFlag() == 1) {
|
|
|
map.put("$MateName$", contractOrderEntity.getJointName());
|
|
map.put("$MateName$", contractOrderEntity.getJointName());
|
|
|
map.put("$MateSex$", StatusEnum.SexStatusEnum.getValue(contractOrderEntity.getJointSex()));
|
|
map.put("$MateSex$", StatusEnum.SexStatusEnum.getValue(contractOrderEntity.getJointSex()));
|
|
|
- map.put("$MateBirthday$", DateUtil.formatDateWithChineseSeparatorAndNoZeroFilled(contractOrderEntity.getIdCard().substring(6, 14), "yyyyMMdd"));
|
|
|
|
|
|
|
+ map.put("$MateBirthday$", DateUtil.formatDateWithChineseSeparatorAndNoZeroFilled(contractOrderEntity.getJointIdCard().substring(6, 14), "yyyyMMdd"));
|
|
|
map.put("$MateAddr$", contractOrderEntity.getJointResidence());
|
|
map.put("$MateAddr$", contractOrderEntity.getJointResidence());
|
|
|
map.put("$MatePhone$", contractOrderEntity.getJointPhone());
|
|
map.put("$MatePhone$", contractOrderEntity.getJointPhone());
|
|
|
map.put("$MateIDNo$", contractOrderEntity.getJointIdCard());
|
|
map.put("$MateIDNo$", contractOrderEntity.getJointIdCard());
|