|
@@ -1,6 +1,7 @@
|
|
1
|
package com.chinaitop.depot.storage.controller;
|
1
|
package com.chinaitop.depot.storage.controller;
|
|
2
|
|
2
|
|
|
3
|
|
3
|
|
|
|
|
4
|
+import com.alibaba.fastjson.JSON;
|
|
4
|
import com.chinaitop.depot.feign.FeignBusinessService;
|
5
|
import com.chinaitop.depot.feign.FeignBusinessService;
|
|
5
|
import com.chinaitop.depot.storage.model.*;
|
6
|
import com.chinaitop.depot.storage.model.*;
|
|
6
|
import com.chinaitop.depot.storage.model.StorageQualitycheckExample.Criteria;
|
7
|
import com.chinaitop.depot.storage.model.StorageQualitycheckExample.Criteria;
|
|
@@ -16,6 +17,7 @@ import io.swagger.annotations.Api;
|
|
16
|
import io.swagger.annotations.ApiImplicitParam;
|
17
|
import io.swagger.annotations.ApiImplicitParam;
|
|
17
|
import io.swagger.annotations.ApiImplicitParams;
|
18
|
import io.swagger.annotations.ApiImplicitParams;
|
|
18
|
import io.swagger.annotations.ApiOperation;
|
19
|
import io.swagger.annotations.ApiOperation;
|
|
|
|
20
|
+import net.sf.json.JSONObject;
|
|
19
|
import org.apache.commons.lang.ObjectUtils;
|
21
|
import org.apache.commons.lang.ObjectUtils;
|
|
20
|
import org.apache.commons.lang3.StringUtils;
|
22
|
import org.apache.commons.lang3.StringUtils;
|
|
21
|
import org.springframework.http.MediaType;
|
23
|
import org.springframework.http.MediaType;
|
|
@@ -70,7 +72,9 @@ public class StorageQualitycheckController {
|
|
70
|
qualityCheck.setType(checktype);
|
72
|
qualityCheck.setType(checktype);
|
|
71
|
}
|
73
|
}
|
|
72
|
if (StringUtils.isNotBlank(quality)){
|
74
|
if (StringUtils.isNotBlank(quality)){
|
|
73
|
- qualityCheck.setQuality(quality);
|
|
|
|
|
|
75
|
+ HashMap hashMap = JSON.parseObject(quality, HashMap.class);
|
|
|
|
76
|
+ String ax = String.valueOf(hashMap.get("id"));
|
|
|
|
77
|
+ qualityCheck.setQuality(ax);
|
|
74
|
}
|
78
|
}
|
|
75
|
if (subType!= null){
|
79
|
if (subType!= null){
|
|
76
|
qualityCheck.setSubType(subType);
|
80
|
qualityCheck.setSubType(subType);
|