diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/controller/DeviceManagerController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/controller/DeviceManagerController.java index ec6b88e..486e13a 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/controller/DeviceManagerController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/controller/DeviceManagerController.java @@ -200,6 +200,7 @@ public class DeviceManagerController extends JeecgController batchSave(@RequestBody List list) { list.forEach(item -> { - if (item.getId() == null) { + if (item.getId() == null && item.getPurchaseQuantity() != null && item.getPurchaseQuantity() != 0) { service.addPreviewPlan(item); } else { - service.updatePreviewPlan(item); + if (item.getPurchaseQuantity() != null && item.getPurchaseQuantity() != 0) { + service.updatePreviewPlan(item); + } else { + service.deletePreviewPlan(item); + } } }); return Result.OK("保存成功!"); @@ -228,11 +233,11 @@ public class DeviceManagerController extends JeecgController>> getNuListByOrgCode(@RequestParam("orgCode") String orgCode) { - if(StringUtils.isBlank(orgCode)){ + public Result>> getNuListByOrgCode(@RequestParam("orgCode") String orgCode) { + if (StringUtils.isBlank(orgCode)) { return Result.error("orgCode不能为空"); } - Map> result = service.getNuListByOrgCode(orgCode); + Map> result = service.getNuListByOrgCode(orgCode); return Result.ok(result); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/service/IDeviceManagerService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/service/IDeviceManagerService.java index f9d513a..4afbf62 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/service/IDeviceManagerService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/service/IDeviceManagerService.java @@ -52,4 +52,5 @@ public interface IDeviceManagerService extends IService { List queryQuantityByOrgCode(String batchNo, String orgCode); Map> getNuListByOrgCode(String orgCode); + } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/service/impl/DeviceManagerServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/service/impl/DeviceManagerServiceImpl.java index 3cd93cd..2427833 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/service/impl/DeviceManagerServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/service/impl/DeviceManagerServiceImpl.java @@ -495,7 +495,7 @@ public class DeviceManagerServiceImpl extends ServiceImpl