From 50160f43b395b9260fe3da05c3a64463fdc0c53b Mon Sep 17 00:00:00 2001 From: yangfei Date: Sat, 10 Mar 2018 16:50:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E8=BF=BD?= =?UTF-8?q?=E8=AE=BF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/facade/TrackDownFacade.java | 10 ++++++++-- .../operate/web/service/impl/TrackDownServiceImpl.java | 1 - 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index 10ec2ef..c8f95f5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -9,6 +9,7 @@ import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.result.PageResult; import com.lyms.platform.common.result.RespBuilder; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.TrackDownQueryRequest; @@ -391,8 +392,13 @@ public class TrackDownFacade { List list2 = matDeliverService.query(matDeliverQuery); if(CollectionUtils.isNotEmpty(list2)){ MaternalDeliverModel maternalDeliverModel = list2.get(0); - /** 生产方式 */ - temp.put("scType", FmTypeEnums.getFmNameById2(maternalDeliverModel.getFmType())); + if (StringUtils.isNotEmpty(maternalDeliverModel.getDeliveryMode())) { + Map deliveryModeMap = JsonUtil.getMap(maternalDeliverModel.getDeliveryMode()); + if(deliveryModeMap.containsKey("fmfs")){ + /** 生产方式 */ + temp.put("scType", FmTypeEnums.getFmNameById(deliveryModeMap.get("fmfs"))); + } + } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java index 038bb39..47e1b2d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java @@ -533,7 +533,6 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS Integer nextId = TrackDownDateEnums.getEnum(trackDown.getTrackDownDateType()).getNextid(); trackDownRecord.setTrackType(nextId); trackDownRecordService.updateTrackDown(trackDownRecord, id); - } else if (TrackDownTransferEnums.C.getId() == trackDown.getTrackDownTransfer()) { TrackDownRecord trackDownRecord = new TrackDownRecord(); trackDownRecord.setStatus(0); -- 1.8.3.1