gaodd преди 1 година
родител
ревизия
4f220a94cc
променени са 1 файла, в които са добавени 4 реда и са изтрити 4 реда
  1. 4 4
      src/main/java/com/chinaitop/depot/device/controller/StorageDeviceGetController.java

+ 4 - 4
src/main/java/com/chinaitop/depot/device/controller/StorageDeviceGetController.java

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