diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java index 13bc0b0..5141d97 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java @@ -126,7 +126,7 @@ public class CsLedgerServiceImpl extends ServiceImpl i for(CsLedgerVO c : portables){ c.setPid(portable.getId()); CsEquipmentDeliveryPO csEquipmentDeliveryPO = csEquipmentDeliveryMapper.selectById(c.getId()); - c.setComFlag(Integer.parseInt(csEquipmentDeliveryPO.getStatus())); + c.setComFlag(csEquipmentDeliveryPO.getRunStatus()); c.setChildren(wlRecordMapper.getAllLine(c.getId())); for(CsLedgerVO cs : c.getChildren()){ cs.setPid(c.getId()); @@ -208,7 +208,7 @@ public class CsLedgerServiceImpl extends ServiceImpl i for(CsLedgerVO c : portables){ c.setPid(portable.getId()); CsEquipmentDeliveryPO csEquipmentDeliveryPO = csEquipmentDeliveryMapper.selectById(c.getId()); - c.setComFlag(Integer.parseInt(csEquipmentDeliveryPO.getStatus())); + c.setComFlag(csEquipmentDeliveryPO.getRunStatus()); } portable.setChildren(portables); diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/PortableOfflLogServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/PortableOfflLogServiceImpl.java index 3231207..30d1dff 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/PortableOfflLogServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/PortableOfflLogServiceImpl.java @@ -168,9 +168,8 @@ public class PortableOfflLogServiceImpl extends ServiceImpl