|
|
@@ -101,7 +101,7 @@ public class ModelSynthesizerDomain {
|
|
|
Date beginDate = monthformatter.parse(contractOrderEntity.getStartDate());
|
|
|
Date endDate = monthformatter.parse(contractOrderEntity.getEndDate());
|
|
|
Integer months = DateUtils.getDiffNaturalMonth(endDate, beginDate);
|
|
|
- map.put("$Year$", DateUtil.formatYearWithChineseSeparator(new Date()));
|
|
|
+ map.put("$Year$", DateUtil.formatYearToNum(new Date()));
|
|
|
map.put("$Name$", contractOrderEntity.getName());
|
|
|
map.put("$Sex$", "1".equals(contractOrderEntity.getSex()) ? "男" : "女");
|
|
|
map.put("$Birthdday$", DateUtil.formatDateWithChineseSeparatorAndNoZeroFilled(contractOrderEntity.getBirth(), "yyyy/M/d"));
|