From 5fb4b2ce8b587842081ca5eeed07ada5e8dd4ba9 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 26 Oct 2017 13:10:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/OperateLogFacade.java | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OperateLogFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OperateLogFacade.java index c49a19c..691116f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OperateLogFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OperateLogFacade.java @@ -6,6 +6,7 @@ import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.model.UsersQuery; import com.lyms.platform.permission.service.UsersService; +import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.OperateLogModel; import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.collections.CollectionUtils; @@ -61,9 +62,11 @@ public class OperateLogFacade { model.setOperateBeforeContent(JsonUtil.array2JsonString(operateBeforeContent)); model.setOperateRemark(operateRemark); - if (operateBeforeContent != null && operateBeforeContent != null ) + if (operateAfterContent != null && operateBeforeContent != null ) { - model.setModifyContent(JsonUtil.obj2JsonString(getChangeItems(operateAfterContent, operateBeforeContent))); + String json = JsonUtil.obj2Str(getChangeItems(operateAfterContent, operateBeforeContent)); + System.out.print(json); + model.setModifyContent(json); } model.setOperateHospitalId(hospitalId); @@ -170,8 +173,23 @@ public class OperateLogFacade { return result; } +// +// public static void main(String[] args) +// { +// +// BabyModel model1 = new BabyModel(); +// model1.setId("bbb"); +// model1.setBlNo("111"); +// +// BabyModel model2 = new BabyModel(); +// model2.setId("bbb"); +// model2.setBlNo("222"); +// List list = getChangeItems(model1, model2); +// System.out.println(JsonUtil.obj2Str(list)); +// } } + class ChangeItem { private String field; -- 1.8.3.1