From 689436379a556f758300042283a7a946e2b47a54 Mon Sep 17 00:00:00 2001 From: landong2015 Date: Wed, 4 Jan 2017 16:01:03 +0800 Subject: [PATCH] update bug --- .../com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java | 2 +- .../com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index 40f2908..25b2eb0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -139,7 +139,7 @@ public class PremaritalCheckupFacade { archiveMap.put("certificateNum", archiveModel.getCertificateNum()); archiveMap.put("certificateTypeId", archiveModel.getCertificateTypeId()); archiveMap.put("username", archiveModel.getUsername()); - archiveMap.put("age", archiveModel.getAge()); + archiveMap.put("age", DateUtil.getAge(archiveModel.getBirthday())); if (archiveModel.getSex()!=null){ if (archiveModel.getSex().equals(SystemConfig.WOMAN_ID)){ archiveMap.put("sex", "女"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java index 3592339..63025c3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java @@ -213,7 +213,7 @@ public class ResidentsArchiveFacade{ //历史建档记录 Map mapData = new HashMap<>(); - mapData.put("firstBuildData",newModel); + mapData.put("firstBuildData",getResult(newModel)); mapData.put("archiveHistory",resultList); mapData.put("initBuildDate", DateUtil.getyyyy_MM_dd(new Date())); list.add(mapData); -- 1.8.3.1