From 822e93724e761aa464cc8d392b208ec35a73ae20 Mon Sep 17 00:00:00 2001 From: hujiaqi Date: Thu, 5 Jan 2017 15:05:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=84=BF=E7=AB=A5=E5=BB=BA?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/BabyBookbuildingFacade.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index b7d1bac..d01cf23 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -15,7 +15,6 @@ import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.utils.BabyListTask; import com.lyms.platform.operate.web.utils.GrowthCountTask; -import com.lyms.platform.operate.web.utils.HiskCountTask; import com.lyms.platform.operate.web.utils.MessageCenterService; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; @@ -32,7 +31,6 @@ import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; -import java.text.DecimalFormat; import java.util.*; import java.util.concurrent.*; @@ -201,7 +199,7 @@ public class BabyBookbuildingFacade { * @return */ public BaseResponse updateBabyBookbuilding(BabyBookbuildingAddRequest request, Integer userId) { - BabyModel model = getBabyModel(request); + BabyModel model = getBabyModel(request,false); model.setModified(new Date()); model.setOperator(userId); if (StringUtils.isNotEmpty(request.getMommyCertificateNum())) { @@ -486,7 +484,7 @@ public class BabyBookbuildingFacade { return br; } - BabyModel model = getBabyModel(request); + BabyModel model = getBabyModel(request,true); model.setPid(babyPersonId); model.setOperator(userId); if (StringUtils.isNotEmpty(request.getMommyCertificateNum())) { @@ -722,7 +720,8 @@ public class BabyBookbuildingFacade { * @param b * @return */ - private BabyModel getBabyModel(BabyBookbuildingAddRequest b) { + private BabyModel getBabyModel(BabyBookbuildingAddRequest b,boolean isAdd) { + // hujiaqi添加了一个字段，判断是插入还是更新，如果是更新，就不更新birth字段 BabyModel bm = new BabyModel(); bm.setYn(YnEnums.YES.getId()); @@ -743,7 +742,9 @@ public class BabyBookbuildingFacade { bm.setName(b.getBabyName()); bm.setSex(b.getSex()); bm.setCardNo(b.getBabyCardNo()); - bm.setBirth(DateUtil.parseYMD(b.getBabyBirthday())); + if(isAdd) { + bm.setBirth(DateUtil.parseYMD(b.getBabyBirthday())); + } bm.setAddress(b.getHomeAddress()); bm.setProvinceId(b.getHomeProvinceId()); bm.setCityId(b.getHomeCityId()); -- 1.8.3.1