Commit 5fb4b2ce8b587842081ca5eeed07ada5e8dd4ba9
1 parent
1058f241cb
Exists in
master
and in
6 other branches
操作日志
Showing 1 changed file with 20 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OperateLogFacade.java
View file @
5fb4b2c
| ... | ... | @@ -6,6 +6,7 @@ |
| 6 | 6 | import com.lyms.platform.permission.model.Users; |
| 7 | 7 | import com.lyms.platform.permission.model.UsersQuery; |
| 8 | 8 | import com.lyms.platform.permission.service.UsersService; |
| 9 | +import com.lyms.platform.pojo.BabyModel; | |
| 9 | 10 | import com.lyms.platform.pojo.OperateLogModel; |
| 10 | 11 | import org.apache.commons.beanutils.PropertyUtils; |
| 11 | 12 | import org.apache.commons.collections.CollectionUtils; |
| 12 | 13 | |
| ... | ... | @@ -61,9 +62,11 @@ |
| 61 | 62 | model.setOperateBeforeContent(JsonUtil.array2JsonString(operateBeforeContent)); |
| 62 | 63 | model.setOperateRemark(operateRemark); |
| 63 | 64 | |
| 64 | - if (operateBeforeContent != null && operateBeforeContent != null ) | |
| 65 | + if (operateAfterContent != null && operateBeforeContent != null ) | |
| 65 | 66 | { |
| 66 | - model.setModifyContent(JsonUtil.obj2JsonString(getChangeItems(operateAfterContent, operateBeforeContent))); | |
| 67 | + String json = JsonUtil.obj2Str(getChangeItems(operateAfterContent, operateBeforeContent)); | |
| 68 | + System.out.print(json); | |
| 69 | + model.setModifyContent(json); | |
| 67 | 70 | } |
| 68 | 71 | |
| 69 | 72 | model.setOperateHospitalId(hospitalId); |
| 70 | 73 | |
| ... | ... | @@ -170,7 +173,22 @@ |
| 170 | 173 | return result; |
| 171 | 174 | } |
| 172 | 175 | |
| 176 | +// | |
| 177 | +// public static void main(String[] args) | |
| 178 | +// { | |
| 179 | +// | |
| 180 | +// BabyModel model1 = new BabyModel(); | |
| 181 | +// model1.setId("bbb"); | |
| 182 | +// model1.setBlNo("111"); | |
| 183 | +// | |
| 184 | +// BabyModel model2 = new BabyModel(); | |
| 185 | +// model2.setId("bbb"); | |
| 186 | +// model2.setBlNo("222"); | |
| 187 | +// List<ChangeItem> list = getChangeItems(model1, model2); | |
| 188 | +// System.out.println(JsonUtil.obj2Str(list)); | |
| 189 | +// } | |
| 173 | 190 | } |
| 191 | + | |
| 174 | 192 | |
| 175 | 193 | class ChangeItem { |
| 176 | 194 |