fanxw hace 5 años
padre
commit
b38f87f0c6

+ 12 - 0
src/main/java/com/chinaitop/depot/storage/controller/StorageDumpController.java

@@ -8,6 +8,7 @@ import java.util.Map;
8
 import javax.annotation.Resource;
8
 import javax.annotation.Resource;
9
 import javax.servlet.http.HttpServletRequest;
9
 import javax.servlet.http.HttpServletRequest;
10
 
10
 
11
+import org.apache.commons.lang.ObjectUtils;
11
 import org.springframework.beans.factory.annotation.Value;
12
 import org.springframework.beans.factory.annotation.Value;
12
 import org.springframework.http.MediaType;
13
 import org.springframework.http.MediaType;
13
 import org.springframework.web.bind.annotation.RequestMapping;
14
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,6 +25,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
24
 import com.fasterxml.jackson.databind.ObjectMapper;
25
 import com.fasterxml.jackson.databind.ObjectMapper;
25
 import com.github.pagehelper.PageHelper;
26
 import com.github.pagehelper.PageHelper;
26
 import com.github.pagehelper.PageInfo;
27
 import com.github.pagehelper.PageInfo;
28
+import com.mysql.jdbc.StringUtils;
27
 
29
 
28
 import io.swagger.annotations.Api;
30
 import io.swagger.annotations.Api;
29
 import io.swagger.annotations.ApiImplicitParam;
31
 import io.swagger.annotations.ApiImplicitParam;
@@ -109,6 +111,16 @@ public class StorageDumpController {
109
 		List<StorageDump> list = storageDumpService.findCondition(example);
111
 		List<StorageDump> list = storageDumpService.findCondition(example);
110
 
112
 
111
 		PageInfo<StorageDump> pageInfo = new PageInfo<StorageDump>(list);
113
 		PageInfo<StorageDump> pageInfo = new PageInfo<StorageDump>(list);
114
+		if (pageInfo.getList().size() > 0) {
115
+			for (int i = 0; i < pageInfo.getList().size(); i++) {
116
+				String cf = ObjectUtils.toString(pageInfo.getList().get(i).getHouseId(), "");
117
+				
118
+				String hwh = ObjectUtils.toString(pageInfo.getList().get(i).getWareId(), "");
119
+				if (!"".equals(hwh) && !"YG".equals(cf.substring(0,2))) {
120
+					pageInfo.getList().get(i).setHwh(Integer.parseInt(hwh));
121
+				}
122
+			}
123
+		}
112
 
124
 
113
 		return pageInfo;
125
 		return pageInfo;
114
 	}
126
 	}

+ 10 - 0
src/main/java/com/chinaitop/depot/storage/model/StorageDump.java

@@ -53,6 +53,8 @@ public class StorageDump {
53
     private Date uploadTime;
53
     private Date uploadTime;
54
 
54
 
55
     private Date updatetime;
55
     private Date updatetime;
56
+    
57
+    private Integer hwh;
56
 
58
 
57
     /**
59
     /**
58
      * 主键ID
60
      * 主键ID
@@ -453,4 +455,12 @@ public class StorageDump {
453
     public void setUpdatetime(Date updatetime) {
455
     public void setUpdatetime(Date updatetime) {
454
         this.updatetime = updatetime;
456
         this.updatetime = updatetime;
455
     }
457
     }
458
+
459
+	public Integer getHwh() {
460
+		return hwh;
461
+	}
462
+
463
+	public void setHwh(Integer hwh) {
464
+		this.hwh = hwh;
465
+	}
456
 }
466
 }