|
|
@@ -351,17 +351,17 @@ public class StorageDeviceGetController {
|
|
351
|
351
|
@ApiImplicitParams({
|
|
352
|
352
|
@ApiImplicitParam(name = "deviceBackJson", value = "增加数据", paramType = "query")
|
|
353
|
353
|
})
|
|
354
|
|
- public Map<String, Object> endMore(String deviceBackJson) {
|
|
|
354
|
+ public Map<String, Object> endMore(@RequestBody StorageDeviceback storageDeviceback) {
|
|
355
|
355
|
Map<String, Object> modelMap = new HashMap<>();
|
|
356
|
356
|
// JSON字符串转对象
|
|
357
|
|
- ObjectMapper mapper = new ObjectMapper();
|
|
|
357
|
+ //ObjectMapper mapper = new ObjectMapper();
|
|
358
|
358
|
StorageDeviceget storageDeviceget = null; //领用
|
|
359
|
|
- StorageDeviceback storageDeviceback = null; //归还
|
|
|
359
|
+ //StorageDeviceback storageDeviceback = null; //归还
|
|
360
|
360
|
// StorageDeviceinput storageDeviceinput = null;
|
|
361
|
361
|
|
|
362
|
362
|
try {
|
|
363
|
363
|
//storageDeviceget = (StorageDeviceget)mapper.readValue(deviceBackJson, StorageDeviceget.class);
|
|
364
|
|
- storageDeviceback = (StorageDeviceback) mapper.readValue(deviceBackJson, StorageDeviceback.class);
|
|
|
364
|
+ //storageDeviceback = (StorageDeviceback) mapper.readValue(deviceBackJson, StorageDeviceback.class);
|
|
365
|
365
|
//增加归还信息(归还表)
|
|
366
|
366
|
storageDeviceback.setGetId(storageDeviceback.getId());
|
|
367
|
367
|
// storageDeviceback.setId(0);
|